dcnm_vrf fix issues #351, #356, #357

playbooks/roles/dcnm_image_policy/dcnm_tests.yaml

@@ -25,6 +25,8 @@
     leaf2: 192.168.1.5
     leaf3: 192.168.1.6
     leaf4: 192.168.1.7
+    install_package_1: cfg_cmp-0.3.1.0-1.x86_64.rpm
+    uninstall_package_1: mtx-grpctunnel-2.1.0.0-10.4.1.lib32_64_n9000
     image_policy_1: "KR5M"
     image_policy_2: "NR3F"
     epld_image_1: n9000-epld.10.2.5.M.img

plugins/module_utils/fabric/replaced.py

@@ -468,7 +468,7 @@ def _send_payloads(self):
 
         for payload in self._payloads_to_commit:
             commit_payload = copy.deepcopy(payload)
-            if commit_payload.get("DEPLOY", None) is not None:
+            if "DEPLOY" in commit_payload:
                 commit_payload.pop("DEPLOY")
             try:
                 self._send_payload(commit_payload)

plugins/modules/dcnm_fabric.py

@@ -3032,7 +3032,7 @@ def get_need(self):
             fabric_name = want.get("FABRIC_NAME", None)
             fabric_type = want.get("FABRIC_TYPE", None)
 
-            if self.features[fabric_type] is False:
+            if self.features.get("fabric_type") is False:
                 msg = f"{self.class_name}.{method_name}: "
                 msg += f"Features required for fabric {fabric_name} "
                 msg += f"of type {fabric_type} are not running on the "
@@ -3361,7 +3361,7 @@ def get_need(self):
                 self.need_create.append(want)
                 continue
 
-            if self.features[fabric_type] is False:
+            if self.features.get("fabric_type") is False:
                 msg = f"{self.class_name}.{method_name}: "
                 msg += f"Features required for fabric {fabric_name} "
                 msg += f"of type {fabric_type} are not running on the "

plugins/modules/dcnm_image_policy.py

@@ -592,7 +592,7 @@ def __init__(self, params):
             raise ValueError(msg) from error
 
         self.delete = ImagePolicyDelete()
-        self.merged = Merged(params)
+        self.replaced = Replaced(params)
 
         msg = f"ENTERED {self.class_name}().{method_name}: "
         msg += f"state: {self.state}, "
@@ -627,10 +627,10 @@ def commit(self) -> None:
 
         self._delete_policies_not_in_want()
         # pylint: disable=attribute-defined-outside-init
-        self.merged.rest_send = self.rest_send
+        self.replaced.rest_send = self.rest_send
         # pylint: enable=attribute-defined-outside-init
-        self.merged.results = self.results
-        self.merged.commit()
+        self.replaced.results = self.results
+        self.replaced.commit()
 
     def _delete_policies_not_in_want(self) -> None:
         """