[ignore] Removed name attribute from endpoint_ip_tag and endpoint_mac_tag modules

sajagana · lhercot · commit d82a230d34ca · 2025-04-10T17:35:13.000-07:00
diff --git a/plugins/modules/aci_endpoint_ip_tag.py b/plugins/modules/aci_endpoint_ip_tag.py
@@ -21,10 +21,6 @@
     description:
     - The name of the Tenant.
     type: str
-  name:
-    description:
-    - The name of the Endpoint IP Tag.
-    type: str
   endpoint_ip_address:
     description:
     - The IPv4 or IPv6 address of the Endpoint IP Tag.
@@ -71,9 +67,8 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_ip_address: "1.1.1.1"
+    endpoint_ip_address: 1.1.1.1
     vrf: endpoint_vrf
-    name: "1.1.1.1"
     name_alias: endpoint_ip_tag
     state: present
 
@@ -83,9 +78,8 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_ip_address: "1.1.1.1"
+    endpoint_ip_address: 1.1.1.1
     vrf: endpoint_vrf
-    name: "1.1.1.1"
     name_alias: endpoint_ip_tag_updated
     state: present
 
@@ -95,7 +89,7 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_ip_address: "1.1.1.1"
+    endpoint_ip_address: 1.1.1.1
     vrf: endpoint_vrf
     state: query
   register: query_one
@@ -114,7 +108,7 @@
     host: apic
     username: admin
     password: SomeSecretPassword
-    endpoint_ip_address: "1.1.1.1"
+    endpoint_ip_address: 1.1.1.1
     state: query
   register: query_with_ip
 
@@ -132,7 +126,7 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_ip_address: "1.1.1.1"
+    endpoint_ip_address: 1.1.1.1
     vrf: endpoint_vrf
     state: present
 """
@@ -252,7 +246,6 @@ def main():
     argument_spec.update(aci_owner_spec())
     argument_spec.update(
         tenant=dict(type="str"),
-        name=dict(type="str"),
         endpoint_ip_address=dict(type="str", aliases=["ip_addr", "ip"]),
         vrf=dict(type="str", aliases=["vrf_name"]),
         name_alias=dict(type="str"),
@@ -273,18 +266,18 @@ def main():
     tenant = module.params.get("tenant")
     endpoint_ip_address = module.params.get("endpoint_ip_address")
     vrf = module.params.get("vrf")
-    name = module.params.get("name")
     name_alias = module.params.get("name_alias")
     annotation = module.params.get("annotation")
     state = module.params.get("state")
 
     aci = ACIModule(module)
 
-    endpoint_ip_tag_rn = None
-    endpoint_ip_tag_module_object = None
     if endpoint_ip_address and vrf:
-        endpoint_ip_tag_rn = "eptags/epiptag-[{0}]-{1}".format(endpoint_ip_address, vrf)
         endpoint_ip_tag_module_object = "[{0}]-{1}".format(endpoint_ip_address, vrf)
+        endpoint_ip_tag_rn = "eptags/epiptag-{0}".format(endpoint_ip_tag_module_object)
+    else:
+        endpoint_ip_tag_rn = None
+        endpoint_ip_tag_module_object = None
 
     aci.construct_url(
         root_class=dict(
@@ -309,7 +302,6 @@ def main():
                 annotation=annotation,
                 ctxName=vrf,
                 ip=endpoint_ip_address,
-                name=name,
                 nameAlias=name_alias,
             ),
         )
diff --git a/plugins/modules/aci_endpoint_mac_tag.py b/plugins/modules/aci_endpoint_mac_tag.py
@@ -21,10 +21,6 @@
     description:
     - The name of the Tenant.
     type: str
-  name:
-    description:
-    - The name of the Endpoint MAC Tag.
-    type: str
   endpoint_mac_address:
     description:
     - The MAC address of the Endpoint MAC Tag.
@@ -65,25 +61,14 @@
 """
 
 EXAMPLES = r"""
-- name: Add a Fabric Leaf Policy Group
-  cisco.aci.aci_endpoint_mac_tag:
-    host: apic
-    username: admin
-    password: SomeSecretPassword
-    name: leaf_policy_group
-    type: leaf
-    state: present
-  delegate_to: localhost
-
 - name: Add a MAC Tag
   cisco.aci.aci_endpoint_mac_tag:
     host: apic
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
+    endpoint_mac_address: AE:ED:EE:EE:AA:AA
     bd: endpoint_bd
-    name: "AE:ED:EE:EE:AA:AA"
     name_alias: endpoint_mac_tag
     state: present
 
@@ -93,9 +78,8 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
+    endpoint_mac_address: AE:ED:EE:EE:AA:AA
     bd: endpoint_bd
-    name: "AE:ED:EE:EE:AA:AA"
     name_alias: endpoint_mac_tag_updated
     state: present
 
@@ -105,7 +89,7 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
+    endpoint_mac_address: AE:ED:EE:EE:AA:AA
     bd: endpoint_bd
     state: query
   register: query_one
@@ -124,7 +108,7 @@
     host: apic
     username: admin
     password: SomeSecretPassword
-    endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
+    endpoint_mac_address: AE:ED:EE:EE:AA:AA
     state: query
   register: query_with_mac
 
@@ -142,7 +126,7 @@
     username: admin
     password: SomeSecretPassword
     tenant: endpoint_tenant
-    endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
+    endpoint_mac_address: AE:ED:EE:EE:AA:AA
     bd: endpoint_bd
     state: absent
 """
@@ -262,7 +246,6 @@ def main():
     argument_spec.update(aci_owner_spec())
     argument_spec.update(
         tenant=dict(type="str"),
-        name=dict(type="str"),
         endpoint_mac_address=dict(type="str", aliases=["mac_addr", "mac"]),
         bd=dict(type="str", aliases=["bd_name"]),
         name_alias=dict(type="str"),
@@ -283,18 +266,18 @@ def main():
     tenant = module.params.get("tenant")
     endpoint_mac_address = module.params.get("endpoint_mac_address")
     bd = module.params.get("bd")
-    name = module.params.get("name")
     name_alias = module.params.get("name_alias")
     annotation = module.params.get("annotation")
     state = module.params.get("state")
 
     aci = ACIModule(module)
 
-    endpoint_mac_tag_rn = None
-    endpoint_mac_tag_module_object = None
     if endpoint_mac_address and bd:
-        endpoint_mac_tag_rn = "eptags/epmactag-{0}-[{1}]".format(endpoint_mac_address, bd)
         endpoint_mac_tag_module_object = "{0}-[{1}]".format(endpoint_mac_address, bd)
+        endpoint_mac_tag_rn = "eptags/epmactag-{0}".format(endpoint_mac_tag_module_object)
+    else:
+        endpoint_mac_tag_rn = None
+        endpoint_mac_tag_module_object = None
 
     aci.construct_url(
         root_class=dict(
@@ -320,7 +303,6 @@ def main():
                 annotation=annotation,
                 bdName=bd,
                 mac=endpoint_mac_address,
-                name=name,
                 nameAlias=name_alias,
             ),
         )
diff --git a/tests/integration/targets/aci_endpoint_ip_tag/tasks/main.yml b/tests/integration/targets/aci_endpoint_ip_tag/tasks/main.yml
@@ -62,7 +62,6 @@
         tenant: ansible_test
         endpoint_ip_address: "1.1.1.1"
         vrf: ansible_test_vrf
-        name: TestObject_1
         name_alias: TestIPTag
         state: present
         output_level: debug
@@ -75,7 +74,6 @@
         tenant: ansible_test
         endpoint_ip_address: "1.1.1.1"
         vrf: ansible_test_vrf
-        name: TestObject_1
         name_alias: TestIPTag
         state: present
       register: nm_add_ip_tag_1
@@ -86,7 +84,6 @@
         tenant: ansible_test
         endpoint_ip_address: "1.1.1.1"
         vrf: ansible_test_vrf
-        name: TestObject_1
         name_alias: TestIPTag
         state: present
       register: nm_add_ip_tag_1_again
@@ -101,28 +98,27 @@
           - cm_add_ip_tag_1.proposed.fvEpIpTag.attributes.ctxName == "ansible_test_vrf"
           - cm_add_ip_tag_1.proposed.fvEpIpTag.attributes.dn == "uni/tn-ansible_test/eptags/epiptag-[1.1.1.1]-ansible_test_vrf"
           - cm_add_ip_tag_1.proposed.fvEpIpTag.attributes.ip == "1.1.1.1"
-          - cm_add_ip_tag_1.proposed.fvEpIpTag.attributes.name == "TestObject_1"
           - cm_add_ip_tag_1.proposed.fvEpIpTag.attributes.nameAlias == "TestIPTag"
           - nm_add_ip_tag_1 is changed
           - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.annotation == "orchestrator:ansible"
           - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.ctxName == "ansible_test_vrf"
           - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.dn == "uni/tn-ansible_test/eptags/epiptag-[1.1.1.1]-ansible_test_vrf"
           - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.ip == "1.1.1.1"
-          - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.name == "TestObject_1"
+          - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.name == ""
           - nm_add_ip_tag_1.current.0.fvEpIpTag.attributes.nameAlias == "TestIPTag"
           - nm_add_ip_tag_1.previous == []
           - nm_add_ip_tag_1_again is not changed
           - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.annotation == "orchestrator:ansible"
           - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.ctxName == "ansible_test_vrf"
           - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.dn == "uni/tn-ansible_test/eptags/epiptag-[1.1.1.1]-ansible_test_vrf"
           - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.ip == "1.1.1.1"
-          - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.name == "TestObject_1"
+          - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.name == ""
           - nm_add_ip_tag_1_again.current.0.fvEpIpTag.attributes.nameAlias == "TestIPTag"
           - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.annotation == "orchestrator:ansible"
           - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.ctxName == "ansible_test_vrf"
           - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.dn == "uni/tn-ansible_test/eptags/epiptag-[1.1.1.1]-ansible_test_vrf"
           - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.ip == "1.1.1.1"
-          - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.name == "TestObject_1"
+          - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.name == ""
           - nm_add_ip_tag_1_again.previous.0.fvEpIpTag.attributes.nameAlias == "TestIPTag"
 
     - name: Add IP Tag Object - 2 with same vrf and different ip address
diff --git a/tests/integration/targets/aci_endpoint_mac_tag/tasks/main.yml b/tests/integration/targets/aci_endpoint_mac_tag/tasks/main.yml
@@ -62,7 +62,6 @@
         tenant: ansible_test
         endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
         bd: ansible_test_bd
-        name: TestObject_1
         name_alias: TestMacTag
         state: present
       check_mode: true
@@ -74,7 +73,6 @@
         tenant: ansible_test
         endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
         bd: ansible_test_bd
-        name: TestObject_1
         name_alias: TestMacTag
         state: present
       register: nm_add_mac_tag_1
@@ -85,7 +83,6 @@
         tenant: ansible_test
         endpoint_mac_address: "AE:ED:EE:EE:AA:AA"
         bd: ansible_test_bd
-        name: TestObject_1
         name_alias: TestMacTag
         state: present
       register: nm_add_mac_tag_1_again
@@ -100,28 +97,27 @@
           - cm_add_mac_tag_1.proposed.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - cm_add_mac_tag_1.proposed.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - cm_add_mac_tag_1.proposed.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - cm_add_mac_tag_1.proposed.fvEpMacTag.attributes.name == "TestObject_1"
           - cm_add_mac_tag_1.proposed.fvEpMacTag.attributes.nameAlias == "TestMacTag"
           - nm_add_mac_tag_1 is changed
           - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.annotation == "orchestrator:ansible"
           - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.name == ""
           - nm_add_mac_tag_1.current.0.fvEpMacTag.attributes.nameAlias == "TestMacTag"
           - nm_add_mac_tag_1.previous == []
           - nm_add_mac_tag_1_again is not changed
           - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.annotation == "orchestrator:ansible"
           - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.name == ""
           - nm_add_mac_tag_1_again.current.0.fvEpMacTag.attributes.nameAlias == "TestMacTag"
           - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.annotation == "orchestrator:ansible"
           - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.name == ""
           - nm_add_mac_tag_1_again.previous.0.fvEpMacTag.attributes.nameAlias == "TestMacTag"
 
     - name: Add MAC Tag Object - 2 with same bd and different mac address
@@ -199,13 +195,13 @@
           - cm_update_mac_tag_1.current.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - cm_update_mac_tag_1.current.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - cm_update_mac_tag_1.current.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - cm_update_mac_tag_1.current.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - cm_update_mac_tag_1.current.0.fvEpMacTag.attributes.name == ""
           - cm_update_mac_tag_1.current.0.fvEpMacTag.attributes.nameAlias == "TestMacTag"
           - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.annotation == "orchestrator:ansible"
           - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.name == ""
           - cm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.nameAlias == "TestMacTag"
           - cm_update_mac_tag_1.proposed.fvEpMacTag.attributes.annotation == "annotation"
           - cm_update_mac_tag_1.proposed.fvEpMacTag.attributes.bdName == "ansible_test_bd"
@@ -217,26 +213,26 @@
           - nm_update_mac_tag_1.current.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_update_mac_tag_1.current.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_update_mac_tag_1.current.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_update_mac_tag_1.current.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_update_mac_tag_1.current.0.fvEpMacTag.attributes.name == ""
           - nm_update_mac_tag_1.current.0.fvEpMacTag.attributes.nameAlias == "Updated_TestMacTag"
           - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.annotation == "orchestrator:ansible"
           - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.name == ""
           - nm_update_mac_tag_1.previous.0.fvEpMacTag.attributes.nameAlias == "TestMacTag"
           - nm_update_mac_tag_1_again is not changed
           - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.annotation == "annotation"
           - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.name == ""
           - nm_update_mac_tag_1_again.current.0.fvEpMacTag.attributes.nameAlias == "Updated_TestMacTag"
           - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.annotation == "annotation"
           - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.bdName == "ansible_test_bd"
           - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.dn == "uni/tn-ansible_test/eptags/epmactag-AE:ED:EE:EE:AA:AA-[ansible_test_bd]"
           - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.mac == "AE:ED:EE:EE:AA:AA"
-          - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.name == "TestObject_1"
+          - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.name == ""
           - nm_update_mac_tag_1_again.previous.0.fvEpMacTag.attributes.nameAlias == "Updated_TestMacTag"
 
     # QUERY
