[ignore] Add test cases when using template_id for ndo_ntp_policy module.

Author: gmicol

plugins/modules/ndo_ntp_policy.py

@@ -24,11 +24,13 @@
   template:
     description:
     - The name of the Fabric Policy template.
+    - This parameter or O(template_id) is required.
     type: str
     aliases: [ fabric_policy_template ]
   template_id:
     description:
     - The ID of the Fabric Policy template.
+    - This parameter or O(template) is required.
     type: str
     aliases: [ fabric_policy_template_id ]
   name:
@@ -168,7 +170,6 @@
 notes:
 - The O(template) must exist before using this module in your playbook.
   Use M(cisco.mso.ndo_template) to create the Fabric Policy template.
-- One of O(template) and O(template_id) is required but both are mutually exclusive.
 seealso:
 - module: cisco.mso.ndo_template
 extends_documentation_fragment: cisco.mso.modules
@@ -315,12 +316,12 @@ def main():
         argument_spec=argument_spec,
         supports_check_mode=True,
         required_if=[
-            ["state", "present", ["template", "template_id"], True],
-            ["state", "query", ["template", "template_id"], True],
-            ["state", "absent", ["template", "template_id"], True],
             ["state", "absent", ["name", "uuid"], True],
             ["state", "present", ["name", "uuid"], True],
         ],
+        required_one_of=[
+            ("template", "template_id"),
+        ],
         mutually_exclusive=[
             ("template", "template_id"),
         ],
@@ -402,15 +403,15 @@ def main():
             authState=authentication_state,
         )
 
-        if mso.existing and match:
+        if match:
             append_update_ops_data(ops, match.details, ntp_policy_attrs_path, mso_values)
             mso.sanitize(match.details, collate=True)
         else:
             mso.sanitize(mso_values)
             ops.append(dict(op="add", path=ntp_policy_attrs_path, value=mso.sent))
 
     elif state == "absent":
-        if mso.existing and match:
+        if match:
             ops.append(dict(op="remove", path=ntp_policy_attrs_path))
 
     if not module.check_mode and ops:

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

@@ -57,6 +57,7 @@
       cisco.mso.ndo_template:
         <<: *template_absent
         state: present
+      register: nm_create_fabric_policy_template
 
     # CREATE
 
@@ -98,10 +99,10 @@
         <<: *create_ntp_policy
       register: nm_create_new_ntp_policy_again
 
-    - name: Create another NTP Policy with minimum requirements
+    - name: Create another NTP Policy with minimum requirements using identifiers
       cisco.mso.ndo_ntp_policy: &create_ntp_policy_2
         <<: *mso_info
-        template: ansible_fabric_policy_template
+        template_id: '{{ nm_create_fabric_policy_template.current.templateId }}'
         name: ansible_test_ntp_policy_2
         state: present
       register: nm_create_another_ntp_policy
@@ -384,12 +385,19 @@
         state: query
       register: query_one_uuid
 
-    - name: Query all NTP Policy in the template
+    - name: Query all NTP Policy in the template with template name
       cisco.mso.ndo_ntp_policy:
         <<: *mso_info
         template: ansible_fabric_policy_template
         state: query
-      register: query_all
+      register: query_all_with_name
+
+    - name: Query all NTP Policy in the template with template id
+      cisco.mso.ndo_ntp_policy:
+        <<: *mso_info
+        template_id: '{{ nm_create_fabric_policy_template.current.templateId }}'
+        state: query
+      register: query_all_with_id
 
     - name: Assert NTP Policy was queried
       assert:
@@ -398,10 +406,14 @@
           - query_one.current.name == "ansible_test_ntp_policy_2"
           - query_one_uuid is not changed
           - query_one_uuid.current.name == "ansible_test_ntp_policy_2"
-          - query_all is not changed
-          - query_all.current.0.name == "ansible_test_ntp_policy_changed"
-          - query_all.current.1.name == "ansible_test_ntp_policy_2"
-          - query_all.current | length == 2
+          - query_all_with_name is not changed
+          - query_all_with_name.current.0.name == "ansible_test_ntp_policy_changed"
+          - query_all_with_name.current.1.name == "ansible_test_ntp_policy_2"
+          - query_all_with_name.current | length == 2
+          - query_all_with_id is not changed
+          - query_all_with_id.current.0.name == "ansible_test_ntp_policy_changed"
+          - query_all_with_id.current.1.name == "ansible_test_ntp_policy_2"
+          - query_all_with_id.current | length == 2
 
     # DELETE
 
@@ -459,7 +471,7 @@
         <<: *mso_info
         template: ansible_fabric_policy_template
         state: query
-      register: query_all_none
+      register: query_all_with_name_none
 
     - name: Update with non-existing UUID
       cisco.mso.ndo_ntp_policy:
@@ -473,8 +485,8 @@
     - name: Assert no NTP Policy found
       assert:
         that:
-          - query_all_none is not changed
-          - query_all_none.current == {}
+          - query_all_with_name_none is not changed
+          - query_all_with_name_none.current == {}
           - update_non_existing_uuid is failed
           - update_non_existing_uuid.msg == "NTP Policy with the UUID{{":"}} 'non-existing-uuid' not found"