diff options
| author | Kevin Breit <kevin.breit@kevinbreit.net> | 2018-07-09 11:10:27 +0200 |
|---|---|---|
| committer | Dag Wieers <dag@wieers.com> | 2018-07-09 11:10:27 +0200 |
| commit | 9036f846a3972a16d453496ef88bb6461097147e (patch) | |
| tree | f67b3f7ebb711fb65887fafe7947a73148374bdc /test/integration/targets | |
| parent | Allow module to claim devices into an organization (#42448) (diff) | |
| download | ansible-9036f846a3972a16d453496ef88bb6461097147e.tar.xz ansible-9036f846a3972a16d453496ef88bb6461097147e.zip | |
meraki - Enabled support for configuration template configuration (#42392)
* Enabled support for configuration template configuration
- get_nets() now pulls down templates and networks
- A few changes in VLAN and network to operate as a POC
* Ansibot changes
- Fix undefined variable
- Document net_id in meraki_vlan
* Fix indentation
Diffstat (limited to 'test/integration/targets')
| -rw-r--r-- | test/integration/targets/meraki_network/tasks/main.yml | 10 | ||||
| -rw-r--r-- | test/integration/targets/meraki_vlan/tasks/main.yml | 31 |
2 files changed, 41 insertions, 0 deletions
diff --git a/test/integration/targets/meraki_network/tasks/main.yml b/test/integration/targets/meraki_network/tasks/main.yml index 942302a6eb..0ece172e13 100644 --- a/test/integration/targets/meraki_network/tasks/main.yml +++ b/test/integration/targets/meraki_network/tasks/main.yml @@ -169,6 +169,15 @@ delegate_to: localhost register: net_query_all + - name: Query a configuration template + meraki_network: + auth_key: '{{auth_key}}' + state: query + org_name: '{{test_org_name}}' + net_name: '{{test_template_name}}' + delegate_to: localhost + register: query_config_template + - name: Query one network meraki_network: auth_key: '{{ auth_key }}' @@ -182,6 +191,7 @@ assert: that: - 'net_query_one.data.name == "IntTestNetworkSwitch"' + - 'query_config_template.data.name == "DevConfigTemplate"' ############################################################################# diff --git a/test/integration/targets/meraki_vlan/tasks/main.yml b/test/integration/targets/meraki_vlan/tasks/main.yml index 1edad71b19..bd082b5cdf 100644 --- a/test/integration/targets/meraki_vlan/tasks/main.yml +++ b/test/integration/targets/meraki_vlan/tasks/main.yml @@ -66,6 +66,24 @@ - create_vlan.data.id == 2 - create_vlan.changed == True + - name: Create VLAN in template configuration + meraki_vlan: + auth_key: '{{auth_key}}' + state: present + org_name: '{{test_org_name}}' + net_name: '{{test_template_name}}' + vlan_id: 2 + name: TestVLAN + subnet: 192.168.250.0/24 + appliance_ip: 192.168.250.1 + delegate_to: localhost + register: create_vlan_template + + - assert: + that: + - create_vlan_template.data.id == 2 + - create_vlan_template.changed == True + - name: Update VLAN meraki_vlan: auth_key: '{{auth_key}}' @@ -305,3 +323,16 @@ - debug: msg: '{{delete_vlan}}' + + - name: Delete VLAN using template ID + meraki_vlan: + auth_key: '{{auth_key}}' + state: absent + org_name: '{{test_org_name}}' + net_id: '{{test_template_id}}' + vlan_id: 2 + delegate_to: localhost + register: delete_vlan_template + + - debug: + msg: '{{delete_vlan_template}}' |