[ignore] Updated the inventory.networking file and removed cloud related tasks from mso_schema_site_external_epg, mso_schema_site_anp_epg

Author: sajagana

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

@@ -583,66 +583,3 @@
       site: '{{ mso_site | default("ansible_test") }}'
       template: 'Template 1'
       state: absent
-
-  - name: Add new EPG service type parameters (for version greater than 3.3)
-    cisco.mso.mso_schema_template_anp_epg:
-      <<: *mso_info
-      schema: '{{ mso_schema | default("ansible_test") }}'
-      template: Template 1
-      anp: ANP
-      epg: ansible_test_1
-      vrf:
-        name: VRF1
-        schema: ansible_test
-        template: Template 1
-      epg_type: 'service'
-      deployment_type: 'cloud_native'
-      service_type: 'Azure-Storage'
-      access_type: 'private'
-      state: present
-
-  - name: Add private link label to the EPG (for version greater than 3.3)
-    cisco.mso.mso_schema_site_anp_epg:
-      <<: *mso_info
-      schema: '{{ mso_schema | default("ansible_test") }}'
-      template: Template 3
-      anp: ANP_3
-      epg: ansible_test_3
-      site: '{{ mso_site | default("ansible_test") }}'
-      private_link_label: 'New_Private_Link_Label'
-      state: present
-    register: add_private_link_label
-
-  - name: Change private link label in the EPG (for version greater than 3.3)
-    cisco.mso.mso_schema_site_anp_epg:
-      <<: *mso_info
-      schema: '{{ mso_schema | default("ansible_test") }}'
-      template: Template 3
-      anp: ANP_3
-      epg: ansible_test_3
-      site: '{{ mso_site | default("ansible_test") }}'
-      private_link_label: 'PLL'
-      state: present
-    register: change_private_link_label
-
-  - name: Verify site application profile EPG private link label
-    ansible.builtin.assert:
-      that:
-      - add_private_link_label is changed
-      - add_private_link_label.current.epgRef.anpName == "ANP_3"
-      - add_private_link_label.current.epgRef.epgName == "ansible_test_3"
-      - add_private_link_label.current.epgRef.templateName == "Template3"
-      - add_private_link_label.current.privateLinkLabel.name == "New_Private_Link_Label"
-      - add_private_link_label.current.shutdown == false
-      - add_private_link_label.previous.epgRef.anpName == "ANP_3"
-      - add_private_link_label.previous.epgRef.epgName == "ansible_test_3"
-      - add_private_link_label.previous.epgRef.templateName == "Template3"
-      - change_private_link_label is changed
-      - change_private_link_label.current.epgRef.anpName == "ANP_3"
-      - change_private_link_label.current.epgRef.epgName == "ansible_test_3"
-      - change_private_link_label.current.epgRef.templateName == "Template3"
-      - change_private_link_label.current.privateLinkLabel.name == "PLL"
-      - change_private_link_label.previous.epgRef.anpName == "ANP_3"
-      - change_private_link_label.previous.epgRef.epgName == "ansible_test_3"
-      - change_private_link_label.previous.epgRef.templateName == "Template3"
-      - change_private_link_label.previous.privateLinkLabel.name == "New_Private_Link_Label"

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

@@ -353,7 +353,7 @@
       - non_existing_template is not changed
       - non_existing_template.msg == "Provided template 'non_existing_template' not matching existing template(s){{':'}} Template1, Template2, TemplateL3out"
       - non_existing_bd is not changed
-      - non_existing_bd.msg ==  "Provided BD 'BD1' not matching existing bd(s){{':'}} ansible_test_1"
+      - non_existing_bd.msg == "Provided BD 'BD1' not matching existing bd(s){{':'}} ansible_test_1"
       - non_existing_l3out is not changed
       - non_existing_l3out.msg == "L3out 'non_existing_L3out' not found"
 

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

@@ -968,94 +968,3 @@
       - cm_no_site_associated is not changed
       - nm_no_site_associated is not changed
       - cm_no_site_associated.msg == nm_no_site_associated.msg == "Provided site 'ansible_test' not associated with template 'Template4'. Site is currently associated with template(s){{':'}} Template1, Template2, Template3"
-
-# Verify route_reachability argument when template_external_epg is associated with ansible_test site and
-# template_external_epg type argument is set to cloud
-- name: Ensure ANP exists
-  cisco.mso.mso_schema_template_anp:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    template: Template4
-    anp: ANP4
-    state: present
-
-- name: Ensure VRF4 exists
-  cisco.mso.mso_schema_template_vrf:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    template: Template4
-    vrf: VRF4
-    state: present
-
-- name: Ensure L3Out4 Exists
-  cisco.mso.mso_schema_template_l3out:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    template: Template4
-    vrf:
-      name: VRF4
-    l3out: L3out4
-    state: present
-
-- name: Add external EPG4 at template4 level type cloud (normal mode)
-  cisco.mso.mso_schema_template_external_epg:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    template: Template4
-    external_epg: ext_epg_4
-    type: cloud
-    vrf:
-      name: VRF4
-      schema: '{{ mso_schema | default("ansible_test") }}'
-      template: Template4
-    anp:
-      name: ANP4
-      schema: '{{ mso_schema | default("ansible_test") }}'
-      template: Template4
-    state: present
-  register: nm_add_ext_epg_4
-
-- name: Add site to a schema Template4
-  cisco.mso.mso_schema_site:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    site: '{{ mso_site | default("ansible_test") }}'
-    template: Template4
-    state: present
-
-- name: Add external EPG to site (normal mode)
-  cisco.mso.mso_schema_site_external_epg:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    site: '{{ mso_site | default("ansible_test") }}'
-    template: Template4
-    external_epg: ext_epg_4
-    l3out: L3out4
-    route_reachability: site-ext
-    state: present
-  register: nm_add_ext_epg_site
-
-- name: Verify nm_add_ext_epg_site
-  ansible.builtin.assert:
-    that:
-      - nm_add_ext_epg_site.current.externalEpgRef.externalEpgName == "ext_epg_4"
-      - nm_add_ext_epg_site.current.routeReachabilityInternetType == "site-ext"
-
-- name: Add external EPG to site again(normal mode)
-  cisco.mso.mso_schema_site_external_epg:
-    <<: *mso_info
-    schema: '{{ mso_schema | default("ansible_test") }}'
-    site: '{{ mso_site | default("ansible_test") }}'
-    template: Template4
-    external_epg: ext_epg_4
-    l3out: L3out4
-    route_reachability: site-ext
-    state: present
-  register: nm_add_ext_epg_site_again
-
-- name: Verify nm_add_ext_epg_site_again
-  ansible.builtin.assert:
-    that:
-      - nm_add_ext_epg_site_again is not changed
-      - nm_add_ext_epg_site_again.current.externalEpgRef.externalEpgName == "ext_epg_4"
-      - nm_add_ext_epg_site_again.current.routeReachabilityInternetType == "site-ext"

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

@@ -21,7 +21,7 @@
       use_proxy: '{{ mso_use_proxy | default(true) }}'
       output_level: '{{ mso_output_level | default("info") }}'
 
-- name: Query MSO version
+- name: Query MSO version # Used to create the remote user - r_ansible_github_ci login entry. Which allows to map remote user with tenant.
   cisco.mso.mso_version:
     <<: *mso_info
     username: r_ansible_github_ci
@@ -94,7 +94,6 @@
   - ansible_test2
   - ansible_test3
   - tenant_with_site
-  ignore_errors: true
 
 # ADD TENANT
 - name: Add tenant (check_mode)
@@ -219,14 +218,10 @@
 
 # ADD TENANT WITH REMOTE USERS
 - name: Add tenant 3 (check_mode)
-  cisco.mso.mso_tenant: &remote_user_login
-    <<: *mso_info
-    username: '{{ mso_remote_username | default(mso_username) }}'
-    password: '{{ mso_remote_password | default(mso_password) }}'
-    login_domain: '{{ mso_remote_login_domain | default("") }}'
+  cisco.mso.mso_tenant:
+    <<: *tenant_present
     tenant: ansible_test3
     display_name: null
-    description: Ansible test tenant
     remote_users:
     - name: r_ansible_github_ci
       login_domain: test
@@ -241,7 +236,7 @@
 
 - name: Add tenant 3 (normal_mode)
   cisco.mso.mso_tenant:
-    <<: *remote_user_login
+    <<: *tenant_present
     tenant: ansible_test3
     display_name: null
     remote_users:
@@ -293,7 +288,7 @@
 
 - name: Add tenant 3 (normal mode)
   cisco.mso.mso_tenant:
-    <<: *remote_user_login
+    <<: *tenant_present
     tenant: ansible_test3
     users:
     - '{{ mso_username }}'
@@ -304,17 +299,10 @@
     state: present
   register: nm_add_tenant3
 
-- name: Verify nm_add_tenant3 - mso_username is admin
-  ansible.builtin.assert:
-    that:
-    - nm_add_tenant3 is not changed
-  when: mso_username == "admin"
-
-- name: Verify nm_add_tenant3 - mso_username is not admin
+- name: Verify nm_add_tenant3
   ansible.builtin.assert:
     that:
     - nm_add_tenant3 is changed
-  when: mso_username != "admin"
 
 - name: Verify nm_add_tenant3 (when mso_username != admin)
   ansible.builtin.assert:
@@ -325,7 +313,7 @@
 - name: Verify nm_add_tenant3 (when mso_username == admin)
   ansible.builtin.assert:
     that:
-    - nm_add_tenant3.current.userAssociations | length == 2
+    - nm_add_tenant3.current.userAssociations | length == 1
   when: mso_username == 'admin'
 
 # CHANGE TENANT
@@ -517,7 +505,6 @@
     <<: *tenant_present
     tenant: common
     display_name: common
-    # sites: ['{{ mso_site | default("ansible_test") }}', 'aws_{{ mso_site | default("ansible_test") }}']
     sites: ['{{ mso_site | default("ansible_test") }}']
   register: nm_add_common_tenant