Merge branch 'meraki:main' into switch_query_file

Author: KB-perByte

CHANGELOG.rst

@@ -4,6 +4,16 @@ Cisco.Meraki Release Notes
 
 .. contents:: Topics
 
+v2.21.9
+=======
+
+Bugfixes
+--------
+
+- administered_licensing_subscription_subscriptions_bind - Fixed parameter naming from 'subscription_id' to 'subscriptionId' for proper API compatibility
+- networks_appliance_content_filtering - Enhanced idempotency by extracting category IDs from blockedUrlCategories before comparison
+- meraki.py plugin utils - Added type checking in has_diff_elem2 function to prevent errors when comparing lists of non-dictionary elements
+
 v2.21.8
 =======
 

changelogs/changelog.yaml

@@ -1303,5 +1303,16 @@ releases:
   2.21.8:
     changes:
       bugfixes:
-        - "networks_switch_qos_rules_order: extend object lookup to include srcPortRange and dstPortRange when matching existing QoS rules to improve idempotency"
-    release_date: "2025-06-10"
+        - "networks_switch_qos_rules_order: extend object lookup to include srcPortRange and dstPortRange when matching existing QoS rules
+          to improve idempotency"
+    release_date: "2025-06-10"
+  2.21.9:
+    changes:
+      bugfixes:
+        - "administered_licensing_subscription_subscriptions_bind - Fixed parameter naming from 'subscription_id' to 'subscriptionId'
+          for proper API compatibility"
+        - "networks_appliance_content_filtering - Enhanced idempotency by extracting category IDs from blockedUrlCategories
+          before comparison"
+        - "meraki.py plugin utils - Added type checking in has_diff_elem2 function to prevent errors when comparing lists
+          of non-dictionary elements"
+    release_date: "2025-11-26"

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: cisco
 name: meraki
-version: 2.21.8
+version: 2.21.9
 readme: README.md
 authors:
   - Francisco Muñoz <[email protected]>

playbooks/test.yml

@@ -1,41 +1,16 @@
 - name: Play Name
   hosts: localhost
   vars:
-    network_id: L_828099381482771185
+    network_id: L_828099381482778041
     org_id: "828099381482762270"
+    blocked_url_category_ids:
+      - meraki:contentFiltering/category/C1
+      - meraki:contentFiltering/category/C3
   gather_facts: false
   tasks:
-    # - name: Get all networks _clients
-    #   cisco.meraki.networks_clients_info:
-    #     meraki_suppress_logging: false
-    #     timespan: 1
-    #     perPage: 3
-    #     networkId: L_828099381482771185
-    #     total_pages: -1
-    #     direction: next
-    #   register: result
     - name: Update all
-      cisco.meraki.devices_cellular_sims:
-        meraki_base_url: "http://localhost:3002"
+      cisco.meraki.networks_appliance_content_filtering:
+        meraki_suppress_logging: false
+        networkId: "{{ network_id }}"
+        blockedUrlCategories: "{{ blocked_url_category_ids }}"
         state: present
-        serial: string
-        simFailover:
-          enabled: true
-          timeout: 300
-        simOrdering:
-          - sim1
-          - sim2
-          - sim3
-        sims:
-          - apns:
-              - allowedIpTypes:
-                  - ipv4
-                  - ipv6
-                authentication:
-                  password: secret
-                  type: pap
-                  username: milesmeraki
-                name: internet
-            isPrimary: false
-            simOrder: 3
-            slot: sim2

plugins/action/administered_licensing_subscription_subscriptions_bind.py

@@ -67,7 +67,7 @@ def _check_argspec(self):
     def get_object(self, params):
         new_object = dict(
             networkIds=params.get("networkIds"),
-            subscription_id=params.get("subscriptionId"),
+            subscriptionId=params.get("subscriptionId"),
             validate=params.get("validate"),
         )
         return new_object

plugins/action/networks_appliance_content_filtering.py

@@ -144,6 +144,12 @@ def requires_update(self, current_obj):
         ]
         # Method 1. Params present in request (Ansible) obj are the same as the current (ISE) params
         # If any does not have eq params, it requires update
+
+        new_blocked_url_categories = []
+        for category in current_obj.get("blockedUrlCategories"):
+            new_blocked_url_categories.append(category.get("id"))
+
+        current_obj["blockedUrlCategories"] = new_blocked_url_categories
         return any(not meraki_compare_equality2(current_obj.get(meraki_param),
                                                 requested_obj.get(ansible_param))
                    for (meraki_param, ansible_param) in obj_params)

plugins/plugin_utils/meraki.py

@@ -68,6 +68,15 @@ def has_diff_elem2(ls1, ls2):
     """Compares two lists, with dictionaries inside them, to detect differences."""
     if len(ls1) != len(ls2):
         return True
+
+    # Check if first elements are dictionaries before accessing keys
+    if not (isinstance(ls1[0], dict) and isinstance(ls2[0], dict)):
+        # If not both dicts, fall back to simple comparison
+        for i, elem in enumerate(ls2):
+            if str(ls1[i]) != str(elem):
+                return True
+        return False
+
     # Only compare common keys between ls1 and ls2
     common_keys = set(ls1[0].keys()) & set(ls2[0].keys())
     for i, elem in enumerate(ls2):