Merge pull request #268 from cisco-en-programmability/develop

Develop

Author: JosePabloOcampo1212

README.md

@@ -22,7 +22,7 @@ The following table shows the supported versions.
 | 2.3.7.6                  | 6.24.0                       |  2.8.3                        |
 | 2.3.7.6                  | 6.25.0                       |  2.8.3                        |
 | 2.3.7.7                  | 6.30.2                       |  2.8.6                        |
-| 2.3.7.9                  | ^6.31.3                      |  ^2.8.6                       |
+| 2.3.7.9                  | ^6.33.1                      |  ^2.8.6                       |
 
 If your Ansible collection is older please consider updating it first.
 

changelogs/changelog.yaml

@@ -1608,3 +1608,10 @@ releases:
         - Added attributes 'ipv4_total_addresses', 'ipv4_unassignable_addresses', 'ipv4_assigned_addresses', 'ipv4_default_assigned_addresses', 'ipv6_total_addresses', 'ipv6_unassignable_addresses', 'ipv6_assigned_addresses', 'ipv6_default_assigned_addresses' in 'network_settings_workflow_manager' module
         - Added attribute 'sda_fabric_gateway_limit' in 'sda_fabric_virtual_networks_workflow_manager' module
         - Added attribute 'sub_package_images' in 'swim_workflow_manager' module
+
+  6.33.1:
+    release_date: "2025-05-12"
+    changes:
+      release_summary: Changes in reserve_ip_subpool modules
+      minor_changes:
+        - Correction of issue 266 in the reserve_ip_subpool modules

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: cisco
 name: dnac
-version: 6.33.0
+version: 6.33.1
 readme: README.md
 authors:
   - Rafael Campos <rcampos@altus.cr>

playbooks/reserve_ip_subpool.yml

@@ -5,7 +5,7 @@
     - credentials.yml
   gather_facts: false
   vars:
-    site: bb25cdaf-3f5a-45b9-bdd6-0f63fdf6c83e
+    site: 4b9ece30-ef82-4141-ab37-62b33286195b
 
   tasks:
     - name: Create reservation
@@ -18,19 +18,22 @@
         dnac_version: "{{ dnac_version }}"
         dnac_debug: "{{ dnac_debug }}"
         state: present
+        ignoreInheritedGroups: true
+        name: SubPool-Sucursal-01
+        type: Generic
+        ipv6AddressSpace: false
+        ipv4GlobalPool: 10.10.0.0/16
+        ipv4Prefix: true
+        ipv4PrefixLength: 28
+        ipv4Subnet: 10.10.1.0
+        ipv4GateWay: 10.10.1.1
         ipv4DhcpServers:
-          - 55.66.55.55
+          - 10.10.1.2
         ipv4DnsServers:
-          - 33.33.33.3
-        ipv4GateWay: 10.0.10.1
-        ipv4GlobalPool: 10.0.0.0/8
-        ipv4Prefix: true
-        ipv4PrefixLength: 24
-        ipv4Subnet: 10.0.10.0/24
-        name: IP Pool 1
+          - 8.8.8.8
+          - 8.8.4.4
+        slaacSupport: false
         siteId: "{{ site }}"
-        slaacSupport: true
-        type: LAN
 
     - name: Get Reservations
       cisco.dnac.reserve_ip_subpool_info:

plugins/action/reserve_ip_subpool_v1.py

@@ -53,6 +53,7 @@
     slaacSupport=dict(type="bool"),
     siteId=dict(type="str"),
     id=dict(type="str"),
+    ignoreInheritedGroups=dict(type="bool", default=False),
 ))
 
 required_if = [
@@ -90,6 +91,7 @@ def __init__(self, params, dnac):
             slaacSupport=params.get("slaacSupport"),
             site_id=params.get("siteId"),
             id=params.get("id"),
+            ignoreInheritedGroups=params.get("ignoreInheritedGroups"),
         )
 
     def get_all_params(self, name=None, id=None):
@@ -128,7 +130,7 @@ def create_params(self):
         new_object_params['ipv4TotalHost'] = self.new_object.get('ipv4TotalHost')
         new_object_params['ipv6TotalHost'] = self.new_object.get('ipv6TotalHost')
         new_object_params['slaacSupport'] = self.new_object.get('slaacSupport')
-        new_object_params['siteId'] = self.new_object.get('siteId')
+        new_object_params['site_id'] = self.new_object.get('site_id')
         return new_object_params
 
     def delete_by_id_params(self):
@@ -152,7 +154,7 @@ def update_by_id_params(self):
         new_object_params['ipv6DnsServers'] = self.new_object.get('ipv6DnsServers')
         new_object_params['slaacSupport'] = self.new_object.get('slaacSupport')
         new_object_params['ipv4GateWay'] = self.new_object.get('ipv4GateWay')
-        new_object_params['siteId'] = self.new_object.get('siteId')
+        new_object_params['site_id'] = self.new_object.get('site_id')
         return new_object_params
 
     def get_object_by_name(self, name):
@@ -172,18 +174,21 @@ def get_object_by_name(self, name):
             result = None
         return result
 
-    def get_object_by_id(self, id):
+    def get_object_by_id(self, id, ignoreInheritedGroups):
         result = None
         # NOTE: Does not have a get by id method or it is in another action
         try:
             items = self.dnac.exec(
                 family="network_settings",
                 function="get_reserve_ip_subpool_v1",
-                params=self.get_all_params(id=id),
+                params=self.get_all_params(site_id=id, ignoreInheritedGroups=ignoreInheritedGroups),
             )
             if isinstance(items, dict):
                 if 'response' in items:
                     items = items.get('response')
+                    if items == []:
+                        result = None
+                        return result
             result = get_dict_result(items, 'id', id)
         except Exception:
             result = None
@@ -193,11 +198,11 @@ def exists(self):
         id_exists = False
         name_exists = False
         prev_obj = None
-        o_id = self.new_object.get("id")
-        o_id = o_id or self.new_object.get("site_id")
+        o_id = self.new_object.get("site_id")
         name = self.new_object.get("name")
+        ignoreInheritedGroups = self.new_object.get("ignoreInheritedGroups")
         if o_id:
-            prev_obj = self.get_object_by_id(o_id)
+            prev_obj = self.get_object_by_id(o_id, ignoreInheritedGroups)
             id_exists = prev_obj is not None and isinstance(prev_obj, dict)
         if not id_exists and name:
             prev_obj = self.get_object_by_name(name)
@@ -237,7 +242,7 @@ def requires_update(self, current_obj):
             ("ipv4TotalHost", "ipv4TotalHost"),
             ("ipv6TotalHost", "ipv6TotalHost"),
             ("slaacSupport", "slaacSupport"),
-            ("siteId", "site_id"),
+            ("site_id", "site_id"),
             ("id", "id"),
         ]
         # Method 1. Params present in request (Ansible) obj are the same as the current (DNAC) params

plugins/modules/reserve_ip_subpool_v1.py

@@ -88,6 +88,13 @@
   siteId:
     description: SiteId path parameter. Site id to reserve the ip sub pool.
     type: str
+  ignoreInheritedGroups:
+    description:
+      - >
+        IgnoreInheritedGroups query parameter. Ignores pools inherited from parent
+        site. Either siteId or
+        ignoreInheritedGroups must be passed. They can also be used together.
+    type: bool
   slaacSupport:
     description: Slaac Support.
     type: bool
@@ -135,6 +142,7 @@
     dnac_version: "{{dnac_version}}"
     dnac_debug: "{{dnac_debug}}"
     state: present
+    ignoreInheritedGroups: true
     ipv4DhcpServers:
       - string
     ipv4DnsServers: