updated READMEs

roles/configure_meraki_mr/README.md

@@ -15,73 +15,102 @@ To use this role, you will need to provide `dashboard_base_url`, `auth_key` and
 ```yaml
 ---
 meraki_mr_configuration:
+  network:
+    organization: ORG NAME
+    network: NETWORK NAME
   access_points:
     - name: demo-mr44
-      organization: ORG NAME
-      network: NETWORK NAME
       rf_profile_name: Demo-RF-Profile
-      general_settings:
-        ipv6_bridge_enabled: true
-        led_lights_on: true
-        location_analytics_enabled: true
-        meshing_enabled: false
-        upgrade_strategy: minimize_upgrade_time
-      bluetooth_settings:
-        scanning_enabled: true
-        beaconing_enabled: false
-      rf_profiles:
-        - name: Demo-RF-Profile
-          state: present
-          band_selection_type: ap
-          client_balancing_enabled: true
-          ap_band_settings:
-            mode: dual
-            band_steering_enabled: true
-          five_ghz_settings:
-            max_power: 30
-            min_bitrate: 12
-            min_power: 8
-            rxsop: -65
-            channel_width: 80
-          two_four_ghz_settings:
-            max_power: 30
-            min_bitrate: 12
-            min_power: 8
-            rxsop: -65
-            ax_enabled: true
-      ssids:
-        - name: Meraki-Demo-Client-Network
-          state: present
-          enabled: true
-          visible: true
-          available_on_all_aps: true
-          authentication:
-            auth_mode: psk
-            psk: "CiscoLive!2023"
-            encryption_mode: wpa
-            wpa_encryption_mode: WPA2 only
-          vlan:
-            use_vlan_tagging: true
-            default_vlan_id: 20
-          ip_assignment_mode: Bridge mode
-          lan_isolation_enabled: true
-          splash_page: None
-        - name: Meraki-Demo-Camera-Network
-          state: present
-          enabled: true
-          visible: true
-          available_on_all_aps: true
-          authentication:
-            auth_mode: psk
-            psk: "CiscoLive!2023!Cameras"
-            encryption_mode: wpa
-            wpa_encryption_mode: WPA2 only
-          vlan:
-            use_vlan_tagging: true
-            default_vlan_id: 30
-          ip_assignment_mode: Bridge mode
-          lan_isolation_enabled: false
-          splash_page: None
+  access_points:
+    - name: demo-mr44
+      rf_profile_name: Demo-RF-Profile
+  general_settings:
+    ipv6_bridge_enabled: true
+    led_lights_on: true
+    location_analytics_enabled: true
+    meshing_enabled: false
+    upgrade_strategy: minimizeUpgradeTime
+  bluetooth_settings:
+    scanning_enabled: true
+    beaconing_enabled: false
+  rfProfiles:
+    - name: Demo-RF-Profile
+      state: present
+      bandSelectionType: ap
+      clientBalancingEnabled: true
+      apBandSettings:
+        bandOperationMode: dual
+        bandSteeringEnabled: true
+        bands:
+          enabled:
+            - 2.4
+            - 5
+      fiveGhzSettings:
+        maxPower: 30
+        minBitrate: 12
+        minPower: 8
+        rxsop: -65
+        channelWidth: 80
+      transmission:
+        enabled: true
+      twoFourGhzSettings:
+        maxPower: 30
+        minBitrate: 12
+        minPower: 8
+        rxsop: -65
+        axEnabled: true
+  ssids:
+    - name: Meraki-Demo-Client-Network
+      number: 0
+      state: present
+      enabled: true
+      visible: true
+      availableOnAllAps: true
+      authentication:
+        authMode: psk
+        psk: "CiscoLive!2024"
+        encryptionMode: wpa
+        wpaEncryptionMode: WPA2 only
+      vlan:
+        useVlanTagging: true
+        defaultVlanId: 20
+      ipAssignmentMode: Bridge mode
+      lanIsolationEnabled: true
+      splashPage: None
+    - name: Meraki-Demo-Camera-Network
+      number: 1
+      state: present
+      enabled: true
+      visible: true
+      availableOnAllAps: true
+      authentication:
+        authMode: psk
+        psk: "CiscoLive!2024!Cameras"
+        encryptionMode: wpa
+        wpaEncryptionMode: WPA2 only
+      vlan:
+        useVlanTagging: true
+        defaultVlanId: 30
+      ipAssignmentMode: Bridge mode
+      lanIsolationEnabled: false
+      splashPage: None
+    - name: Meraki-Demo-Camera-Network2
+      number: 2
+      state: absent
+      enabled: true
+      visible: true
+      availableOnAllAps: true
+      authentication:
+        authMode: psk
+        psk: "CiscoLive!2023!Cameras"
+        encryptionMode: wpa
+        wpaEncryptionMode: WPA2 only
+      vlan:
+        useVlanTagging: true
+        defaultVlanId: 30
+      ipAssignmentMode: Bridge mode
+      lanIsolationEnabled: false
+      splashPage: None
 ```
 
 ## Contributors

roles/configure_meraki_mt/README.md

@@ -18,23 +18,24 @@ The `automations` dict in the argspec is currently unused as Cisco has not publi
 ```yaml
 ---
 meraki_mt_configuration:
-  - organization: ORG NAME
-    network: NETWORK NAME
-    sensors:
-      - name: demo-mt30
-    mqtt_brokers:
-      - name: MQTT-Broker
-        state: present
-        enabled: false
-        host: MQTT HOST
-        port: 8883
-        authentication:
-          username: MQTT USERNAME
-          password: MQTT PASSWORD
-        security:
-          mode: tls
-          cert_file: PATH/TO/MQTTCERT
-          hostname_verification: false
+  network:
+    organization: ORG NAME
+    name: NETWORK NAME
+  sensors:
+    - name: demo-mt30
+  mqtt_brokers:
+    - name: MQTT-Broker
+      state: present
+      enabled: true
+      host: MQTT HOST
+      port: 8883
+      authentication:
+        username: MQTT USERNAME
+        password: MQTT PASSWORD
+      security:
+        mode: tls
+        certFile: 'PATH/TO/MQTTCERT'
+        verifyHostnames: false
 ```
 
 ## Contributors

roles/configure_meraki_mv/README.md

@@ -15,42 +15,51 @@ To use this role, you will need to provide `dashboard_base_url`, `auth_key` and
 ```yaml
 ---
 meraki_mv_configuration:
-  - organization: ORG NAME
-    network: NETWORK NAME
-    camera_profiles:
-      wireless:
-        - name: Meraki-Demo-Camera-Profile
-          state: present
-          auth_mode: psk
-          encryption_mode: wpa
-          ssid: Meraki-Demo-Camera-Network
-          psk: "CiscoLive!2023!Cameras"
-        - name: Meraki-Demo-Secondary-Camera-Profile
-          state: present
-          auth_mode: psk
-          encryption_mode: wpa
-          ssid: Meraki-Demo-Client-Network
-          psk: "CiscoLive!2023"
-      quality_and_retention:
-        - name: Meraki-Demo-Quality-Profile
-          state: present
-          cloud_archive: false
-          restricted_bandwidth_mode: false
-          audio_recording: false
-          video_settings:
-            MV2:
-              quality: high
-              resolution: 1920x1080
-    cameras:
-      - name: demo-mv2
+  network:
+    organization: ORG NAME
+    name: NETWORK NAME
+  camera_profiles:
+    wireless:
+      - name: Meraki-Demo-Camera-Profile
         state: present
-        quality_and_retention:
-          motion_detector_version: 2
-          video_resolution: 1920x1080
-          video_quality: high
+        ssid:
+          authMode: psk
+          encryptionMode: wpa
+          name: Meraki-Demo-Camera-Network
+          psk: "CiscoLive!2024!Cameras"
+      - name: Meraki-Demo-Secondary-Camera-Profile
+        state: present
+        ssid:
+          authMode: psk
+          encryptionMode: wpa
+          name: Meraki-Demo-Client-Network
+          psk: "CiscoLive!2024"
+    quality_and_retention:
+      - name: Meraki-Demo-Quality-Profile
+        state: present
+        cloudArchiveEnabled: false
+        maxRetentionDays: 1
+        motionBasedRetentionEnabled: false
+        restrictedBandwidthModeEnabled: false
+        audioRecordingEnabled: false
+        videoSettings:
+          MV2:
+            quality: high
+            resolution: 1920x1080
+  cameras:
+    - name: demo-mv2
+      state: present
+      camera_profiles:
         wireless:
-          profile_1: Meraki-Demo-Camera-Profile
-          profile_2: Meraki-Demo-Secondary-Camera-Profile
+          primary: Meraki-Demo-Camera-Profile
+          secondary: Meraki-Demo-Secondary-Camera-Profile
+        quality_and_retention:
+          name: Meraki-Demo-Quality-Profile
+      sense:
+        senseEnabled: false
+        mqttBrokerName: MQTT-Broker
+        audioDetection:
+          enabled: false
 ```
 
 ## Contributors

roles/configure_meraki_mx/README.md

@@ -15,10 +15,13 @@ To use this role, you will need to provide `dashboard_base_url`, `auth_key` and
 ```yaml
 ---
 meraki_mx_configuration:
+  network:
+    organization: ORG NAME
+    name: NETWORK NAME
+    lan_settings:
+      enable_vlans: true
   appliances:
     - name: demo-mx68
-      organization: ORG NAME
-      network: NETWORK NAME
       deployment_settings:
         deployment_mode: routed
         client_tracking: MAC address
@@ -39,9 +42,17 @@ meraki_mx_configuration:
             enabled: false
         wan2:
           enabled: false
-      lan_settings:
-        enable_vlans: true
       vlans:
+        - id: 1
+          state: present
+          name: Clients
+          subnet: 10.74.1.0/24
+          appliance_ip: 10.74.1.1
+          reserved_ip_range:
+            - start: 10.74.1.2
+              end: 10.74.1.49
+              comment: Client VLAN Reserved Range
+          dns_nameservers: 1.1.1.1
         - id: 10
           state: present
           name: Servers
@@ -54,13 +65,13 @@ meraki_mx_configuration:
           dns_nameservers: 1.1.1.1
         - id: 20
           state: present
-          name: Clients
+          name: Printers
           subnet: 10.74.20.0/24
           appliance_ip: 10.74.20.1
           reserved_ip_range:
             - start: 10.74.20.2
               end: 10.74.20.49
-              comment: Client VLAN Reserved Range
+              comment: Printer VLAN Reserved Range
           dns_nameservers: 1.1.1.1
         - id: 30
           state: present
@@ -71,15 +82,14 @@ meraki_mx_configuration:
             - start: 10.74.30.2
               end: 10.74.30.49
               comment: Camera VLAN Reserved Range
-        - id: 1
-          state: absent
+          dns_nameservers: 1.1.1.1
       ports:
         - id: 3
           enabled: true
           drop_untagged_traffic: false
           type: access
-          vlan: 10
           access_policy: open
+          vlan: 10
         - id: 4
           enabled: false
         - id: 5
@@ -100,8 +110,8 @@ meraki_mx_configuration:
           enabled: true
           drop_untagged_traffic: false
           type: trunk
-          vlan: 10
-          allowed_vlans: 10,20,30
+          vlan: 1
+          allowed_vlans: 1,10,20,30
       threat_protection:
         malware:
           mode: enabled
@@ -116,14 +126,15 @@ meraki_mx_configuration:
         firewall:
           l3_rules:
             - comment: Deny Traffic to 4.2.2.2
-              src_cidr: Any
-              src_port: Any
-              dest_cidr: 4.2.2.2
-              dest_port: Any
+              srcCidr: Any
+              srcPort: Any
+              destCidr: 4.2.2.2
+              destPort: Any
               protocol: any
               policy: deny
+              syslogEnabled: false
           l7_rules:
-            - type: blocked_countries
+            - type: blockedCountries
               countries:
                 - CN
                 - RU