Rename MSC modules to MSO nomenclature (#50959)

* msc_tenant: improve docs

* Rename MSC modules to MSO

* Rename MSC-related objects to MSO nomenclature

* Add missing doc fragments
This commit is contained in:
Dag Wieers
2019-01-16 14:53:38 +01:00
committed by GitHub
parent 7a1ceb6988
commit a79441ca30
21 changed files with 493 additions and 491 deletions

View File

@@ -24,15 +24,15 @@ aci_use_proxy=no
[aci]
localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
[msc:vars]
msc_hostname=your-msc-1
msc_username=admin
msc_password=your-msc-password
msc_validate_certs=no
msc_use_ssl=yes
msc_use_proxy=no
[mso:vars]
mso_hostname=your-mso-1
mso_username=admin
mso_password=your-mso-password
mso_validate_certs=no
mso_use_ssl=yes
mso_use_proxy=no
[msc]
[mso]
localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
###

View File

@@ -19,7 +19,7 @@ iosxr
ironware
junos
meraki
msc
mso
net
netconf
nxos

View File

@@ -1,29 +1,29 @@
# Test code for the MSC modules
# Test code for the MSO modules
# Copyright: (c) 2018, Dag Wieers (@dagwieers) <dag@wieers.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Test that we have an ACI MultiSite host, username and password
fail:
msg: 'Please define the following variables: msc_hostname, msc_username and msc_password.'
when: msc_hostname is not defined or msc_username is not defined or msc_password is not defined
msg: 'Please define the following variables: mso_hostname, mso_username and mso_password.'
when: mso_hostname is not defined or mso_username is not defined or mso_password is not defined
# CLEAN ENVIRONMENT
- name: Remove label ansible_test2
msc_label: &label_absent
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_label: &label_absent
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
label: ansible_test2
state: absent
- name: Remove label ansible_test
msc_label:
mso_label:
<<: *label_absent
label: ansible_test
register: cm_remove_label
@@ -31,14 +31,14 @@
# ADD LABEL
- name: Add label (check_mode)
msc_label: &label_present
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_label: &label_present
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
label: ansible_test
state: present
check_mode: yes
@@ -54,7 +54,7 @@
- cm_add_label.current.type == 'site'
- name: Add label (normal mode)
msc_label: *label_present
mso_label: *label_present
register: nm_add_label
- name: nm_Verify add_label
@@ -67,7 +67,7 @@
- nm_add_label.current.type == 'site'
- name: Add label again (check_mode)
msc_label: *label_present
mso_label: *label_present
check_mode: yes
register: cm_add_label_again
@@ -82,7 +82,7 @@
- cm_add_label_again.current.type == 'site'
- name: Add label again (normal mode)
msc_label: *label_present
mso_label: *label_present
register: nm_add_label_again
- name: Verify nm_add_label_again
@@ -98,7 +98,7 @@
# CHANGE LABEL
- name: Change label (check_mode)
msc_label:
mso_label:
<<: *label_present
label_id: '{{ nm_add_label.current.id }}'
label: ansible_test2
@@ -114,7 +114,7 @@
- cm_change_label.current.type == 'site'
- name: Change label (normal mode)
msc_label:
mso_label:
<<: *label_present
label_id: '{{ nm_add_label.current.id }}'
label: ansible_test2
@@ -130,7 +130,7 @@
- nm_change_label.current.type == 'site'
- name: Change label again (check_mode)
msc_label:
mso_label:
<<: *label_present
label_id: '{{ nm_add_label.current.id }}'
label: ansible_test2
@@ -146,7 +146,7 @@
- cm_change_label_again.current.type == 'site'
- name: Change label again (normal mode)
msc_label:
mso_label:
<<: *label_present
label_id: '{{ nm_add_label.current.id }}'
label: ansible_test2
@@ -163,20 +163,20 @@
# QUERY ALL LABELS
- name: Query all labels (check_mode)
msc_label: &label_query
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_label: &label_query
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
state: query
check_mode: yes
register: cm_query_all_labels
- name: Query all labels (normal mode)
msc_label: *label_query
mso_label: *label_query
register: nm_query_all_labels
- name: Verify query_all_labels
@@ -190,14 +190,14 @@
# QUERY A LABEL
- name: Query our label
msc_label:
mso_label:
<<: *label_query
label: ansible_test2
check_mode: yes
register: cm_query_label
- name: Query our label
msc_label:
mso_label:
<<: *label_query
label: ansible_test2
register: nm_query_label
@@ -218,7 +218,7 @@
# REMOVE LABEL
- name: Remove label (check_mode)
msc_label: *label_absent
mso_label: *label_absent
check_mode: yes
register: cm_remove_label
@@ -229,7 +229,7 @@
- cm_remove_label.current == {}
- name: Remove label (normal mode)
msc_label: *label_absent
mso_label: *label_absent
register: nm_remove_label
- name: Verify nm_remove_label
@@ -239,7 +239,7 @@
- nm_remove_label.current == {}
- name: Remove label again (check_mode)
msc_label: *label_absent
mso_label: *label_absent
check_mode: yes
register: cm_remove_label_again
@@ -250,7 +250,7 @@
- cm_remove_label_again.current == {}
- name: Remove label again (normal mode)
msc_label: *label_absent
mso_label: *label_absent
register: nm_remove_label_again
- name: Verify nm_remove_label_again
@@ -262,14 +262,14 @@
# QUERY NON-EXISTING LABEL
- name: Query non-existing label (check_mode)
msc_label:
mso_label:
<<: *label_query
label: ansible_test
check_mode: yes
register: cm_query_non_label
- name: Query non-existing label (normal mode)
msc_label:
mso_label:
<<: *label_query
label: ansible_test
register: nm_query_non_label

View File

@@ -1,29 +1,29 @@
# Test code for the MSC modules
# Test code for the MSO modules
# Copyright: (c) 2018, Dag Wieers (@dagwieers) <dag@wieers.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Test that we have an ACI MultiSite host, username and password
fail:
msg: 'Please define the following variables: msc_hostname, msc_username and msc_password.'
when: msc_hostname is not defined or msc_username is not defined or msc_password is not defined
msg: 'Please define the following variables: mso_hostname, mso_username and mso_password.'
when: mso_hostname is not defined or mso_username is not defined or mso_password is not defined
# CLEAN ENVIRONMENT
- name: Remove role ansible_test2
msc_role: &role_absent
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_role: &role_absent
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
role: ansible_test2
state: absent
- name: Remove role ansible_test
msc_role:
mso_role:
<<: *role_absent
role: ansible_test
register: cm_remove_role
@@ -31,14 +31,14 @@
# ADD ROLE
- name: Add role (check_mode)
msc_role: &role_present
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_role: &role_present
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
role: ansible_test
description: Ansible test role
permissions: view-sites
@@ -56,7 +56,7 @@
- cm_add_role.current.id is not defined
- name: Add role (normal mode)
msc_role: *role_present
mso_role: *role_present
register: nm_add_role
- name: nm_Verify add_role
@@ -69,7 +69,7 @@
- nm_add_role.current.id is defined
- name: Add role again (check_mode)
msc_role: *role_present
mso_role: *role_present
check_mode: yes
register: cm_add_role_again
@@ -84,7 +84,7 @@
- cm_add_role_again.current.id == nm_add_role.current.id
- name: Add role again (normal mode)
msc_role: *role_present
mso_role: *role_present
register: nm_add_role_again
- name: Verify nm_add_role_again
@@ -100,7 +100,7 @@
# CHANGE ROLE
- name: Change role (check_mode)
msc_role:
mso_role:
<<: *role_present
role_id: '{{ nm_add_role.current.id }}'
role: ansible_test2
@@ -117,7 +117,7 @@
- cm_change_role.current.id == nm_add_role.current.id
- name: Change role (normal mode)
msc_role:
mso_role:
<<: *role_present
role_id: '{{ nm_add_role.current.id }}'
role: ansible_test2
@@ -134,7 +134,7 @@
- nm_change_role.current.id == nm_add_role.current.id
- name: Change role again (check_mode)
msc_role:
mso_role:
<<: *role_present
role_id: '{{ nm_add_role.current.id }}'
role: ansible_test2
@@ -151,7 +151,7 @@
- cm_change_role_again.current.id == nm_add_role.current.id
- name: Change role again (normal mode)
msc_role:
mso_role:
<<: *role_present
role_id: '{{ nm_add_role.current.id }}'
role: ansible_test2
@@ -169,20 +169,20 @@
# QUERY ALL ROLES
- name: Query all roles (check_mode)
msc_role: &role_query
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_role: &role_query
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
state: query
check_mode: yes
register: cm_query_all_roles
- name: Query all roles (normal mode)
msc_role: *role_query
mso_role: *role_query
register: nm_query_all_roles
- name: Verify query_all_roles
@@ -196,14 +196,14 @@
# QUERY A ROLE
- name: Query our role
msc_role:
mso_role:
<<: *role_query
role: ansible_test2
check_mode: yes
register: cm_query_role
- name: Query our role
msc_role:
mso_role:
<<: *role_query
role: ansible_test2
register: nm_query_role
@@ -224,7 +224,7 @@
# REMOVE ROLE
- name: Remove role (check_mode)
msc_role: *role_absent
mso_role: *role_absent
check_mode: yes
register: cm_remove_role
@@ -235,7 +235,7 @@
- cm_remove_role.current == {}
- name: Remove role (normal mode)
msc_role: *role_absent
mso_role: *role_absent
register: nm_remove_role
- name: Verify nm_remove_role
@@ -245,7 +245,7 @@
- nm_remove_role.current == {}
- name: Remove role again (check_mode)
msc_role: *role_absent
mso_role: *role_absent
check_mode: yes
register: cm_remove_role_again
@@ -256,7 +256,7 @@
- cm_remove_role_again.current == {}
- name: Remove role again (normal mode)
msc_role: *role_absent
mso_role: *role_absent
register: nm_remove_role_again
- name: Verify nm_remove_role_again
@@ -268,14 +268,14 @@
# QUERY NON-EXISTING ROLE
- name: Query non-existing role (check_mode)
msc_role:
mso_role:
<<: *role_query
role: ansible_test
check_mode: yes
register: cm_query_non_role
- name: Query non-existing role (normal mode)
msc_role:
mso_role:
<<: *role_query
role: ansible_test
register: nm_query_non_role

View File

@@ -1,45 +1,45 @@
# Test code for the MSC modules
# Test code for the MSO modules
# Copyright: (c) 2018, Dag Wieers (@dagwieers) <dag@wieers.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Test that we have an ACI MultiSite host, username and password
fail:
msg: 'Please define the following variables: msc_hostname, msc_username and msc_password.'
when: msc_hostname is not defined or msc_username is not defined or msc_password is not defined
msg: 'Please define the following variables: mso_hostname, mso_username and mso_password.'
when: mso_hostname is not defined or mso_username is not defined or mso_password is not defined
# CLEAN ENVIRONMENT
- name: Remove site 2
msc_site: &site_absent
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
site: '{{ msc_site | default("ansible_test") }}_2'
mso_site: &site_absent
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
site: '{{ mso_site | default("ansible_test") }}_2'
state: absent
- name: Remove site
msc_site:
mso_site:
<<: *site_absent
site: '{{ msc_site | default("ansible_test") }}'
site: '{{ mso_site | default("ansible_test") }}'
register: cm_remove_site
# ADD SITE
- name: Add site (check_mode)
msc_site: &site_present
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
site: '{{ msc_site | default("ansible_test") }}'
mso_site: &site_present
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
site: '{{ mso_site | default("ansible_test") }}'
apic_username: admin
apic_password: '{{ apic_password }}'
apic_site_id: 101
@@ -62,10 +62,10 @@
- cm_add_site is changed
- cm_add_site.previous == {}
- cm_add_site.current.id is not defined
- cm_add_site.current.name == msc_site|default("ansible_test")
- cm_add_site.current.name == mso_site|default("ansible_test")
- name: Add site (normal mode)
msc_site: *site_present
mso_site: *site_present
register: nm_add_site
- name: nm_Verify add_site
@@ -74,10 +74,10 @@
- nm_add_site is changed
- nm_add_site.previous == {}
- nm_add_site.current.id is defined
- nm_add_site.current.name == msc_site|default("ansible_test")
- nm_add_site.current.name == mso_site|default("ansible_test")
- name: Add site again (check_mode)
msc_site: *site_present
mso_site: *site_present
check_mode: yes
register: cm_add_site_again
@@ -85,29 +85,29 @@
assert:
that:
- cm_add_site_again is not changed
- cm_add_site_again.previous.name == msc_site|default("ansible_test")
- cm_add_site_again.previous.name == mso_site|default("ansible_test")
- cm_add_site_again.current.id == nm_add_site.current.id
- cm_add_site_again.current.name == msc_site|default("ansible_test")
- cm_add_site_again.current.name == mso_site|default("ansible_test")
- name: Add site again (normal mode)
msc_site: *site_present
mso_site: *site_present
register: nm_add_site_again
- name: Verify nm_add_site_again
assert:
that:
- nm_add_site_again is not changed
- nm_add_site_again.previous.name == msc_site|default("ansible_test")
- nm_add_site_again.previous.name == mso_site|default("ansible_test")
- nm_add_site_again.current.id == nm_add_site.current.id
- nm_add_site_again.current.name == msc_site|default("ansible_test")
- nm_add_site_again.current.name == mso_site|default("ansible_test")
# CHANGE SITE
- name: Change site (check_mode)
msc_site:
mso_site:
<<: *site_present
site_id: '{{ nm_add_site.current.id }}'
site: '{{ msc_site | default("ansible_test") }}_2'
site: '{{ mso_site | default("ansible_test") }}_2'
check_mode: yes
register: cm_change_site
@@ -116,13 +116,13 @@
that:
- cm_change_site is changed
- cm_change_site.current.id == nm_add_site.current.id
- cm_change_site.current.name == '{{ msc_site | default("ansible_test") }}_2'
- cm_change_site.current.name == '{{ mso_site | default("ansible_test") }}_2'
- name: Change site (normal mode)
msc_site:
mso_site:
<<: *site_present
site_id: '{{ nm_add_site.current.id }}'
site: '{{ msc_site | default("ansible_test") }}_2'
site: '{{ mso_site | default("ansible_test") }}_2'
output_level: debug
register: nm_change_site
@@ -131,13 +131,13 @@
that:
- nm_change_site is changed
- nm_change_site.current.id == nm_add_site.current.id
- nm_change_site.current.name == '{{ msc_site | default("ansible_test") }}_2'
- nm_change_site.current.name == '{{ mso_site | default("ansible_test") }}_2'
- name: Change site again (check_mode)
msc_site:
mso_site:
<<: *site_present
site_id: '{{ nm_add_site.current.id }}'
site: '{{ msc_site | default("ansible_test") }}_2'
site: '{{ mso_site | default("ansible_test") }}_2'
check_mode: yes
register: cm_change_site_again
@@ -146,13 +146,13 @@
that:
- cm_change_site_again is not changed
- cm_change_site_again.current.id == nm_add_site.current.id
- cm_change_site_again.current.name == '{{ msc_site | default("ansible_test") }}_2'
- cm_change_site_again.current.name == '{{ mso_site | default("ansible_test") }}_2'
- name: Change site again (normal mode)
msc_site:
mso_site:
<<: *site_present
site_id: '{{ nm_add_site.current.id }}'
site: '{{ msc_site | default("ansible_test") }}_2'
site: '{{ mso_site | default("ansible_test") }}_2'
register: nm_change_site_again
- name: Verify nm_change_site_again
@@ -160,25 +160,25 @@
that:
- nm_change_site_again is not changed
- nm_change_site_again.current.id == nm_add_site.current.id
- nm_change_site_again.current.name == '{{ msc_site | default("ansible_test") }}_2'
- nm_change_site_again.current.name == '{{ mso_site | default("ansible_test") }}_2'
# QUERY ALL SITES
- name: Query all sites (check_mode)
msc_site: &site_query
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_site: &site_query
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
state: query
check_mode: yes
register: cm_query_all_sites
- name: Query all sites (normal mode)
msc_site: *site_query
mso_site: *site_query
register: nm_query_all_sites
- name: Verify query_all_sites
@@ -192,16 +192,16 @@
# QUERY A SITE
- name: Query our site
msc_site:
mso_site:
<<: *site_query
site: '{{ msc_site | default("ansible_test") }}_2'
site: '{{ mso_site | default("ansible_test") }}_2'
check_mode: yes
register: cm_query_site
- name: Query our site
msc_site:
mso_site:
<<: *site_query
site: '{{ msc_site | default("ansible_test") }}_2'
site: '{{ mso_site | default("ansible_test") }}_2'
register: nm_query_site
- name: Verify query_site
@@ -209,16 +209,16 @@
that:
- cm_query_site is not changed
- cm_query_site.current.id == nm_add_site.current.id
- cm_query_site.current.name == '{{ msc_site | default("ansible_test") }}_2'
- cm_query_site.current.name == '{{ mso_site | default("ansible_test") }}_2'
- nm_query_site is not changed
- nm_query_site.current.id == nm_add_site.current.id
- nm_query_site.current.name == '{{ msc_site | default("ansible_test") }}_2'
- nm_query_site.current.name == '{{ mso_site | default("ansible_test") }}_2'
- cm_query_site == nm_query_site
# REMOVE SITE
- name: Remove site (check_mode)
msc_site: *site_absent
mso_site: *site_absent
check_mode: yes
register: cm_remove_site
@@ -229,7 +229,7 @@
- cm_remove_site.current == {}
- name: Remove site (normal mode)
msc_site: *site_absent
mso_site: *site_absent
register: nm_remove_site
- name: Verify nm_remove_site
@@ -239,7 +239,7 @@
- nm_remove_site.current == {}
- name: Remove site again (check_mode)
msc_site: *site_absent
mso_site: *site_absent
check_mode: yes
register: cm_remove_site_again
@@ -250,7 +250,7 @@
- cm_remove_site_again.current == {}
- name: Remove site again (normal mode)
msc_site: *site_absent
mso_site: *site_absent
register: nm_remove_site_again
- name: Verify nm_remove_site_again
@@ -262,16 +262,16 @@
# QUERY NON-EXISTING SITE
- name: Query non-existing site (check_mode)
msc_site:
mso_site:
<<: *site_query
site: '{{ msc_site | default("ansible_test") }}'
site: '{{ mso_site | default("ansible_test") }}'
check_mode: yes
register: cm_query_non_site
- name: Query non-existing site (normal mode)
msc_site:
mso_site:
<<: *site_query
site: '{{ msc_site | default("ansible_test") }}'
site: '{{ mso_site | default("ansible_test") }}'
register: nm_query_non_site
# TODO: Implement more tests

View File

@@ -1,29 +1,29 @@
# Test code for the MSC modules
# Test code for the MSO modules
# Copyright: (c) 2018, Dag Wieers (@dagwieers) <dag@wieers.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Test that we have an ACI MultiSite host, username and password
fail:
msg: 'Please define the following variables: msc_hostname, msc_username and msc_password.'
when: msc_hostname is not defined or msc_username is not defined or msc_password is not defined
msg: 'Please define the following variables: mso_hostname, mso_username and mso_password.'
when: mso_hostname is not defined or mso_username is not defined or mso_password is not defined
# CLEAN ENVIRONMENT
- name: Remove tenant ansible_test2
msc_tenant: &tenant_absent
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_tenant: &tenant_absent
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
tenant: ansible_test2
state: absent
- name: Remove tenant ansible_test
msc_tenant:
mso_tenant:
<<: *tenant_absent
tenant: ansible_test
register: cm_remove_tenant
@@ -31,14 +31,14 @@
# ADD TENANT
- name: Add tenant (check_mode)
msc_tenant: &tenant_present
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_tenant: &tenant_present
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
tenant: ansible_test
display_name: Ansible test title
description: Ansible test tenant
@@ -56,7 +56,7 @@
- cm_add_tenant.current.description == 'Ansible test tenant'
- name: Add tenant (normal mode)
msc_tenant: *tenant_present
mso_tenant: *tenant_present
register: nm_add_tenant
- name: nm_Verify add_tenant
@@ -69,7 +69,7 @@
- nm_add_tenant.current.description == 'Ansible test tenant'
- name: Add tenant again (check_mode)
msc_tenant: *tenant_present
mso_tenant: *tenant_present
check_mode: yes
register: cm_add_tenant_again
@@ -84,7 +84,7 @@
- cm_add_tenant_again.current.description == 'Ansible test tenant'
- name: Add tenant again (normal mode)
msc_tenant: *tenant_present
mso_tenant: *tenant_present
register: nm_add_tenant_again
- name: Verify nm_add_tenant_again
@@ -100,7 +100,7 @@
# CHANGE TENANT
- name: Change tenant (check_mode)
msc_tenant:
mso_tenant:
<<: *tenant_present
tenant_id: '{{ nm_add_tenant.current.id }}'
tenant: ansible_test2
@@ -117,7 +117,7 @@
- cm_change_tenant.current.description == 'Ansible test tenant 2'
- name: Change tenant (normal mode)
msc_tenant:
mso_tenant:
<<: *tenant_present
tenant_id: '{{ nm_add_tenant.current.id }}'
tenant: ansible_test2
@@ -134,7 +134,7 @@
- nm_change_tenant.current.description == 'Ansible test tenant 2'
- name: Change tenant again (check_mode)
msc_tenant:
mso_tenant:
<<: *tenant_present
tenant_id: '{{ nm_add_tenant.current.id }}'
tenant: ansible_test2
@@ -151,7 +151,7 @@
- cm_change_tenant_again.current.description == 'Ansible test tenant 2'
- name: Change tenant again (normal mode)
msc_tenant:
mso_tenant:
<<: *tenant_present
tenant_id: '{{ nm_add_tenant.current.id }}'
tenant: ansible_test2
@@ -169,20 +169,20 @@
# QUERY ALL TENANTS
- name: Query all tenants (check_mode)
msc_tenant: &tenant_query
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_tenant: &tenant_query
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
state: query
check_mode: yes
register: cm_query_all_tenants
- name: Query all tenants (normal mode)
msc_tenant: *tenant_query
mso_tenant: *tenant_query
register: nm_query_all_tenants
- name: Verify query_all_tenants
@@ -196,14 +196,14 @@
# QUERY A TENANT
- name: Query our tenant
msc_tenant:
mso_tenant:
<<: *tenant_query
tenant: ansible_test2
check_mode: yes
register: cm_query_tenant
- name: Query our tenant
msc_tenant:
mso_tenant:
<<: *tenant_query
tenant: ansible_test2
register: nm_query_tenant
@@ -224,7 +224,7 @@
# REMOVE TENANT
- name: Remove tenant (check_mode)
msc_tenant: *tenant_absent
mso_tenant: *tenant_absent
check_mode: yes
register: cm_remove_tenant
@@ -235,7 +235,7 @@
- cm_remove_tenant.current == {}
- name: Remove tenant (normal mode)
msc_tenant: *tenant_absent
mso_tenant: *tenant_absent
register: nm_remove_tenant
- name: Verify nm_remove_tenant
@@ -245,7 +245,7 @@
- nm_remove_tenant.current == {}
- name: Remove tenant again (check_mode)
msc_tenant: *tenant_absent
mso_tenant: *tenant_absent
check_mode: yes
register: cm_remove_tenant_again
@@ -256,7 +256,7 @@
- cm_remove_tenant_again.current == {}
- name: Remove tenant again (normal mode)
msc_tenant: *tenant_absent
mso_tenant: *tenant_absent
register: nm_remove_tenant_again
- name: Verify nm_remove_tenant_again
@@ -268,14 +268,14 @@
# QUERY NON-EXISTING TENANT
- name: Query non-existing tenant (check_mode)
msc_tenant:
mso_tenant:
<<: *tenant_query
tenant: ansible_test
check_mode: yes
register: cm_query_non_tenant
- name: Query non-existing tenant (normal mode)
msc_tenant:
mso_tenant:
<<: *tenant_query
tenant: ansible_test
register: nm_query_non_tenant

View File

@@ -1,29 +1,29 @@
# Test code for the MSC modules
# Test code for the MSO modules
# Copyright: (c) 2018, Dag Wieers (@dagwieers) <dag@wieers.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Test that we have an ACI MultiSite host, username and password
fail:
msg: 'Please define the following variables: msc_hostname, msc_username and msc_password.'
when: msc_hostname is not defined or msc_username is not defined or msc_password is not defined
msg: 'Please define the following variables: mso_hostname, mso_username and mso_password.'
when: mso_hostname is not defined or mso_username is not defined or mso_password is not defined
# CLEAN ENVIRONMENT
- name: Remove user ansible_test2
msc_user: &user_absent
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_user: &user_absent
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
user_name: ansible_test2
state: absent
- name: Remove user ansible_test
msc_user:
mso_user:
<<: *user_absent
user_name: ansible_test
register: cm_remove_user
@@ -31,14 +31,14 @@
# ADD USER
- name: Add user (check_mode)
msc_user: &user_present
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_user: &user_present
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
user_name: ansible_test
user_password: 'S0m3!1n1t14l!p455w0rd'
# NOTE: First name, last name, phone and email are mandatory on creation
@@ -64,7 +64,7 @@
- cm_add_user.current.username == 'ansible_test'
- name: Add user (normal mode)
msc_user: *user_present
mso_user: *user_present
register: nm_add_user
- name: nm_Verify add_user
@@ -76,7 +76,7 @@
- nm_add_user.current.username == 'ansible_test'
- name: Add user again (check_mode)
msc_user:
mso_user:
<<: *user_present
# NOTE: We need to modify the password for a new user
user_password: 'S0m3!n3w!p455w0rd'
@@ -92,7 +92,7 @@
- cm_add_user_again.current.username == 'ansible_test'
- name: Add user again (normal mode)
msc_user:
mso_user:
<<: *user_present
# NOTE: We need to modify the password for a new user
user_password: 'S0m3!n3w!p455w0rd'
@@ -109,7 +109,7 @@
# CHANGE USER
- name: Change user (check_mode)
msc_user:
mso_user:
<<: *user_present
user_id: '{{ nm_add_user.current.id }}'
user_name: ansible_test2
@@ -125,7 +125,7 @@
- cm_change_user.current.username == 'ansible_test2'
- name: Change user (normal mode)
msc_user:
mso_user:
<<: *user_present
user_id: '{{ nm_add_user.current.id }}'
user_name: ansible_test2
@@ -141,7 +141,7 @@
- nm_change_user.current.username == 'ansible_test2'
- name: Change user again (check_mode)
msc_user:
mso_user:
<<: *user_present
user_id: '{{ nm_add_user.current.id }}'
user_name: ansible_test2
@@ -157,7 +157,7 @@
- cm_change_user_again.current.username == 'ansible_test2'
- name: Change user again (normal mode)
msc_user:
mso_user:
<<: *user_present
user_id: '{{ nm_add_user.current.id }}'
user_name: ansible_test2
@@ -174,20 +174,20 @@
# QUERY ALL USERS
- name: Query all users (check_mode)
msc_user: &user_query
host: '{{ msc_hostname }}'
username: '{{ msc_username }}'
password: '{{ msc_password }}'
validate_certs: '{{ msc_validate_certs | default(false) }}'
use_ssl: '{{ msc_use_ssl | default(true) }}'
use_proxy: '{{ msc_use_proxy | default(true) }}'
output_level: '{{ msc_output_level | default("info") }}'
mso_user: &user_query
host: '{{ mso_hostname }}'
username: '{{ mso_username }}'
password: '{{ mso_password }}'
validate_certs: '{{ mso_validate_certs | default(false) }}'
use_ssl: '{{ mso_use_ssl | default(true) }}'
use_proxy: '{{ mso_use_proxy | default(true) }}'
output_level: '{{ mso_output_level | default("info") }}'
state: query
check_mode: yes
register: cm_query_all_users
- name: Query all users (normal mode)
msc_user: *user_query
mso_user: *user_query
register: nm_query_all_users
- name: Verify query_all_users
@@ -201,14 +201,14 @@
# QUERY A USER
- name: Query our user
msc_user:
mso_user:
<<: *user_query
user_name: ansible_test2
check_mode: yes
register: cm_query_user
- name: Query our user
msc_user:
mso_user:
<<: *user_query
user_name: ansible_test2
register: nm_query_user
@@ -227,7 +227,7 @@
# REMOVE USER
- name: Remove user (check_mode)
msc_user: *user_absent
mso_user: *user_absent
check_mode: yes
register: cm_remove_user
@@ -238,7 +238,7 @@
- cm_remove_user.current == {}
- name: Remove user (normal mode)
msc_user: *user_absent
mso_user: *user_absent
register: nm_remove_user
- name: Verify nm_remove_user
@@ -248,7 +248,7 @@
- nm_remove_user.current == {}
- name: Remove user again (check_mode)
msc_user: *user_absent
mso_user: *user_absent
check_mode: yes
register: cm_remove_user_again
@@ -259,7 +259,7 @@
- cm_remove_user_again.current == {}
- name: Remove user again (normal mode)
msc_user: *user_absent
mso_user: *user_absent
register: nm_remove_user_again
- name: Verify nm_remove_user_again
@@ -271,14 +271,14 @@
# QUERY NON-EXISTING USER
- name: Query non-existing user (check_mode)
msc_user:
mso_user:
<<: *user_query
user_name: ansible_test
check_mode: yes
register: cm_query_non_user
- name: Query non-existing user (normal mode)
msc_user:
mso_user:
<<: *user_query
user_name: ansible_test
register: nm_query_non_user