From 2bd0653488fe017f0b5f400907cd0d0e2dc43ceb Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Sun, 21 Jan 2018 00:38:20 +0100 Subject: [PATCH] ACI: Support validate_certs, use_ssl and use_proxy (#35146) This PR includes: - validate_certs, use_ssl and use_proxy support for the integration tests --- test/integration/inventory | 3 +++ .../aci_aaa_user_certificate/tasks/main.yml | 12 ++++++++--- .../tasks/main.yml | 6 ++++-- .../integration/targets/aci_ap/tasks/main.yml | 4 +++- .../integration/targets/aci_bd/tasks/main.yml | 4 +++- .../targets/aci_bd_subnet/tasks/main.yml | 4 +++- .../aci_config_rollback/tasks/main.yml | 6 ++++-- .../aci_config_snapshot/tasks/main.yml | 4 +++- .../targets/aci_contract/tasks/main.yml | 4 +++- .../aci_contract_subject/tasks/main.yml | 4 +++- .../tasks/main.yml | 4 +++- .../targets/aci_encap_pool/tasks/vlan.yml | 4 +++- .../targets/aci_encap_pool/tasks/vsan.yml | 6 ++++-- .../targets/aci_encap_pool/tasks/vxlan.yml | 4 +++- .../aci_encap_pool_range/tasks/vlan.yml | 8 ++++++-- .../aci_encap_pool_range/tasks/vsan.yml | 4 +++- .../aci_encap_pool_range/tasks/vxlan.yml | 4 +++- .../targets/aci_epg/tasks/main.yml | 4 +++- .../aci_epg_to_contract/tasks/main.yml | 4 +++- .../targets/aci_epg_to_domain/tasks/main.yml | 8 ++++++-- .../targets/aci_filter/tasks/main.yml | 16 +++++++++++---- .../targets/aci_filter_entry/tasks/main.yml | 8 ++++++-- .../tasks/main.yml | 12 ++++++++--- .../tasks/main.yml | 16 +++++++++++---- .../targets/aci_rest/tasks/json_inline.yml | 20 ++++++++++++++----- .../targets/aci_rest/tasks/json_string.yml | 20 ++++++++++++++----- .../targets/aci_rest/tasks/xml_string.yml | 20 ++++++++++++++----- .../targets/aci_rest/tasks/yaml_inline.yml | 20 ++++++++++++++----- .../targets/aci_rest/tasks/yaml_string.yml | 20 ++++++++++++++----- .../tasks/main.yml | 12 ++++++++--- .../aci_switch_leaf_selector/tasks/main.yml | 8 ++++++-- .../targets/aci_tenant/tasks/main.yml | 12 ++++++++--- .../targets/aci_vlan_pool/tasks/main.yml | 4 +++- .../aci_vlan_pool_encap_block/tasks/main.yml | 8 ++++++-- .../targets/aci_vrf/tasks/main.yml | 4 +++- 35 files changed, 225 insertions(+), 76 deletions(-) diff --git a/test/integration/inventory b/test/integration/inventory index 92d7dc7c74..5c3fee6a78 100644 --- a/test/integration/inventory +++ b/test/integration/inventory @@ -52,6 +52,9 @@ overridden_in_parent=2000 aci_hostname=your-apic-1 aci_username=admin aci_password=your-password +aci_validate_certs=no +aci_use_ssl=yes +aci_use_proxy=no [aci] localhost ansible_ssh_host=127.0.0.1 ansible_connection=local diff --git a/test/integration/targets/aci_aaa_user_certificate/tasks/main.yml b/test/integration/targets/aci_aaa_user_certificate/tasks/main.yml index 26c166ce96..316ac53eb2 100644 --- a/test/integration/targets/aci_aaa_user_certificate/tasks/main.yml +++ b/test/integration/targets/aci_aaa_user_certificate/tasks/main.yml @@ -15,7 +15,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' user: admin certificate_name: admin state: absent @@ -27,7 +29,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' user: admin certificate_name: admin certificate: "{{ lookup('file', 'pki/admin.crt') }}" @@ -62,7 +66,9 @@ username: '{{ aci_username }}' #password: '{{ aci_password }}' private_key: '{{ role_path }}/pki/admin.key' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' user: admin state: query check_mode: yes diff --git a/test/integration/targets/aci_access_port_to_interface_policy_leaf_profile/tasks/main.yml b/test/integration/targets/aci_access_port_to_interface_policy_leaf_profile/tasks/main.yml index ecfde3b9ed..c06ef5cf0a 100644 --- a/test/integration/targets/aci_access_port_to_interface_policy_leaf_profile/tasks/main.yml +++ b/test/integration/targets/aci_access_port_to_interface_policy_leaf_profile/tasks/main.yml @@ -13,9 +13,11 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - leaf_interface_profile: leafintprftest - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present + leaf_interface_profile: leafintprftest register: leaf_profile_present # TODO: Ensure that leaf Policy Group Exists (module missing) (infra:AccPortGrp) diff --git a/test/integration/targets/aci_ap/tasks/main.yml b/test/integration/targets/aci_ap/tasks/main.yml index 0da1382160..afad4c556c 100644 --- a/test/integration/targets/aci_ap/tasks/main.yml +++ b/test/integration/targets/aci_ap/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_bd/tasks/main.yml b/test/integration/targets/aci_bd/tasks/main.yml index 326f1becac..a0162218bd 100644 --- a/test/integration/targets/aci_bd/tasks/main.yml +++ b/test/integration/targets/aci_bd/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_bd_subnet/tasks/main.yml b/test/integration/targets/aci_bd_subnet/tasks/main.yml index 8201dd5cda..fdd43d96ab 100644 --- a/test/integration/targets/aci_bd_subnet/tasks/main.yml +++ b/test/integration/targets/aci_bd_subnet/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_config_rollback/tasks/main.yml b/test/integration/targets/aci_config_rollback/tasks/main.yml index 1e6f81b500..4a9062173d 100644 --- a/test/integration/targets/aci_config_rollback/tasks/main.yml +++ b/test/integration/targets/aci_config_rollback/tasks/main.yml @@ -13,9 +13,11 @@ hostname: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no - tenant: anstest + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent + tenant: anstest - name: create a snapshot aci_config_snapshot: &create_snapshot diff --git a/test/integration/targets/aci_config_snapshot/tasks/main.yml b/test/integration/targets/aci_config_snapshot/tasks/main.yml index a48786408b..031db6aeed 100644 --- a/test/integration/targets/aci_config_snapshot/tasks/main.yml +++ b/test/integration/targets/aci_config_snapshot/tasks/main.yml @@ -13,7 +13,9 @@ hostname: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' export_policy: anstest max_count: 10 include_secure: no diff --git a/test/integration/targets/aci_contract/tasks/main.yml b/test/integration/targets/aci_contract/tasks/main.yml index e8b2b218c4..1d392afcc4 100644 --- a/test/integration/targets/aci_contract/tasks/main.yml +++ b/test/integration/targets/aci_contract/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_contract_subject/tasks/main.yml b/test/integration/targets/aci_contract_subject/tasks/main.yml index ca948d02b0..3e4885ca03 100644 --- a/test/integration/targets/aci_contract_subject/tasks/main.yml +++ b/test/integration/targets/aci_contract_subject/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_contract_subject_to_filter/tasks/main.yml b/test/integration/targets/aci_contract_subject_to_filter/tasks/main.yml index 30c172166d..66bf676ddf 100644 --- a/test/integration/targets/aci_contract_subject_to_filter/tasks/main.yml +++ b/test/integration/targets/aci_contract_subject_to_filter/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_encap_pool/tasks/vlan.yml b/test/integration/targets/aci_encap_pool/tasks/vlan.yml index 0a65b1df2a..6b1acea8f1 100644 --- a/test/integration/targets/aci_encap_pool/tasks/vlan.yml +++ b/test/integration/targets/aci_encap_pool/tasks/vlan.yml @@ -4,7 +4,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent pool: anstest pool_type: vlan diff --git a/test/integration/targets/aci_encap_pool/tasks/vsan.yml b/test/integration/targets/aci_encap_pool/tasks/vsan.yml index 0e202cbebb..040481963f 100644 --- a/test/integration/targets/aci_encap_pool/tasks/vsan.yml +++ b/test/integration/targets/aci_encap_pool/tasks/vsan.yml @@ -4,8 +4,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent pool: anstest pool_type: vsan - allocation_mode: static \ No newline at end of file + allocation_mode: static diff --git a/test/integration/targets/aci_encap_pool/tasks/vxlan.yml b/test/integration/targets/aci_encap_pool/tasks/vxlan.yml index ecfd6f3b45..b9585afa7e 100644 --- a/test/integration/targets/aci_encap_pool/tasks/vxlan.yml +++ b/test/integration/targets/aci_encap_pool/tasks/vxlan.yml @@ -4,7 +4,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent pool: anstest pool_type: vxlan diff --git a/test/integration/targets/aci_encap_pool_range/tasks/vlan.yml b/test/integration/targets/aci_encap_pool_range/tasks/vlan.yml index 0ed78e7ee4..b8a0d9559b 100644 --- a/test/integration/targets/aci_encap_pool_range/tasks/vlan.yml +++ b/test/integration/targets/aci_encap_pool_range/tasks/vlan.yml @@ -3,7 +3,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent pool: anstest pool_type: vlan @@ -15,7 +17,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present pool: anstest pool_type: vlan diff --git a/test/integration/targets/aci_encap_pool_range/tasks/vsan.yml b/test/integration/targets/aci_encap_pool_range/tasks/vsan.yml index c195cf6274..3b3d20d251 100644 --- a/test/integration/targets/aci_encap_pool_range/tasks/vsan.yml +++ b/test/integration/targets/aci_encap_pool_range/tasks/vsan.yml @@ -3,7 +3,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present pool: anstest pool_type: vsan diff --git a/test/integration/targets/aci_encap_pool_range/tasks/vxlan.yml b/test/integration/targets/aci_encap_pool_range/tasks/vxlan.yml index e2ac313ea5..b6a242e26b 100644 --- a/test/integration/targets/aci_encap_pool_range/tasks/vxlan.yml +++ b/test/integration/targets/aci_encap_pool_range/tasks/vxlan.yml @@ -3,7 +3,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present pool: anstest pool_type: vxlan diff --git a/test/integration/targets/aci_epg/tasks/main.yml b/test/integration/targets/aci_epg/tasks/main.yml index 59203f9186..9ff047a0b9 100644 --- a/test/integration/targets/aci_epg/tasks/main.yml +++ b/test/integration/targets/aci_epg/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_epg_to_contract/tasks/main.yml b/test/integration/targets/aci_epg_to_contract/tasks/main.yml index caf26cf0c7..bd9b26c609 100644 --- a/test/integration/targets/aci_epg_to_contract/tasks/main.yml +++ b/test/integration/targets/aci_epg_to_contract/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_epg_to_domain/tasks/main.yml b/test/integration/targets/aci_epg_to_domain/tasks/main.yml index 61749439b3..5701c95708 100644 --- a/test/integration/targets/aci_epg_to_domain/tasks/main.yml +++ b/test/integration/targets/aci_epg_to_domain/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present @@ -35,7 +37,9 @@ hostname: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' method: post path: api/mo/uni/phys-anstest.json content: {"physDomP": {"attributes": {}}} diff --git a/test/integration/targets/aci_filter/tasks/main.yml b/test/integration/targets/aci_filter/tasks/main.yml index 0645849735..52581f6f13 100644 --- a/test/integration/targets/aci_filter/tasks/main.yml +++ b/test/integration/targets/aci_filter/tasks/main.yml @@ -14,7 +14,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' tenant: ansible_test state: present @@ -23,7 +25,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' tenant: ansible_test filter: filter_test state: absent @@ -34,7 +38,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' tenant: ansible_test filter: filter_test state: present @@ -119,7 +125,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: query check_mode: yes register: cm_query_all_filters diff --git a/test/integration/targets/aci_filter_entry/tasks/main.yml b/test/integration/targets/aci_filter_entry/tasks/main.yml index 66c1a415fe..3cac5ebb2a 100644 --- a/test/integration/targets/aci_filter_entry/tasks/main.yml +++ b/test/integration/targets/aci_filter_entry/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent tenant: anstest @@ -22,7 +24,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present diff --git a/test/integration/targets/aci_interface_policy_leaf_profile/tasks/main.yml b/test/integration/targets/aci_interface_policy_leaf_profile/tasks/main.yml index 8ebdf79207..08a071d68c 100644 --- a/test/integration/targets/aci_interface_policy_leaf_profile/tasks/main.yml +++ b/test/integration/targets/aci_interface_policy_leaf_profile/tasks/main.yml @@ -15,7 +15,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_interface_profile: ansible_test state: absent @@ -26,7 +28,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_interface_profile: ansible_test state: present check_mode: yes @@ -108,7 +112,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: query check_mode: yes register: cm_query_all_leaf_interface_profiles diff --git a/test/integration/targets/aci_interface_selector_to_switch_policy_leaf_profile/tasks/main.yml b/test/integration/targets/aci_interface_selector_to_switch_policy_leaf_profile/tasks/main.yml index 9527601f34..c431e234a1 100644 --- a/test/integration/targets/aci_interface_selector_to_switch_policy_leaf_profile/tasks/main.yml +++ b/test/integration/targets/aci_interface_selector_to_switch_policy_leaf_profile/tasks/main.yml @@ -13,8 +13,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_profile: swleafprftest - validate_certs: no state: absent - name: delete Interface Policy Leaf profile for kick off @@ -22,8 +24,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_interface_profile: leafintprftest - validate_certs: no state: absent - name: Ensuring Switch Policy Leaf profile exists for kick off @@ -31,8 +35,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_profile: swleafprftest - validate_certs: no state: present register: leaf_profile_present @@ -41,8 +47,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_interface_profile: leafintprftest - validate_certs: no state: present register: leaf_profile_present diff --git a/test/integration/targets/aci_rest/tasks/json_inline.yml b/test/integration/targets/aci_rest/tasks/json_inline.yml index ca0f623eeb..bc456f0ec5 100644 --- a/test/integration/targets/aci_rest/tasks/json_inline.yml +++ b/test/integration/targets/aci_rest/tasks/json_inline.yml @@ -14,7 +14,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: delete delegate_to: localhost @@ -25,7 +27,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: @@ -56,7 +60,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: @@ -99,7 +105,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost @@ -116,7 +124,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost diff --git a/test/integration/targets/aci_rest/tasks/json_string.yml b/test/integration/targets/aci_rest/tasks/json_string.yml index d0275aa9ab..fe77edfa91 100644 --- a/test/integration/targets/aci_rest/tasks/json_string.yml +++ b/test/integration/targets/aci_rest/tasks/json_string.yml @@ -14,7 +14,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: delete delegate_to: localhost @@ -25,7 +27,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: | @@ -56,7 +60,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: | @@ -99,7 +105,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost @@ -116,7 +124,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost diff --git a/test/integration/targets/aci_rest/tasks/xml_string.yml b/test/integration/targets/aci_rest/tasks/xml_string.yml index dc5021994f..b6ed0c9423 100644 --- a/test/integration/targets/aci_rest/tasks/xml_string.yml +++ b/test/integration/targets/aci_rest/tasks/xml_string.yml @@ -14,7 +14,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].xml method: delete delegate_to: localhost @@ -25,7 +27,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].xml method: post content: | @@ -50,7 +54,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].xml method: post content: | @@ -86,7 +92,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].xml method: get delegate_to: localhost @@ -103,7 +111,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].xml method: get delegate_to: localhost diff --git a/test/integration/targets/aci_rest/tasks/yaml_inline.yml b/test/integration/targets/aci_rest/tasks/yaml_inline.yml index 962cba70d6..3520a06442 100644 --- a/test/integration/targets/aci_rest/tasks/yaml_inline.yml +++ b/test/integration/targets/aci_rest/tasks/yaml_inline.yml @@ -14,7 +14,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: delete delegate_to: localhost @@ -25,7 +27,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: @@ -52,7 +56,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: @@ -91,7 +97,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost @@ -108,7 +116,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost diff --git a/test/integration/targets/aci_rest/tasks/yaml_string.yml b/test/integration/targets/aci_rest/tasks/yaml_string.yml index d0bc4a52d3..0d48031e0b 100644 --- a/test/integration/targets/aci_rest/tasks/yaml_string.yml +++ b/test/integration/targets/aci_rest/tasks/yaml_string.yml @@ -14,7 +14,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: delete delegate_to: localhost @@ -25,7 +27,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: | @@ -52,7 +56,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: post content: | @@ -91,7 +97,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost @@ -108,7 +116,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' path: /api/mo/uni/tn-[ansible_test].json method: get delegate_to: localhost diff --git a/test/integration/targets/aci_switch_leaf_policy_profile/tasks/main.yml b/test/integration/targets/aci_switch_leaf_policy_profile/tasks/main.yml index bd15ae8796..12a510febe 100644 --- a/test/integration/targets/aci_switch_leaf_policy_profile/tasks/main.yml +++ b/test/integration/targets/aci_switch_leaf_policy_profile/tasks/main.yml @@ -15,7 +15,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_profile: ansible_test state: absent @@ -26,7 +28,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_profile: ansible_test state: present check_mode: yes @@ -108,7 +112,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: query check_mode: yes register: cm_query_all_switch_leaf_profiles diff --git a/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml b/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml index 9125e7721f..4240489766 100644 --- a/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml +++ b/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml @@ -13,8 +13,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_profile: sw_name_test - validate_certs: no state: absent - name: Ensuring Switch Policy Leaf profile exists for kick off @@ -22,8 +24,10 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' leaf_profile: sw_name_test - validate_certs: no state: present register: leaf_profile_present diff --git a/test/integration/targets/aci_tenant/tasks/main.yml b/test/integration/targets/aci_tenant/tasks/main.yml index a4059f8e77..4a44b9470c 100644 --- a/test/integration/targets/aci_tenant/tasks/main.yml +++ b/test/integration/targets/aci_tenant/tasks/main.yml @@ -15,7 +15,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' tenant: ansible_test state: absent @@ -26,7 +28,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' tenant: ansible_test state: present check_mode: yes @@ -108,7 +112,9 @@ hostname: '{{ aci_hostname }}' username: '{{ aci_username }}' password: '{{ aci_password }}' - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: query check_mode: yes register: cm_query_all_tenants diff --git a/test/integration/targets/aci_vlan_pool/tasks/main.yml b/test/integration/targets/aci_vlan_pool/tasks/main.yml index 79ba2b53ae..27832a0ec1 100644 --- a/test/integration/targets/aci_vlan_pool/tasks/main.yml +++ b/test/integration/targets/aci_vlan_pool/tasks/main.yml @@ -14,7 +14,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent pool: anstest allocation_mode: static diff --git a/test/integration/targets/aci_vlan_pool_encap_block/tasks/main.yml b/test/integration/targets/aci_vlan_pool_encap_block/tasks/main.yml index a954e110cf..03e51a29b3 100644 --- a/test/integration/targets/aci_vlan_pool_encap_block/tasks/main.yml +++ b/test/integration/targets/aci_vlan_pool_encap_block/tasks/main.yml @@ -14,7 +14,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: absent pool: anstest allocation_mode: static @@ -25,7 +27,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present pool: anstest allocation_mode: static diff --git a/test/integration/targets/aci_vrf/tasks/main.yml b/test/integration/targets/aci_vrf/tasks/main.yml index 4d356ce883..425456c357 100644 --- a/test/integration/targets/aci_vrf/tasks/main.yml +++ b/test/integration/targets/aci_vrf/tasks/main.yml @@ -13,7 +13,9 @@ host: "{{ aci_hostname }}" username: "{{ aci_username }}" password: "{{ aci_password }}" - validate_certs: no + validate_certs: '{{ aci_validate_certs | default(false) }}' + use_ssl: '{{ aci_use_ssl | default(true) }}' + use_proxy: '{{ aci_use_proxy | default(true) }}' state: present tenant: anstest register: tenant_present