Merge pull request #129 from meraki/develop

v2.21.7

Author: fmunozmiranda

CHANGELOG.rst

@@ -4,6 +4,17 @@ Cisco.Meraki Release Notes
 
 .. contents:: Topics
 
+v2.21.7
+=======
+
+Bugfixes
+--------
+
+- "Enhanced networks_switch_qos_rules_order object lookup logic to properly match QoS rules by vlan, protocol, srcPort, and dstPort parameters"
+- "Fixed parameter handling in networks_switch_switch_qos_rules_order to use qosRuleId instead of id for object identification"
+- "Improved meraki_compare_equality2 function to handle None value comparisons more accurately"
+- "Updated networks_switch_qos_rules_order playbook with corrected parameter values and VLAN configuration"
+
 v2.21.6
 =======
 

changelogs/changelog.yaml

@@ -1292,3 +1292,11 @@ releases:
         - "Enhanced networks_switch_qos_rules_order with improved VLAN handling and debugging capabilities"
 
     release_date: "2025-01-11"
+  2.21.7:
+    changes:
+      bugfixes:
+        - "Enhanced networks_switch_qos_rules_order object lookup logic to properly match QoS rules by vlan, protocol, srcPort, and dstPort parameters"
+        - "Fixed parameter handling in networks_switch_qos_rules_order to use qosRuleId instead of id for object identification"
+        - "Improved meraki_compare_equality2 function to handle None value comparisons more accurately"
+        - "Updated networks_switch_qos_rules_order playbook with corrected parameter values and VLAN configuration"
+    release_date: "2025-01-11"

galaxy.yml

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

playbooks/networks_switch_qos_rules_order.yml

@@ -6,9 +6,10 @@
       cisco.meraki.networks_switch_qos_rules_order:
         meraki_suppress_logging: false
         state: present
-        dscp: 1
-        dstPort: 3000
+        dscp: -1
+        # dstPort: 3000
+        dstPortRange: ANY
         networkId: L_828099381482771185
         protocol: UDP
-        srcPort: 2000
-        vlan: null
+        srcPort: 2001
+        vlan: 10

plugins/action/networks_switch_qos_rules_order.py

@@ -23,9 +23,7 @@
     meraki_compare_equality2,
     get_dict_result,
 )
-from ansible_collections.cisco.meraki.plugins.plugin_utils.exceptions import (
-    InconsistentParameters,
-)
+
 
 # Get common arguments specification
 argument_spec = meraki_argument_spec()
@@ -165,9 +163,13 @@ def get_object_by_name(self, name):
             if isinstance(items, dict):
                 if 'response' in items:
                     items = items.get('response')
-            result = get_dict_result(items, 'vlan', name)
-            if result is None:
-                result = items
+            for item in items:
+                if (item.get("vlan") == self.new_object.get("vlan") and
+                        item.get("protocol") == self.new_object.get("protocol") and
+                        item.get("srcPort") == self.new_object.get("srcPort") and
+                        item.get("dstPort") == self.new_object.get("dstPort")):
+                    result = item
+                    break
         except Exception as e:
             print("Error: ", e)
             result = None
@@ -184,7 +186,12 @@ def get_object_by_id(self, id):
             if isinstance(items, dict):
                 if 'response' in items:
                     items = items.get('response')
-            result = get_dict_result(items, 'qosRuleId', id)
+            if id is not None:
+                print("Is NOT NONE")
+                result = get_dict_result(items, 'qosRuleId', id)
+            else:
+                # Validate if this
+                print("Is NONE")
         except Exception as e:
             print("Error: ", e)
             result = None
@@ -194,33 +201,21 @@ def exists(self):
         id_exists = False
         name_exists = False
         prev_obj = None
-        o_id = self.new_object.get("id")
+        o_id = self.new_object.get("qosRuleId") or self.new_object.get("id")
         o_id = o_id or self.new_object.get(
             "qos_rule_id") or self.new_object.get("qosRuleId")
-        name = self.new_object.get("vlan")
+        name = self.new_object.get("name") or self.new_object.get("id")
         if o_id:
             prev_obj = self.get_object_by_id(o_id)
-            id_exists = prev_obj is not None and isinstance(prev_obj, dict)
-        if not id_exists and name or name is None:
+        else:
+            print("Is NONE")
             prev_obj = self.get_object_by_name(name)
-            name_exists = prev_obj is not None and isinstance(prev_obj, dict)
-        if name_exists:
-            _id = prev_obj.get("id")
-            _id = _id or prev_obj.get("qosRuleId")
-            if id_exists and name_exists and o_id != _id:
-                raise InconsistentParameters(
-                    "The 'id' and 'name' params don't refer to the same object")
-            if _id:
-                self.new_object.update(dict(id=_id))
-                self.new_object.update(dict(qosRuleId=_id))
-            if _id:
-                prev_obj = self.get_object_by_id(_id)
         it_exists = prev_obj is not None and isinstance(prev_obj, dict)
         return (it_exists, prev_obj)
 
     def requires_update(self, current_obj):
         requested_obj = self.new_object
-
+        current_obj["networkId"] = requested_obj.get("networkId") or None
         obj_params = [
             ("dscp", "dscp"),
             ("dstPort", "dstPort"),

plugins/plugin_utils/meraki.py

@@ -152,9 +152,14 @@ def meraki_compare_equality(current_value, requested_value):
 
 def meraki_compare_equality2(current_value, requested_value):
     # print("meraki_compare_equality", current_value, requested_value)
+    if requested_value is not None and current_value is None:
+        # print("requested_value is not None and current_value is None", False)
+        return False
     if requested_value is None:
+        # print("requested_value is None", True)
         return True
     if current_value is None:
+        # print("current_value", True)
         return True
     if isinstance(current_value, dict) and isinstance(requested_value, dict):
         all_dict_params = list(current_value.keys()) + \
@@ -163,6 +168,7 @@ def meraki_compare_equality2(current_value, requested_value):
     elif isinstance(current_value, list) and isinstance(requested_value, list):
         return compare_list(current_value, requested_value)
     else:
+        # print("current_value == requested_value", current_value == requested_value)
         return current_value == requested_value