ipam_subnet implementation for Bloxone Ansible v2

changelogs/fragments/32-ip-space.yml

@@ -1,5 +1,3 @@
 deprecated_features:
   - b1_ipam_ip_space - is deprecated in favor of `ipam_ip_space`.
   - b1_ipam_ip_space_gather - is deprecated in favor of `ipam_ip_space_info`.
-  - b1_ipam_ip_subnet - is deprecated in favor of 'ipam_subnet'.
-  - b1_ipam_ip_subnet_gather - is deprecated in favor of 'ipam_subnet_info'.

changelogs/fragments/36-subnet.yml

@@ -0,0 +1,3 @@
+deprecated_features:
+  - b1_ipam_ip_subnet - is deprecated in favor of 'ipam_subnet'.
+  - b1_ipam_ip_subnet_gather - is deprecated in favor of 'ipam_subnet_info'.

meta/runtime.yml

@@ -10,6 +10,8 @@ action_groups:
   ipam:
     - ipam_ip_space
     - ipam_ip_space_info
+    - ipam_subnet
+    - ipam_subnet_info
 
 plugin_routing:
     modules:

plugins/modules/b1_ipam_subnet.py

@@ -16,7 +16,7 @@
 version_added: "1.1.2"
 deprecated:
   removed_in: 3.0.0
-  alternative: Use M(ipam_ip_space) instead.
+  alternative: Use M(ipam_subnet) instead.
 description:
   - Create, Update and Delete Subnets on Infoblox BloxOne DDI. This module manages the IPAM Subnet object using BloxOne REST APIs.
 requirements:

plugins/modules/b1_ipam_subnet_gather.py

@@ -16,7 +16,7 @@
 version_added: "1.1.2"
 deprecated:
   removed_in: 3.0.0
-  alternative: Use M(ipam_ip_space) instead.
+  alternative: Use M(ipam_subnet_info) instead.
 description:
   - Gather information about subnet object in Infoblox BloxOne DDI. This module manages the subnet object using BloxOne REST APIs.
 requirements:

plugins/modules/ipam_subnet.py

@@ -2467,7 +2467,7 @@ def find(self):
                     return None
                 raise e
         else:
-            filter = f"address=='{self.params['address']}' and space=='{self.params['space']}'"
+            filter = f"address=='{self.params['address']}' and space=='{self.params['space']}' and cidr=='{self.params['cidr']}'"
             resp = SubnetApi(self.client).list(filter=filter, inherit="full")
             if len(resp.results) == 1:
                 return resp.results[0]

tests/integration/targets/ipam_subnet/tasks/main.yml

@@ -438,12 +438,6 @@
 
   always:
     # Cleanup if the test fails
-    - name: "Delete Subnet"
-      infoblox.bloxone.ipam_subnet:
-        address: "10.0.0.0/24"
-        space: "{{ ip_space.id }}"
-        state: "absent"
-      ignore_errors: true
     - name: "Delete IP Space"
       infoblox.bloxone.ipam_ip_space:
         name: "{{ name }}"