Merge pull request #147 from hemanthKa677/test_del_network

NIOSSPT Ansible cannot delete the network
infobloxopen · Sep 19, 2022 · baf619f · baf619f
2 parents e8277d0 + 93cd5f3
commit baf619f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -91,7 +91,7 @@ jobs:
 
       - name: Generate coverage report
         run: |
-          if [ "${{ matrix.ansible-version }}" == "devel" ]; then pip install coverage==6.4.3; fi
+          if [ "${{ matrix.ansible-version }}" == "devel" ]; then pip install coverage==6.4.4; fi
           ansible-test coverage xml -v --group-by command --group-by version
         working-directory: /home/runner/.ansible/collections/ansible_collections/infoblox/nios_modules/
 

diff --git a/plugins/module_utils/api.py b/plugins/module_utils/api.py
@@ -665,6 +665,14 @@ def get_object_ref(self, module, ib_obj_type, obj_filter, ib_spec):
             if temp:
                 # reinstate 'create_token' key
                 ib_spec['create_token'] = temp
+        elif (ib_obj_type in (NIOS_IPV4_NETWORK, NIOS_IPV6_NETWORK, NIOS_IPV4_NETWORK_CONTAINER, NIOS_IPV6_NETWORK_CONTAINER)):
+            # del key 'template' as nios_network get_object fails with the key present
+            temp = ib_spec['template']
+            del ib_spec['template']
+            ib_obj = self.get_object(ib_obj_type, obj_filter.copy(), return_fields=list(ib_spec.keys()))
+            if temp:
+                # reinstate 'template' key
+                ib_spec['template'] = temp
         else:
             ib_obj = self.get_object(ib_obj_type, obj_filter.copy(), return_fields=list(ib_spec.keys()))
         return ib_obj, update, new_name

diff --git a/plugins/modules/nios_network.py b/plugins/modules/nios_network.py
@@ -238,15 +238,13 @@ def check_ip_addr_type(obj_filter, ib_spec):
         check_ip = ip.split('/')
         del ib_spec['container']  # removing the container key from post arguments
         del ib_spec['options']  # removing option argument as for network container it's not supported
-        del ib_spec['template']  # removing template argument as it is not searchable argument
         if validate_ip_address(check_ip[0]):
             return NIOS_IPV4_NETWORK_CONTAINER, ib_spec
         elif validate_ip_v6_address(check_ip[0]):
             return NIOS_IPV6_NETWORK_CONTAINER, ib_spec
     else:
         check_ip = ip.split('/')
         del ib_spec['container']  # removing the container key from post arguments
-        del ib_spec['template']  # removing template argument as it is not searchable argument
         if validate_ip_address(check_ip[0]):
             return NIOS_IPV4_NETWORK, ib_spec
         elif validate_ip_v6_address(check_ip[0]):