cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ACI: Move to 'host' parameter instead of 'hostname' (#35161)

Browse source 
* ACI: Move to 'host' parameter instead of 'hostname'

* Update host parameter in documentation fragment too
This commit is contained in:
Dag Wieers 2018-01-22 22:06:56 +01:00 committed by GitHub
parent cf1f7b53df
commit d6004852a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 197 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/module_utils/network/aci/aci.py
View file

@ -63,7 +63,7 @@ except ImportError:
def aci_argument_spec(): def aci_argument_spec():
return dict( return dict(
hostname=dict(type='str', required=True, aliases=['host']), host=dict(type='str', required=True, aliases=['hostname']),
port=dict(type='int', required=False), port=dict(type='int', required=False),
username=dict(type='str', default='admin', aliases=['user']), username=dict(type='str', default='admin', aliases=['user']),
password=dict(type='str', no_log=True), password=dict(type='str', no_log=True),
@ -216,9 +216,9 @@ class ACIModule(object):
# Perform login request # Perform login request
if 'port' in self.params and self.params['port'] is not None: if 'port' in self.params and self.params['port'] is not None:
url = '%(protocol)s://%(hostname)s:%(port)s/api/aaaLogin.json' % self.params url = '%(protocol)s://%(host)s:%(port)s/api/aaaLogin.json' % self.params
else: else:
url = '%(protocol)s://%(hostname)s/api/aaaLogin.json' % self.params url = '%(protocol)s://%(host)s/api/aaaLogin.json' % self.params
payload = {'aaaUser': {'attributes': {'name': self.params['username'], 'pwd': self.params['password']}}} payload = {'aaaUser': {'attributes': {'name': self.params['username'], 'pwd': self.params['password']}}}
resp, auth = fetch_url(self.module, url, resp, auth = fetch_url(self.module, url,
data=json.dumps(payload), data=json.dumps(payload),
@ -281,9 +281,9 @@ class ACIModule(object):
self.result['path'] = path self.result['path'] = path
if 'port' in self.params and self.params['port'] is not None: if 'port' in self.params and self.params['port'] is not None:
self.result['url'] = '%(protocol)s://%(hostname)s:%(port)s/' % self.params + path.lstrip('/') self.result['url'] = '%(protocol)s://%(host)s:%(port)s/' % self.params + path.lstrip('/')
else: else:
self.result['url'] = '%(protocol)s://%(hostname)s/' % self.params + path.lstrip('/') self.result['url'] = '%(protocol)s://%(host)s/' % self.params + path.lstrip('/')
# Sign and encode request as to APIC's wishes # Sign and encode request as to APIC's wishes
if self.params['private_key'] is not None: if self.params['private_key'] is not None:
@ -319,9 +319,9 @@ class ACIModule(object):
self.result['path'] = path self.result['path'] = path
if 'port' in self.params and self.params['port'] is not None: if 'port' in self.params and self.params['port'] is not None:
self.result['url'] = '%(protocol)s://%(hostname)s:%(port)s/' % self.params + path.lstrip('/') self.result['url'] = '%(protocol)s://%(host)s:%(port)s/' % self.params + path.lstrip('/')
else: else:
self.result['url'] = '%(protocol)s://%(hostname)s/' % self.params + path.lstrip('/') self.result['url'] = '%(protocol)s://%(host)s/' % self.params + path.lstrip('/')
# Sign and encode request as to APIC's wishes # Sign and encode request as to APIC's wishes
if self.params['private_key'] is not None: if self.params['private_key'] is not None:
@ -395,9 +395,9 @@ class ACIModule(object):
self.result['path'] = path self.result['path'] = path
if 'port' in self.params and self.params['port'] is not None: if 'port' in self.params and self.params['port'] is not None:
self.result['url'] = '{0}://{1}:{2}/{3}'.format(self.module.params['protocol'], self.module.params['hostname'], self.module.params['port'], path) self.result['url'] = '{0}://{1}:{2}/{3}'.format(self.module.params['protocol'], self.module.params['host'], self.module.params['port'], path)
else: else:
self.result['url'] = '{0}://{1}/{2}'.format(self.module.params['protocol'], self.module.params['hostname'], path) self.result['url'] = '{0}://{1}/{2}'.format(self.module.params['protocol'], self.module.params['host'], path)
self.result['filter_string'] = filter_string self.result['filter_string'] = filter_string
def _construct_url_1(self, obj, child_includes): def _construct_url_1(self, obj, child_includes):

8
lib/ansible/modules/network/aci/aci_aaa_user_certificate.py
View file

@ -54,7 +54,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a certificate to user - name: Add a certificate to user
aci_aaa_user_certificate: aci_aaa_user_certificate:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
user: admin user: admin
@ -64,7 +64,7 @@ EXAMPLES = r'''
- name: Remove a certificate of a user - name: Remove a certificate of a user
aci_aaa_user_certificate: aci_aaa_user_certificate:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
user: admin user: admin
@ -73,7 +73,7 @@ EXAMPLES = r'''
- name: Query a certificate of a user - name: Query a certificate of a user
aci_aaa_user_certificate: aci_aaa_user_certificate:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
user: admin user: admin
@ -82,7 +82,7 @@ EXAMPLES = r'''
- name: Query all certificates of a user - name: Query all certificates of a user
aci_aaa_user_certificate: aci_aaa_user_certificate:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
user: admin user: admin

8
lib/ansible/modules/network/aci/aci_access_port_to_interface_policy_leaf_profile.py
View file

@ -73,7 +73,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Associate an Interface Access Port Selector to an Interface Policy Leaf Profile with a Policy Group - name: Associate an Interface Access Port Selector to an Interface Policy Leaf Profile with a Policy Group
aci_access_port_to_interface_policy_leaf_profile: aci_access_port_to_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname
@ -86,7 +86,7 @@ EXAMPLES = r'''
- name: Associate an interface access port selector to an Interface Policy Leaf Profile (w/o policy group) (check if this works) - name: Associate an interface access port selector to an Interface Policy Leaf Profile (w/o policy group) (check if this works)
aci_access_port_to_interface_policy_leaf_profile: aci_access_port_to_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname
@ -98,7 +98,7 @@ EXAMPLES = r'''
- name: Remove an interface access port selector associated with an Interface Policy Leaf Profile - name: Remove an interface access port selector associated with an Interface Policy Leaf Profile
aci_access_port_to_interface_policy_leaf_profile: aci_access_port_to_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname
@ -107,7 +107,7 @@ EXAMPLES = r'''
- name: Query Specific access_port_selector under given leaf_interface_profile - name: Query Specific access_port_selector under given leaf_interface_profile
aci_access_port_to_interface_policy_leaf_profile: aci_access_port_to_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname

8
lib/ansible/modules/network/aci/aci_aep.py
View file

@ -55,7 +55,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new AEP - name: Add a new AEP
aci_aep: aci_aep:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
aep: ACI-AEP aep: ACI-AEP
@ -64,7 +64,7 @@ EXAMPLES = r'''
- name: Remove an existing AEP - name: Remove an existing AEP
aci_aep: aci_aep:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
aep: ACI-AEP aep: ACI-AEP
@ -72,7 +72,7 @@ EXAMPLES = r'''
- name: Query an AEP - name: Query an AEP
aci_aep: aci_aep:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
aep: ACI-AEP aep: ACI-AEP
@ -80,7 +80,7 @@ EXAMPLES = r'''
- name: Query all AEPs - name: Query all AEPs
aci_aep: aci_aep:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

8
lib/ansible/modules/network/aci/aci_ap.py
View file

@ -52,7 +52,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new AP - name: Add a new AP
aci_ap: aci_ap:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -62,7 +62,7 @@ EXAMPLES = r'''
- name: Remove an AP - name: Remove an AP
aci_ap: aci_ap:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -71,7 +71,7 @@ EXAMPLES = r'''
- name: Query an AP - name: Query an AP
aci_ap: aci_ap:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -80,7 +80,7 @@ EXAMPLES = r'''
- name: Query all APs - name: Query all APs
aci_ap: aci_ap:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

18
lib/ansible/modules/network/aci/aci_bd_subnet.py
View file

@ -112,14 +112,14 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: create a tenant - name: create a tenant
aci_tenant: aci_tenant:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
- name: create a bridge domain - name: create a bridge domain
aci_bd: aci_bd:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -127,7 +127,7 @@ EXAMPLES = r'''
- name: create a subnet - name: create a subnet
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -137,7 +137,7 @@ EXAMPLES = r'''
- name: create a subnet with options - name: create a subnet with options
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -152,7 +152,7 @@ EXAMPLES = r'''
- name: update a subnets scope to private and shared - name: update a subnets scope to private and shared
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -163,14 +163,14 @@ EXAMPLES = r'''
- name: get all subnets - name: get all subnets
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
- name: get all subnets of specific gateway in specified tenant - name: get all subnets of specific gateway in specified tenant
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
@ -180,7 +180,7 @@ EXAMPLES = r'''
- name: get specific subnet - name: get specific subnet
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
@ -191,7 +191,7 @@ EXAMPLES = r'''
- name: delete a subnet - name: delete a subnet
aci_bd_subnet: aci_bd_subnet:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: absent state: absent

12
lib/ansible/modules/network/aci/aci_config_rollback.py
View file

@ -76,7 +76,7 @@ EXAMPLES = r'''
--- ---
- name: Create a Snapshot - name: Create a Snapshot
aci_config_snapshot: aci_config_snapshot:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: present state: present
@ -84,7 +84,7 @@ EXAMPLES = r'''
- name: Query Existing Snapshots - name: Query Existing Snapshots
aci_config_snapshot: aci_config_snapshot:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
@ -92,7 +92,7 @@ EXAMPLES = r'''
- name: Compare Snapshot Files - name: Compare Snapshot Files
aci_config_rollback: aci_config_rollback:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: preview state: preview
@ -103,7 +103,7 @@ EXAMPLES = r'''
- name: Rollback Configuration - name: Rollback Configuration
aci_config_rollback: aci_config_rollback:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: rollback state: rollback
@ -113,7 +113,7 @@ EXAMPLES = r'''
- name: Rollback Configuration - name: Rollback Configuration
aci_config_rollback: aci_config_rollback:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: rollback state: rollback
@ -225,7 +225,7 @@ def main():
aci.post_config() aci.post_config()
elif state == 'preview': elif state == 'preview':
aci.result['url'] = '%(protocol)s://%(hostname)s/mqapi2/snapshots.diff.xml' % module.params aci.result['url'] = '%(protocol)s://%(host)s/mqapi2/snapshots.diff.xml' % module.params
aci.result['filter_string'] = ( aci.result['filter_string'] = (
'?s1dn=uni/backupst/snapshots-[uni/fabric/configexp-%(export_policy)s]/snapshot-%(snapshot)s&' '?s1dn=uni/backupst/snapshots-[uni/fabric/configexp-%(export_policy)s]/snapshot-%(snapshot)s&'
's2dn=uni/backupst/snapshots-[uni/fabric/configexp-%(compare_export_policy)s]/snapshot-%(compare_snapshot)s' 's2dn=uni/backupst/snapshots-[uni/fabric/configexp-%(compare_export_policy)s]/snapshot-%(compare_snapshot)s'

8
lib/ansible/modules/network/aci/aci_config_snapshot.py
View file

@ -69,7 +69,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Create a Snapshot - name: Create a Snapshot
aci_config_snapshot: aci_config_snapshot:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: present state: present
@ -79,14 +79,14 @@ EXAMPLES = r'''
- name: Query all Snapshots - name: Query all Snapshots
aci_config_snapshot: aci_config_snapshot:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
- name: Query Snapshots associated with a particular Export Policy - name: Query Snapshots associated with a particular Export Policy
aci_config_snapshot: aci_config_snapshot:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
@ -94,7 +94,7 @@ EXAMPLES = r'''
- name: Delete a Snapshot - name: Delete a Snapshot
aci_config_snapshot: aci_config_snapshot:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: absent state: absent

2
lib/ansible/modules/network/aci/aci_contract.py
View file

@ -69,7 +69,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_contract: - aci_contract:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
contract: '{{ contract }}' contract: '{{ contract }}'

8
lib/ansible/modules/network/aci/aci_contract_subject.py
View file

@ -86,7 +86,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new contract subject - name: Add a new contract subject
aci_contract_subject: aci_contract_subject:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -100,7 +100,7 @@ EXAMPLES = r'''
- name: Remove a contract subject - name: Remove a contract subject
aci_contract_subject: aci_contract_subject:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -110,7 +110,7 @@ EXAMPLES = r'''
- name: Query a contract subject - name: Query a contract subject
aci_contract_subject: aci_contract_subject:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -120,7 +120,7 @@ EXAMPLES = r'''
- name: Query all contract subjects - name: Query all contract subjects
aci_contract_subject: aci_contract_subject:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

2
lib/ansible/modules/network/aci/aci_contract_subject_to_filter.py
View file

@ -63,7 +63,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_subject_filter_binding: - aci_subject_filter_binding:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
tenant: '{{ tenant }}' tenant: '{{ tenant }}'

12
lib/ansible/modules/network/aci/aci_domain.py
View file

@ -73,7 +73,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new physical domain - name: Add a new physical domain
aci_domain: aci_domain:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: phys_dom domain: phys_dom
@ -82,7 +82,7 @@ EXAMPLES = r'''
- name: Remove a physical domain - name: Remove a physical domain
aci_domain: aci_domain:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: phys_dom domain: phys_dom
@ -91,7 +91,7 @@ EXAMPLES = r'''
- name: Add a new VMM domain - name: Add a new VMM domain
aci_domain: aci_domain:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: hyperv_dom domain: hyperv_dom
@ -101,7 +101,7 @@ EXAMPLES = r'''
- name: Remove a VMM domain - name: Remove a VMM domain
aci_domain: aci_domain:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: hyperv_dom domain: hyperv_dom
@ -111,7 +111,7 @@ EXAMPLES = r'''
- name: Query a specific physical domain - name: Query a specific physical domain
aci_domain: aci_domain:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: phys_dom domain: phys_dom
@ -120,7 +120,7 @@ EXAMPLES = r'''
- name: Query all domains - name: Query all domains
aci_domain: aci_domain:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

12
lib/ansible/modules/network/aci/aci_domain_to_vlan_pool.py
View file

@ -62,7 +62,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Bind a VMM domain to VLAN pool - name: Bind a VMM domain to VLAN pool
aci_domain_to_vlan_pool: aci_domain_to_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: vmw_dom domain: vmw_dom
@ -74,7 +74,7 @@ EXAMPLES = r'''
- name: Remove a VMM domain to VLAN pool binding - name: Remove a VMM domain to VLAN pool binding
aci_domain_to_vlan_pool: aci_domain_to_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: vmw_dom domain: vmw_dom
@ -86,7 +86,7 @@ EXAMPLES = r'''
- name: Bind a physical domain to VLAN pool - name: Bind a physical domain to VLAN pool
aci_domain_to_vlan_pool: aci_domain_to_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: phys_dom domain: phys_dom
@ -97,7 +97,7 @@ EXAMPLES = r'''
- name: Bind a physical domain to VLAN pool - name: Bind a physical domain to VLAN pool
aci_domain_to_vlan_pool: aci_domain_to_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: phys_dom domain: phys_dom
@ -108,7 +108,7 @@ EXAMPLES = r'''
- name: Query an domain to VLAN pool binding - name: Query an domain to VLAN pool binding
aci_domain_to_vlan_pool: aci_domain_to_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
domain: phys_dom domain: phys_dom
@ -119,7 +119,7 @@ EXAMPLES = r'''
- name: Query all domain to VLAN pool bindings - name: Query all domain to VLAN pool bindings
aci_domain_to_vlan_pool: aci_domain_to_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

8
lib/ansible/modules/network/aci/aci_encap_pool.py
View file

@ -55,7 +55,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new vlan pool - name: Add a new vlan pool
aci_encap_pool: aci_encap_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -65,7 +65,7 @@ EXAMPLES = r'''
- name: Remove a vlan pool - name: Remove a vlan pool
aci_encap_pool: aci_encap_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -74,7 +74,7 @@ EXAMPLES = r'''
- name: Query a vlan pool - name: Query a vlan pool
aci_encap_pool: aci_encap_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -83,7 +83,7 @@ EXAMPLES = r'''
- name: Query all vlan pools - name: Query all vlan pools
aci_encap_pool: aci_encap_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool_type: vlan pool_type: vlan

10
lib/ansible/modules/network/aci/aci_encap_pool_range.py
View file

@ -74,7 +74,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new vlan range - name: Add a new vlan range
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -85,7 +85,7 @@ EXAMPLES = r'''
- name: Remove a vlan range - name: Remove a vlan range
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -96,7 +96,7 @@ EXAMPLES = r'''
- name: Query a vlan range - name: Query a vlan range
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -107,7 +107,7 @@ EXAMPLES = r'''
- name: Query a vlan pool for ranges - name: Query a vlan pool for ranges
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -116,7 +116,7 @@ EXAMPLES = r'''
- name: Query all vlan ranges - name: Query all vlan ranges
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool_type: vlan pool_type: vlan

14
lib/ansible/modules/network/aci/aci_epg.py
View file

@ -76,7 +76,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new EPG - name: Add a new EPG
aci_epg: aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -86,7 +86,7 @@ EXAMPLES = r'''
bd: prod_bd bd: prod_bd
- aci_epg: - aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -105,7 +105,7 @@ EXAMPLES = r'''
- name: Remove an EPG - name: Remove an EPG
aci_epg: aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
validate_certs: false validate_certs: false
@ -116,7 +116,7 @@ EXAMPLES = r'''
- name: Query an EPG - name: Query an EPG
aci_epg: aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -126,14 +126,14 @@ EXAMPLES = r'''
- name: Query all EPGs - name: Query all EPGs
aci_epg: aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query
- name: Query all EPGs with a Specific Name - name: Query all EPGs with a Specific Name
aci_epg: aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
validate_certs: false validate_certs: false
@ -142,7 +142,7 @@ EXAMPLES = r'''
- name: Query all EPGs of an App Profile - name: Query all EPGs of an App Profile
aci_epg: aci_epg:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
validate_certs: false validate_certs: false

2
lib/ansible/modules/network/aci/aci_epg_monitoring_policy.py
View file

@ -53,7 +53,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_epg_monitoring_policy: - aci_epg_monitoring_policy:
hostname: '{{ hostname }}' host: '{{ hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
monitoring_policy: '{{ monitoring_policy }}' monitoring_policy: '{{ monitoring_policy }}'

8
lib/ansible/modules/network/aci/aci_filter.py
View file

@ -52,7 +52,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new filter to a tenant - name: Add a new filter to a tenant
aci_filter: aci_filter:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
filter: web_filter filter: web_filter
@ -62,7 +62,7 @@ EXAMPLES = r'''
- name: Remove a filter for a tenant - name: Remove a filter for a tenant
aci_filter: aci_filter:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
filter: web_filter filter: web_filter
@ -71,7 +71,7 @@ EXAMPLES = r'''
- name: Query a filter of a tenant - name: Query a filter of a tenant
aci_filter: aci_filter:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
filter: web_filter filter: web_filter
@ -80,7 +80,7 @@ EXAMPLES = r'''
- name: Query all filters for a tenant - name: Query all filters for a tenant
aci_filter: aci_filter:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production

9
lib/ansible/modules/network/aci/aci_filter_entry.py
View file

@ -102,17 +102,16 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- aci_filter_entry: - aci_filter_entry:
action: "{{ action }}" host: "{{ inventory_hostname }}"
username: "{{ user }}"
password: "{{ pass }}"
state: "{{ state }}"
entry: "{{ entry }}" entry: "{{ entry }}"
tenant: "{{ tenant }}" tenant: "{{ tenant }}"
ether_name: "{{ ether_name }}" ether_name: "{{ ether_name }}"
icmp_msg_type: "{{ icmp_msg_type }}" icmp_msg_type: "{{ icmp_msg_type }}"
filter: "{{ filter }}" filter: "{{ filter }}"
descr: "{{ descr }}" descr: "{{ descr }}"
host: "{{ inventory_hostname }}"
username: "{{ user }}"
password: "{{ pass }}"
protocol: "{{ protocol }}"
''' '''
RETURN = ''' # ''' RETURN = ''' # '''

2
lib/ansible/modules/network/aci/aci_interface_policy_fc.py
View file

@ -47,7 +47,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- aci_interface_policy_fc: - aci_interface_policy_fc:
hostname: '{{ hostname }}' host: '{{ hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
fc_policy: '{{ fc_policy }}' fc_policy: '{{ fc_policy }}'

2
lib/ansible/modules/network/aci/aci_interface_policy_l2.py
View file

@ -57,7 +57,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- aci_interface_policy_l2: - aci_interface_policy_l2:
hostname: '{{ hostname }}' host: '{{ hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
l2_policy: '{{ l2_policy }}' l2_policy: '{{ l2_policy }}'

8
lib/ansible/modules/network/aci/aci_interface_policy_leaf_policy_group.py
View file

@ -114,7 +114,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: creating a Port Channel (PC) Interface Policy Group - name: creating a Port Channel (PC) Interface Policy Group
aci_interface_policy_leaf_policy_group: aci_interface_policy_leaf_policy_group:
hostname: apic host: apic
username: yourusername username: yourusername
password: yourpassword password: yourpassword
policy_group: policygroupname policy_group: policygroupname
@ -126,7 +126,7 @@ EXAMPLES = r'''
- name: creating a Virtual Port Channel (VPC) Interface Policy Group (no description) - name: creating a Virtual Port Channel (VPC) Interface Policy Group (no description)
aci_interface_policy_leaf_policy_group: aci_interface_policy_leaf_policy_group:
hostname: apic host: apic
username: yourusername username: yourusername
password: yourpassword password: yourpassword
policy_group: policygroupname policy_group: policygroupname
@ -137,7 +137,7 @@ EXAMPLES = r'''
- name: creating a Leaf Access Port Policy Group (no description) - name: creating a Leaf Access Port Policy Group (no description)
aci_interface_policy_leaf_policy_group: aci_interface_policy_leaf_policy_group:
hostname: apic host: apic
username: yourusername username: yourusername
password: yourpassword password: yourpassword
policy_group: policygroupname policy_group: policygroupname
@ -148,7 +148,7 @@ EXAMPLES = r'''
- name: deleting an Interface policy Leaf Policy Group - name: deleting an Interface policy Leaf Policy Group
aci_interface_policy_leaf_policy_group: aci_interface_policy_leaf_policy_group:
hostname: apic host: apic
username: yourusername username: yourusername
password: yourpassword password: yourpassword
policy_group: policygroupname policy_group: policygroupname

8
lib/ansible/modules/network/aci/aci_interface_policy_leaf_profile.py
View file

@ -44,7 +44,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new leaf_interface_profile - name: Add a new leaf_interface_profile
aci_interface_policy_leaf_profile: aci_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname
@ -53,7 +53,7 @@ EXAMPLES = r'''
- name: Remove a leaf_interface_profile - name: Remove a leaf_interface_profile
aci_interface_policy_leaf_profile: aci_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname
@ -61,14 +61,14 @@ EXAMPLES = r'''
- name: Remove all leaf_interface_profiles - name: Remove all leaf_interface_profiles
aci_interface_policy_leaf_profile: aci_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: absent state: absent
- name: Query a leaf_interface_profile - name: Query a leaf_interface_profile
aci_interface_policy_leaf_profile: aci_interface_policy_leaf_profile:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
leaf_interface_profile: leafintprfname leaf_interface_profile: leafintprfname

2
lib/ansible/modules/network/aci/aci_interface_policy_lldp.py
View file

@ -55,7 +55,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_interface_policy_lldp: - aci_interface_policy_lldp:
hostname: '{{ hostname }}' host: '{{ hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
lldp_policy: '{{ lldp_policy }}' lldp_policy: '{{ lldp_policy }}'

2
lib/ansible/modules/network/aci/aci_interface_policy_mcp.py
View file

@ -48,7 +48,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_interface_policy_mcp: - aci_interface_policy_mcp:
hostname: '{{ hostname }}' host: '{{ hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
mcp: '{{ mcp }}' mcp: '{{ mcp }}'

2
lib/ansible/modules/network/aci/aci_interface_policy_port_channel.py
View file

@ -101,7 +101,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- aci_interface_policy_port_channel: - aci_interface_policy_port_channel:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
port_channel: '{{ port_channel }}' port_channel: '{{ port_channel }}'

2
lib/ansible/modules/network/aci/aci_interface_policy_port_security.py
View file

@ -47,7 +47,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_interface_policy_port_security: - aci_interface_policy_port_security:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
port_security: '{{ port_security }}' port_security: '{{ port_security }}'

6
lib/ansible/modules/network/aci/aci_interface_selector_to_switch_policy_leaf_profile.py
View file

@ -47,7 +47,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Associating an interface selector profile to a switch policy leaf profile - name: Associating an interface selector profile to a switch policy leaf profile
aci_interface_selector_to_switch_policy_leaf_profile: aci_interface_selector_to_switch_policy_leaf_profile:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -56,7 +56,7 @@ EXAMPLES = r'''
- name: Remove an interface selector profile associated with a switch policy leaf profile - name: Remove an interface selector profile associated with a switch policy leaf profile
aci_interface_selector_to_switch_policy_leaf_profile: aci_interface_selector_to_switch_policy_leaf_profile:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -65,7 +65,7 @@ EXAMPLES = r'''
- name: Query an interface selector profile associated with a switch policy leaf profile - name: Query an interface selector profile associated with a switch policy leaf profile
aci_interface_selector_to_switch_policy_leaf_profile: aci_interface_selector_to_switch_policy_leaf_profile:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name

2
lib/ansible/modules/network/aci/aci_l3out_route_tag_policy.py
View file

@ -55,7 +55,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_l3out_route_tag_policy: - aci_l3out_route_tag_policy:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
rtp: '{{ rtp_name }}' rtp: '{{ rtp_name }}'

18
lib/ansible/modules/network/aci/aci_rest.py
View file

@ -65,7 +65,7 @@ notes:
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a tenant using certifcate authentication - name: Add a tenant using certifcate authentication
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/admin.key private_key: pki/admin.key
method: post method: post
@ -75,7 +75,7 @@ EXAMPLES = r'''
- name: Add a tenant using inline YAML - name: Add a tenant using inline YAML
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/admin.key private_key: pki/admin.key
validate_certs: no validate_certs: no
@ -90,7 +90,7 @@ EXAMPLES = r'''
- name: Add a tenant using a JSON string - name: Add a tenant using a JSON string
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/admin.key private_key: pki/admin.key
validate_certs: no validate_certs: no
@ -109,7 +109,7 @@ EXAMPLES = r'''
- name: Add a tenant using an XML string - name: Add a tenant using an XML string
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/{{ aci_username}}.key private_key: pki/{{ aci_username}}.key
validate_certs: no validate_certs: no
@ -120,7 +120,7 @@ EXAMPLES = r'''
- name: Get tenants using password authentication - name: Get tenants using password authentication
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
method: get method: get
@ -129,7 +129,7 @@ EXAMPLES = r'''
- name: Configure contracts - name: Configure contracts
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/admin.key private_key: pki/admin.key
method: post method: post
@ -139,7 +139,7 @@ EXAMPLES = r'''
- name: Register leaves and spines - name: Register leaves and spines
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/admin.key private_key: pki/admin.key
validate_certs: no validate_certs: no
@ -155,7 +155,7 @@ EXAMPLES = r'''
- name: Wait for all controllers to become ready - name: Wait for all controllers to become ready
aci_rest: aci_rest:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
private_key: pki/admin.key private_key: pki/admin.key
validate_certs: no validate_certs: no
@ -370,7 +370,7 @@ def main():
module.fail_json(msg='Failed to parse provided XML payload: %s' % to_text(e), payload=payload) module.fail_json(msg='Failed to parse provided XML payload: %s' % to_text(e), payload=payload)
# Perform actual request using auth cookie (Same as aci_request, but also supports XML) # Perform actual request using auth cookie (Same as aci_request, but also supports XML)
aci.result['url'] = '%(protocol)s://%(hostname)s/' % aci.params + path.lstrip('/') aci.result['url'] = '%(protocol)s://%(host)s/' % aci.params + path.lstrip('/')
if aci.params['method'] != 'get': if aci.params['method'] != 'get':
path += '?rsp-subtree=modified' path += '?rsp-subtree=modified'
aci.result['url'] = update_qsl(aci.result['url'], {'rsp-subtree': 'modified'}) aci.result['url'] = update_qsl(aci.result['url'], {'rsp-subtree': 'modified'})

8
lib/ansible/modules/network/aci/aci_switch_leaf_selector.py
View file

@ -68,7 +68,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: adding a switch policy leaf profile selector associated Node Block range (w/ policy group) - name: adding a switch policy leaf profile selector associated Node Block range (w/ policy group)
aci_switch_leaf_selector: aci_switch_leaf_selector:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -81,7 +81,7 @@ EXAMPLES = r'''
- name: adding a switch policy leaf profile selector associated Node Block range (w/o policy group) - name: adding a switch policy leaf profile selector associated Node Block range (w/o policy group)
aci_switch_leaf_selector: aci_switch_leaf_selector:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -93,7 +93,7 @@ EXAMPLES = r'''
- name: Removing a switch policy leaf profile selector - name: Removing a switch policy leaf profile selector
aci_switch_leaf_selector: aci_switch_leaf_selector:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -102,7 +102,7 @@ EXAMPLES = r'''
- name: Querying a switch policy leaf profile selector - name: Querying a switch policy leaf profile selector
aci_switch_leaf_selector: aci_switch_leaf_selector:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name

6
lib/ansible/modules/network/aci/aci_switch_policy_leaf_profile.py
View file

@ -43,7 +43,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: creating a Leaf Profile with description - name: creating a Leaf Profile with description
aci_switch_policy_leaf_profile: aci_switch_policy_leaf_profile:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -52,7 +52,7 @@ EXAMPLES = r'''
- name: Deleting a Leaf Profile - name: Deleting a Leaf Profile
aci_switch_policy_leaf_profile: aci_switch_policy_leaf_profile:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name
@ -60,7 +60,7 @@ EXAMPLES = r'''
- name: Query a Leaf Profile - name: Query a Leaf Profile
aci_switch_policy_leaf_profile: aci_switch_policy_leaf_profile:
hostname: apic host: apic
username: someusername username: someusername
password: somepassword password: somepassword
leaf_profile: sw_name leaf_profile: sw_name

2
lib/ansible/modules/network/aci/aci_taboo_contract.py
View file

@ -57,7 +57,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_taboo_contract: - aci_taboo_contract:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
taboo_contract: '{{ taboo_contract }}' taboo_contract: '{{ taboo_contract }}'

8
lib/ansible/modules/network/aci/aci_tenant.py
View file

@ -43,7 +43,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new tenant - name: Add a new tenant
aci_tenant: aci_tenant:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -52,7 +52,7 @@ EXAMPLES = r'''
- name: Remove a tenant - name: Remove a tenant
aci_tenant: aci_tenant:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -60,7 +60,7 @@ EXAMPLES = r'''
- name: Query a tenant - name: Query a tenant
aci_tenant: aci_tenant:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -68,7 +68,7 @@ EXAMPLES = r'''
- name: Query all tenants - name: Query all tenants
aci_tenant: aci_tenant:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

2
lib/ansible/modules/network/aci/aci_tenant_action_rule_profile.py
View file

@ -49,7 +49,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_tenant_action_rule_profile: - aci_tenant_action_rule_profile:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
action_rule: '{{ action_rule }}' action_rule: '{{ action_rule }}'

8
lib/ansible/modules/network/aci/aci_tenant_ep_retention_policy.py
View file

@ -78,7 +78,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new EPR policy - name: Add a new EPR policy
aci_epr_policy: aci_epr_policy:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -93,7 +93,7 @@ EXAMPLES = r'''
- name: Remove an EPR policy - name: Remove an EPR policy
aci_epr_policy: aci_epr_policy:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -102,7 +102,7 @@ EXAMPLES = r'''
- name: Query an EPR policy - name: Query an EPR policy
aci_epr_policy: aci_epr_policy:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
tenant: production tenant: production
@ -111,7 +111,7 @@ EXAMPLES = r'''
- name: Query all EPR policies - name: Query all EPR policies
aci_epr_policy: aci_epr_policy:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

2
lib/ansible/modules/network/aci/aci_tenant_span_dst_group.py
View file

@ -51,7 +51,7 @@ extends_documentation_fragment: aci
# FIXME: Add more, better examples # FIXME: Add more, better examples
EXAMPLES = r''' EXAMPLES = r'''
- aci_tenant_span_dst_group: - aci_tenant_span_dst_group:
hostname: '{{ inventory_hostname }}' host: '{{ inventory_hostname }}'
username: '{{ username }}' username: '{{ username }}'
password: '{{ password }}' password: '{{ password }}'
dst_group: '{{ dst_group }}' dst_group: '{{ dst_group }}'

6
lib/ansible/modules/network/aci/aci_tenant_span_src_group.py
View file

@ -56,14 +56,14 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- aci_tenant_span_src_group: - aci_tenant_span_src_group:
host:"{{ inventory_hostname }}"
username:"{{ username }}"
password:"{{ password }}"
tenant:"{{ tenant }}" tenant:"{{ tenant }}"
src_group:"{{ src_group }}" src_group:"{{ src_group }}"
dst_group:"{{ dst_group }}" dst_group:"{{ dst_group }}"
admin_state:"{{ admin_state }}" admin_state:"{{ admin_state }}"
description:"{{ description }}" description:"{{ description }}"
host:"{{ inventory_hostname }}"
username:"{{ username }}"
password:"{{ password }}"
''' '''
RETURN = r''' RETURN = r'''

6
lib/ansible/modules/network/aci/aci_tenant_span_src_group_to_dst_group.py
View file

@ -50,13 +50,13 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- aci_tenant_span_src_group_to_dst_group: - aci_tenant_span_src_group_to_dst_group:
host:"{{ inventory_hostname }}"
username:"{{ username }}"
password:"{{ password }}"
tenant:"{{ tenant }}" tenant:"{{ tenant }}"
src_group:"{{ src_group }}" src_group:"{{ src_group }}"
dst_group:"{{ dst_group }}" dst_group:"{{ dst_group }}"
description:"{{ description }}" description:"{{ description }}"
host:"{{ inventory_hostname }}"
username:"{{ username }}"
password:"{{ password }}"
''' '''
RETURN = r''' RETURN = r'''

8
lib/ansible/modules/network/aci/aci_vlan_pool.py
View file

@ -50,7 +50,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new VLAN pool - name: Add a new VLAN pool
aci_vlan_pool: aci_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -59,7 +59,7 @@ EXAMPLES = r'''
- name: Remove a VLAN pool - name: Remove a VLAN pool
aci_vlan_pool: aci_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -67,7 +67,7 @@ EXAMPLES = r'''
- name: Query a VLAN pool - name: Query a VLAN pool
aci_vlan_pool: aci_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -75,7 +75,7 @@ EXAMPLES = r'''
- name: Query all VLAN pools - name: Query all VLAN pools
aci_vlan_pool: aci_vlan_pool:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

10
lib/ansible/modules/network/aci/aci_vlan_pool_encap_block.py
View file

@ -69,7 +69,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new VLAN encap block - name: Add a new VLAN encap block
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -79,7 +79,7 @@ EXAMPLES = r'''
- name: Remove a VLAN encap block - name: Remove a VLAN encap block
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -89,7 +89,7 @@ EXAMPLES = r'''
- name: Query a VLAN encap block - name: Query a VLAN encap block
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -99,7 +99,7 @@ EXAMPLES = r'''
- name: Query a VLAN pool for encap blocks - name: Query a VLAN pool for encap blocks
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
pool: production pool: production
@ -107,7 +107,7 @@ EXAMPLES = r'''
- name: Query all VLAN encap blocks - name: Query all VLAN encap blocks
aci_vlan_pool_encap_block: aci_vlan_pool_encap_block:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

8
lib/ansible/modules/network/aci/aci_vrf.py
View file

@ -58,7 +58,7 @@ extends_documentation_fragment: aci
EXAMPLES = r''' EXAMPLES = r'''
- name: Add a new VRF to a tenant - name: Add a new VRF to a tenant
aci_vrf: aci_vrf:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
vrf: vrf_lab vrf: vrf_lab
@ -70,7 +70,7 @@ EXAMPLES = r'''
- name: Remove a VRF for a tenant - name: Remove a VRF for a tenant
aci_vrf: aci_vrf:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
vrf: vrf_lab vrf: vrf_lab
@ -79,7 +79,7 @@ EXAMPLES = r'''
- name: Query a VRF of a tenant - name: Query a VRF of a tenant
aci_vrf: aci_vrf:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
vrf: vrf_lab vrf: vrf_lab
@ -88,7 +88,7 @@ EXAMPLES = r'''
- name: Query all VRFs - name: Query all VRFs
aci_vrf: aci_vrf:
hostname: apic host: apic
username: admin username: admin
password: SomeSecretPassword password: SomeSecretPassword
state: query state: query

4
lib/ansible/utils/module_docs_fragments/aci.py
View file

@ -23,11 +23,11 @@ class ModuleDocFragment(object):
# Standard files documentation fragment # Standard files documentation fragment
DOCUMENTATION = ''' DOCUMENTATION = '''
options: options:
hostname: host:
description: description:
- IP Address or hostname of APIC resolvable by Ansible control host. - IP Address or hostname of APIC resolvable by Ansible control host.
required: yes required: yes
aliases: [ host ] aliases: [ hostname ]
port: port:
description: description:
- Port number to be used for REST connection. - Port number to be used for REST connection.

6
test/integration/targets/aci_aaa_user_certificate/tasks/main.yml
View file

@ -12,7 +12,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove any pre-existing certificate - name: Remove any pre-existing certificate
aci_aaa_user_certificate: &cert_absent aci_aaa_user_certificate: &cert_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -26,7 +26,7 @@
# ADD USER CERTIFICATE # ADD USER CERTIFICATE
- name: Add user certificate (check_mode) - name: Add user certificate (check_mode)
aci_aaa_user_certificate: &cert_present aci_aaa_user_certificate: &cert_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -62,7 +62,7 @@
# QUERY ALL USER CERTIFICATES # QUERY ALL USER CERTIFICATES
- name: Query all user certificates using signature-based authentication (check_mode) - name: Query all user certificates using signature-based authentication (check_mode)
aci_aaa_user_certificate: &cert_query aci_aaa_user_certificate: &cert_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
#password: '{{ aci_password }}' #password: '{{ aci_password }}'
private_key: '{{ role_path }}/pki/admin.key' private_key: '{{ role_path }}/pki/admin.key'

2
test/integration/targets/aci_config_rollback/tasks/main.yml
View file

@ -10,7 +10,7 @@
- name: ensure tenant does not exist for tests to kick off - name: ensure tenant does not exist for tests to kick off
aci_tenant: &aci_tenant_absent aci_tenant: &aci_tenant_absent
hostname: "{{ aci_hostname }}" host: "{{ aci_hostname }}"
username: "{{ aci_username }}" username: "{{ aci_username }}"
password: "{{ aci_password }}" password: "{{ aci_password }}"
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

2
test/integration/targets/aci_config_snapshot/tasks/main.yml
View file

@ -10,7 +10,7 @@
- name: create a snapshot - creation works - name: create a snapshot - creation works
aci_config_snapshot: &create_snapshot aci_config_snapshot: &create_snapshot
hostname: "{{ aci_hostname }}" host: "{{ aci_hostname }}"
username: "{{ aci_username }}" username: "{{ aci_username }}"
password: "{{ aci_password }}" password: "{{ aci_password }}"
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

2
test/integration/targets/aci_epg_to_domain/tasks/main.yml
View file

@ -34,7 +34,7 @@
- name: ensure phys domain exists for tests to kick off - name: ensure phys domain exists for tests to kick off
aci_rest: &aci_rest_phys_domain aci_rest: &aci_rest_phys_domain
hostname: "{{ aci_hostname }}" host: "{{ aci_hostname }}"
username: "{{ aci_username }}" username: "{{ aci_username }}"
password: "{{ aci_password }}" password: "{{ aci_password }}"
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

8
test/integration/targets/aci_filter/tasks/main.yml
View file

@ -11,7 +11,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Add tenant - name: Add tenant
aci_tenant: aci_tenant:
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -22,7 +22,7 @@
- name: Remove filter - name: Remove filter
aci_filter: &filter_absent aci_filter: &filter_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -35,7 +35,7 @@
# ADD FILTER # ADD FILTER
- name: Add filter (check_mode) - name: Add filter (check_mode)
aci_filter: &filter_present aci_filter: &filter_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -122,7 +122,7 @@
# QUERY ALL FILTERS # QUERY ALL FILTERS
- name: Query all filters (check_mode) - name: Query all filters (check_mode)
aci_filter: &filter_query aci_filter: &filter_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

6
test/integration/targets/aci_interface_policy_leaf_profile/tasks/main.yml
View file

@ -12,7 +12,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove leaf profile - name: Remove leaf profile
aci_interface_policy_leaf_profile: &interface_policy_leaf_profile_absent aci_interface_policy_leaf_profile: &interface_policy_leaf_profile_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -25,7 +25,7 @@
# ADD LEAF INTERFACE PROFILE # ADD LEAF INTERFACE PROFILE
- name: Add leaf interface profile (check_mode) - name: Add leaf interface profile (check_mode)
aci_interface_policy_leaf_profile: &interface_policy_leaf_profile_present aci_interface_policy_leaf_profile: &interface_policy_leaf_profile_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -109,7 +109,7 @@
# QUERY ALL LEAF INTERFACE PROFILES # QUERY ALL LEAF INTERFACE PROFILES
- name: Query all interface profiles (check_mode) - name: Query all interface profiles (check_mode)
aci_interface_policy_leaf_profile: &interface_policy_leaf_profile_query aci_interface_policy_leaf_profile: &interface_policy_leaf_profile_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

10
test/integration/targets/aci_rest/tasks/json_inline.yml
View file

@ -11,7 +11,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove tenant - name: Remove tenant
aci_rest: &tenant_absent aci_rest: &tenant_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -24,7 +24,7 @@
# ADD TENANT # ADD TENANT
- name: Add tenant (normal mode) - name: Add tenant (normal mode)
aci_rest: &tenant_present aci_rest: &tenant_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -57,7 +57,7 @@
# CHANGE TENANT # CHANGE TENANT
- name: Change description of tenant (normal mode) - name: Change description of tenant (normal mode)
aci_rest: &tenant_changed aci_rest: &tenant_changed
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -102,7 +102,7 @@
# QUERY ALL TENANTS # QUERY ALL TENANTS
- name: Query all tenants (normal mode) - name: Query all tenants (normal mode)
aci_rest: &tenant_query_all aci_rest: &tenant_query_all
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -121,7 +121,7 @@
# QUERY A TENANT # QUERY A TENANT
- name: Query our tenant - name: Query our tenant
aci_rest: &tenant_query aci_rest: &tenant_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

10
test/integration/targets/aci_rest/tasks/json_string.yml
View file

@ -11,7 +11,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove tenant - name: Remove tenant
aci_rest: &tenant_absent aci_rest: &tenant_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -23,7 +23,7 @@
# ADD TENANT # ADD TENANT
- name: Add tenant (normal mode) - name: Add tenant (normal mode)
aci_rest: &tenant_present aci_rest: &tenant_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -54,7 +54,7 @@
# CHANGE TENANT # CHANGE TENANT
- name: Change description of tenant (normal mode) - name: Change description of tenant (normal mode)
aci_rest: &tenant_changed aci_rest: &tenant_changed
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -96,7 +96,7 @@
# QUERY ALL TENANTS # QUERY ALL TENANTS
- name: Query all tenants (normal mode) - name: Query all tenants (normal mode)
aci_rest: &tenant_query_all aci_rest: &tenant_query_all
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -114,7 +114,7 @@
# QUERY A TENANT # QUERY A TENANT
- name: Query our tenant - name: Query our tenant
aci_rest: &tenant_query aci_rest: &tenant_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

10
test/integration/targets/aci_rest/tasks/xml_string.yml
View file

@ -11,7 +11,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove tenant - name: Remove tenant
aci_rest: &tenant_absent aci_rest: &tenant_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -23,7 +23,7 @@
# ADD TENANT # ADD TENANT
- name: Add tenant (normal mode) - name: Add tenant (normal mode)
aci_rest: &tenant_present aci_rest: &tenant_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -48,7 +48,7 @@
# CHANGE TENANT # CHANGE TENANT
- name: Change description of tenant (normal mode) - name: Change description of tenant (normal mode)
aci_rest: &tenant_changed aci_rest: &tenant_changed
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -83,7 +83,7 @@
# QUERY ALL TENANTS # QUERY ALL TENANTS
- name: Query all tenants (normal mode) - name: Query all tenants (normal mode)
aci_rest: &tenant_query_all aci_rest: &tenant_query_all
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -101,7 +101,7 @@
# QUERY A TENANT # QUERY A TENANT
- name: Query our tenant - name: Query our tenant
aci_rest: &tenant_query aci_rest: &tenant_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

10
test/integration/targets/aci_rest/tasks/yaml_inline.yml
View file

@ -11,7 +11,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove tenant - name: Remove tenant
aci_rest: &tenant_absent aci_rest: &tenant_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -23,7 +23,7 @@
# ADD TENANT # ADD TENANT
- name: Add tenant (normal mode) - name: Add tenant (normal mode)
aci_rest: &tenant_present aci_rest: &tenant_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -50,7 +50,7 @@
# CHANGE TENANT # CHANGE TENANT
- name: Change description of tenant (normal mode) - name: Change description of tenant (normal mode)
aci_rest: &tenant_changed aci_rest: &tenant_changed
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -88,7 +88,7 @@
# QUERY ALL TENANTS # QUERY ALL TENANTS
- name: Query all tenants (normal mode) - name: Query all tenants (normal mode)
aci_rest: &tenant_query_all aci_rest: &tenant_query_all
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -106,7 +106,7 @@
# QUERY A TENANT # QUERY A TENANT
- name: Query our tenant - name: Query our tenant
aci_rest: &tenant_query aci_rest: &tenant_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

10
test/integration/targets/aci_rest/tasks/yaml_string.yml
View file

@ -11,7 +11,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove tenant - name: Remove tenant
aci_rest: &tenant_absent aci_rest: &tenant_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -23,7 +23,7 @@
# ADD TENANT # ADD TENANT
- name: Add tenant (normal mode) - name: Add tenant (normal mode)
aci_rest: &tenant_present aci_rest: &tenant_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -50,7 +50,7 @@
# CHANGE TENANT # CHANGE TENANT
- name: Change description of tenant (normal mode) - name: Change description of tenant (normal mode)
aci_rest: &tenant_changed aci_rest: &tenant_changed
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -88,7 +88,7 @@
# QUERY ALL TENANTS # QUERY ALL TENANTS
- name: Query all tenants (normal mode) - name: Query all tenants (normal mode)
aci_rest: &tenant_query_all aci_rest: &tenant_query_all
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -106,7 +106,7 @@
# QUERY A TENANT # QUERY A TENANT
- name: Query our tenant - name: Query our tenant
aci_rest: &tenant_query aci_rest: &tenant_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

6
test/integration/targets/aci_switch_leaf_policy_profile/tasks/main.yml
View file

@ -12,7 +12,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove leaf profile - name: Remove leaf profile
aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_absent aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -25,7 +25,7 @@
# ADD LEAF PROFILE # ADD LEAF PROFILE
- name: Add switch policy leaf profile (check_mode) - name: Add switch policy leaf profile (check_mode)
aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_present aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -109,7 +109,7 @@
# QUERY ALL LEAF PROFILES # QUERY ALL LEAF PROFILES
- name: Query all profiles (check_mode) - name: Query all profiles (check_mode)
aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_query aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'

6
test/integration/targets/aci_tenant/tasks/main.yml
View file

@ -12,7 +12,7 @@
# CLEAN ENVIRONMENT # CLEAN ENVIRONMENT
- name: Remove tenant - name: Remove tenant
aci_tenant: &tenant_absent aci_tenant: &tenant_absent
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -25,7 +25,7 @@
# ADD TENANT # ADD TENANT
- name: Add tenant (check_mode) - name: Add tenant (check_mode)
aci_tenant: &tenant_present aci_tenant: &tenant_present
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'
@ -109,7 +109,7 @@
# QUERY ALL TENANTS # QUERY ALL TENANTS
- name: Query all tenants (check_mode) - name: Query all tenants (check_mode)
aci_tenant: &tenant_query aci_tenant: &tenant_query
hostname: '{{ aci_hostname }}' host: '{{ aci_hostname }}'
username: '{{ aci_username }}' username: '{{ aci_username }}'
password: '{{ aci_password }}' password: '{{ aci_password }}'
validate_certs: '{{ aci_validate_certs | default(false) }}' validate_certs: '{{ aci_validate_certs | default(false) }}'