wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed when condition from checking image version to checking keys being (#45943)

Browse source 
defined
This commit is contained in:
tstoner 2018-09-21 07:06:37 -04:00 committed by Trishna Guha
parent a9680ee3ef
commit 216da1c475
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/integration/targets/nxos_nxapi/tasks/platform/default/assert_changes_http.yaml
View file

@ -5,7 +5,7 @@
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'].l_port
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'].l_port|string is search("80")
- result.stdout[0]['operation_status'].o_status == 'nxapi enabled'
when: major_version is version('9.2', '<')
when: result.stdout[0].TABLE_listen_on_port is defined
- name: Assert HTTP configuration changes 9.2 or greater
assert:
@ -13,4 +13,4 @@
- result.stdout[0]['http_port']
- result.stdout[0]['http_port']|string is search("80")
- result.stdout[0]['nxapi_status'] == 'nxapi enabled'
when: major_version is version('9.2', '>=')
when: result.stdout[0].http_port is defined

4
test/integration/targets/nxos_nxapi/tasks/platform/default/assert_changes_https.yaml
View file

@ -5,7 +5,7 @@
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'].l_port
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'].l_port|string is search("9443")
- result.stdout[0]['operation_status'].o_status == 'nxapi enabled'
when: major_version is version('9.2', '<')
when: result.stdout[0].TABLE_listen_on_port is defined
- name: Assert HTTPS configuration changes 9.2 or greater
assert:
@ -13,4 +13,4 @@
- result.stdout[0]['https_port']
- result.stdout[0]['https_port']|string is search("9443")
- result.stdout[0]['nxapi_status'] == 'nxapi enabled'
when: major_version is version('9.2', '>=')
when: result.stdout[0].https_port is defined

4
test/integration/targets/nxos_nxapi/tasks/platform/default/assert_changes_https_http.yaml
View file

@ -7,7 +7,7 @@
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'][0].l_port
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'][0].l_port|string is search("80")
- result.stdout[0]['operation_status'].o_status == 'nxapi enabled'
when: major_version is version('9.2', '<')
when: result.stdout[0].TABLE_listen_on_port is defined
- name: Assert HTTPS & HTTP configuration changes 9.2 or greater
assert:
@ -17,4 +17,4 @@
- result.stdout[0]['http_port']
- result.stdout[0]['http_port']|string is search("80")
- result.stdout[0]['nxapi_status'] == 'nxapi enabled'
when: major_version is version('9.2', '>=')
when: result.stdout[0].https_port is defined or result.stdout[0].http_port is defined

4
test/integration/targets/nxos_nxapi/tasks/platform/default/assert_changes_https_http_ports.yaml
View file

@ -7,7 +7,7 @@
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'][0].l_port
- result.stdout[0]['TABLE_listen_on_port']['ROW_listen_on_port'][0].l_port|string is search("99")
- result.stdout[0]['operation_status'].o_status == 'nxapi enabled'
when: major_version is version('9.2', '<')
when: result.stdout[0].TABLE_listen_on_port is defined
- name: Assert HTTPS & HTTP configuration changes 9.2 or greater
assert:
@ -17,4 +17,4 @@
- result.stdout[0]['http_port']
- result.stdout[0]['http_port']|string is search("99")
- result.stdout[0]['nxapi_status'] == 'nxapi enabled'
when: major_version is version('9.2', '>=')
when: result.stdout[0].https_port is defined or result.stdout[0].http_port is defined