Merge branch 'master' into feature/pagination_rest

CiscoDevNet · Dec 15, 2024 · 8807df1 · 8807df1
2 parents 8f0db6a + 7272ad6
commit 8807df1
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 60 deletions.
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -7,15 +7,15 @@ on:
     # * is a special character in YAML so you have to quote this string
     - cron: '0 8 * * *'
 env:
-  python_version: '3.10'
+  python_version: '3.11'
 jobs:
   build:
     name: Build collection
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ansible: [v2.15.11, v2.16.6, stable-2.16, stable-2.17]
+        ansible: [v2.16.6, stable-2.16, stable-2.17, stable-2.18]
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ansible: [stable-2.17]
+        ansible: [stable-2.18]
     steps:
       - name: Set up Python ${{ env.python_version }}
         uses: actions/setup-python@v5
@@ -116,7 +116,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ansible: [v2.15.11, v2.16.6, stable-2.16, stable-2.17]
+        ansible: [v2.16.6, stable-2.16, stable-2.17, stable-2.18]
     steps:
       - name: Set up Python ${{ env.python_version }}
         uses: actions/setup-python@v5
@@ -158,7 +158,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ansible: [v2.15.11, v2.16.6, stable-2.16, stable-2.17]
+        ansible: [v2.16.6, stable-2.16, stable-2.17, stable-2.18]
     steps:
       - name: Set up Python ${{ env.python_version }}
         uses: actions/setup-python@v5
@@ -200,7 +200,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ansible: [stable-2.17]
+        ansible: [stable-2.18]
     env:
       MUTEX_URL: https://8v7s765ibh.execute-api.us-west-1.amazonaws.com
     steps:

diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ See the [cisco.aci collection index](https://galaxy.ansible.com/ui/repo/publishe
 
 ## Requirements
 
-- Ansible v2.15 or newer
-- Python v3.10 or newer
+- Ansible v2.16 or newer
+- Python v3.11 or newer
 
 Follow the [Installing Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) guide for detailed instructions.
 

diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -1,5 +1,5 @@
 ---
-requires_ansible: '>=2.15.0'
+requires_ansible: '>=2.16.0'
 action_groups:
   all:
     - aci_aaa_certificate_authority

diff --git a/plugins/modules/aci_cloud_subnet.py b/plugins/modules/aci_cloud_subnet.py
@@ -28,6 +28,7 @@
     description:
     - The name of the Cloud Subnet.
     type: str
+    aliases: [subnet]
   description:
     description:
     - Description of the Cloud Subnet.
@@ -36,7 +37,7 @@
     description:
     - Ip address of the Cloud Subnet.
     type: str
-    aliases: [subnet]
+    aliases: [ip]
   name_alias:
     description:
     - An alias for the name of the current object. This relates to the nameAlias field in ACI and is used to rename object without changing the DN.
@@ -255,7 +256,7 @@ def main():
     argument_spec.update(
         name=dict(type="str", aliases=["subnet"]),
         description=dict(type="str"),
-        address=dict(type="str"),
+        address=dict(type="str", aliases=["ip"]),
         name_alias=dict(type="str"),
         vnet_gateway=dict(type="bool", default=False),
         tenant=dict(type="str", required=True),

diff --git a/plugins/modules/aci_epg_to_domain.py b/plugins/modules/aci_epg_to_domain.py
@@ -48,7 +48,8 @@
     aliases: [ type ]
   encap:
     description:
-    - The VLAN encapsulation for the EPG when binding a VMM Domain with static C(encap_mode).
+    - The VLAN encapsulation for the EPG when binding a VMM Domain in static VLAN mode.
+    - The VLAN mode in UI is set to static when O(encap) is not set.
     - This acts as the secondary encap when using useg.
     - Accepted values range between C(1) and C(4096).
     type: int

diff --git a/plugins/modules/aci_interface_description.py b/plugins/modules/aci_interface_description.py
@@ -289,6 +289,7 @@ def main():
         class_name = "infraSHPathS"
         children = ["infraRsSHPathAtt"]
     rn = None
+    child_configs = None
 
     if node_id and interface:
         if fex_id:

diff --git a/plugins/modules/aci_interface_policy_hsrp.py b/plugins/modules/aci_interface_policy_hsrp.py
@@ -64,7 +64,7 @@
 - The C(tenant) must exist before using this module in your playbook.
   The M(cisco.aci.aci_tenant) can be used for this.
 seealso:
-- module: aci_tenant
+- module: cisco.aci.aci_tenant
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(hsrp:IfPol).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l2out_logical_interface_path.py b/plugins/modules/aci_l2out_logical_interface_path.py
@@ -74,10 +74,10 @@
 - cisco.aci.annotation
 
 seealso:
-- module: aci_l2out
-- module: aci_l2out_logical_node_profile
-- module: aci_l2out_logical_interface_profile
-- module: aci_l2out_extepg
+- module: cisco.aci.aci_l2out
+- module: cisco.aci.aci_l2out_logical_node_profile
+- module: cisco.aci.aci_l2out_logical_interface_profile
+- module: cisco.aci.aci_l2out_extepg
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(l2ext:RsPathL2OutAtt).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l2out_logical_interface_profile.py b/plugins/modules/aci_l2out_logical_interface_profile.py
@@ -50,10 +50,10 @@
 - cisco.aci.owner
 
 seealso:
-- module: aci_l2out
-- module: aci_l2out_logical_node_profile
-- module: aci_l2out_logical_interface_path
-- module: aci_l2out_extepg
+- module: cisco.aci.aci_l2out
+- module: cisco.aci.aci_l2out_logical_node_profile
+- module: cisco.aci.aci_l2out_logical_interface_path
+- module: cisco.aci.aci_l2out_extepg
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(l2ext:LIfP).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l2out_logical_node_profile.py b/plugins/modules/aci_l2out_logical_node_profile.py
@@ -44,10 +44,10 @@
 - cisco.aci.owner
 
 seealso:
-- module: aci_l2out
-- module: aci_l2out_logical_interface_profile
-- module: aci_l2out_logical_interface_path
-- module: aci_l2out_extepg
+- module: cisco.aci.aci_l2out
+- module: cisco.aci.aci_l2out_logical_interface_profile
+- module: cisco.aci.aci_l2out_logical_interface_path
+- module: cisco.aci.aci_l2out_extepg
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(l2ext:LNodeP).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_bgp_peer.py b/plugins/modules/aci_l3out_bgp_peer.py
@@ -186,8 +186,8 @@
 - cisco.aci.annotation
 
 seealso:
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
 - name: APIC Management Information Model reference
   description: More information about the internal APIC classes B(bgp:peerP) and B(bgp:InfraPeerP)
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_hsrp_group.py b/plugins/modules/aci_l3out_hsrp_group.py
@@ -94,11 +94,11 @@
   your playbook. The M(cisco.aci.aci_tenant), M(cisco.aci.aci_l3out), M(cisco.aci.aci_l3out_logical_node_profile),
   M(cisco.aci.aci_l3out_logical_interface_profile) and M(cisco.aci.aci_l3out_hsrp_interface_profile) can be used for this.
 seealso:
-- module: aci_tenant
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
-- module: aci_l3out_logical_interface_profile
-- module: aci_l3out_hsrp_interface_profile
+- module: cisco.aci.aci_tenant
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out_logical_interface_profile
+- module: cisco.aci.aci_l3out_hsrp_interface_profile
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(hsrp:IfP).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_hsrp_interface_profile.py b/plugins/modules/aci_l3out_hsrp_interface_profile.py
@@ -66,11 +66,11 @@
 - If C(hsrp_policy) is used, it must exist before using this module in your playbook.
   The M(cisco.aci.aci_interface_policy_hsrp) can be used for this.
 seealso:
-- module: aci_tenant
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
-- module: aci_l3out_logical_interface_profile
-- module: aci_interface_policy_hsrp
+- module: cisco.aci.aci_tenant
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out_logical_interface_profile
+- module: cisco.aci.aci_interface_policy_hsrp
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(hsrp:IfP).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_hsrp_secondary_vip.py b/plugins/modules/aci_l3out_hsrp_secondary_vip.py
@@ -65,12 +65,12 @@
   M(cisco.aci.aci_l3out_logical_interface_profile), M(cisco.aci.aci_l3out_hsrp_interface_profile) and M(cisco.aci.aci_l3out_hsrp_group) can be used for
   this.
 seealso:
-- module: aci_tenant
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
-- module: aci_l3out_logical_interface_profile
-- module: aci_l3out_hsrp_interface_profile
-- module: aci_l3out_hsrp_group
+- module: cisco.aci.aci_tenant
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out_logical_interface_profile
+- module: cisco.aci.aci_l3out_hsrp_interface_profile
+- module: cisco.aci.aci_l3out_hsrp_group
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(hsrp:SecVip).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_interface.py b/plugins/modules/aci_l3out_interface.py
@@ -137,10 +137,10 @@
   The M(cisco.aci.aci_tenant), M(cisco.aci.aci_l3out), M(cisco.aci.aci_l3out_logical_node_profile) and
   M(cisco.aci.aci_l3out_logical_interface_profile) can be used for this.
 seealso:
-- module: aci_tenant
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
-- module: aci_l3out_logical_interface_profile
+- module: cisco.aci.aci_tenant
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out_logical_interface_profile
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(l3ext:RsPathL3OutAtt)
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_interface_secondary_ip.py b/plugins/modules/aci_l3out_interface_secondary_ip.py
@@ -81,13 +81,11 @@
 - cisco.aci.aci
 - cisco.aci.annotation
 
-notes:
-- This is a test
 seealso:
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
-- module: aci_l3out_logical_interface_profile
-- module: aci_l3out_logical_interface
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out_logical_interface_profile
+- module: cisco.aci.aci_l3out_logical_interface
 - name: APIC Management Information Model reference
   description: More information about the internal APIC class B(l3ext:Ip)
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_logical_node.py b/plugins/modules/aci_l3out_logical_node.py
@@ -80,8 +80,8 @@
 - cisco.aci.annotation
 
 seealso:
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
 - name: APIC Management Information Model reference
   description: More information about the internal APIC classes B(l3ext:RsNodeL3OutAtt)
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_logical_node_profile.py b/plugins/modules/aci_l3out_logical_node_profile.py
@@ -67,7 +67,7 @@
 - cisco.aci.owner
 
 seealso:
-- module: aci_l3out
+- module: cisco.aci.aci_l3out
 - name: APIC Management Information Model reference
   description: More information about the internal APIC classes B(l3ext:LNodeP).
   link: https://developer.cisco.com/docs/apic-mim-ref/

diff --git a/plugins/modules/aci_l3out_static_routes_nexthop.py b/plugins/modules/aci_l3out_static_routes_nexthop.py
@@ -60,10 +60,10 @@
 - cisco.aci.annotation
 
 seealso:
-- module: aci_l3out
-- module: aci_l3out_logical_node_profile
-- module: aci_l3out_logical_node_profile_to_node
-- module: aci_l3out_static_routes
+- module: cisco.aci.aci_l3out
+- module: cisco.aci.aci_l3out_logical_node_profile
+- module: cisco.aci.aci_l3out_logical_node_profile_to_node
+- module: cisco.aci.aci_l3out_static_routes
 - name: APIC Management Information Model reference
   description: More information about the internal APIC classes B(ip:NexthopP)
   link: https://developer.cisco.com/docs/apic-mim-ref/