summaryrefslogtreecommitdiff
path: root/test/integration/targets/junos_interface
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2017-11-27 16:58:08 -0600
committeransibot <ansibot@users.noreply.github.com>2017-11-27 17:58:08 -0500
commit4fe08441be093a9cbe968e00606e03e33605207c (patch)
treef41c0383cdd50e08e2744468e54a7a9bb15035f9 /test/integration/targets/junos_interface
parentfd4a6cf7ad7012a07b29096f5c70f34499af1216 (diff)
downloadansible-4fe08441be093a9cbe968e00606e03e33605207c.tar.gz
Deprecate tests used as filters (#32361)
* Warn on tests used as filters * Update docs, add aliases for tests that fit more gramatically with test syntax * Fix rst formatting * Add successful filter, alias of success * Remove renamed_deprecation, it was overkill * Make directory alias for is_dir * Update tests to use proper jinja test syntax * Update additional documentation, living outside of YAML files, to reflect proper jinja test syntax * Add conversion script, porting guide updates, and changelog updates * Update newly added uses of tests as filters * No underscore variable * Convert recent tests as filter changes to win_stat * Fix some changes related to rebasing a few integration tests * Make tests_as_filters_warning explicitly accept the name of the test, instead of inferring the name * Add test for tests_as_filters_warning * Update tests as filters in newly added/modified tests * Address recent changes to several integration tests * Address recent changes in cs_vpc
Diffstat (limited to 'test/integration/targets/junos_interface')
-rw-r--r--test/integration/targets/junos_interface/tests/netconf/basic.yaml52
-rw-r--r--test/integration/targets/junos_interface/tests/netconf/intent.yaml8
2 files changed, 30 insertions, 30 deletions
diff --git a/test/integration/targets/junos_interface/tests/netconf/basic.yaml b/test/integration/targets/junos_interface/tests/netconf/basic.yaml
index 23b53e2f1e..a8cd0a5a53 100644
--- a/test/integration/targets/junos_interface/tests/netconf/basic.yaml
+++ b/test/integration/targets/junos_interface/tests/netconf/basic.yaml
@@ -118,7 +118,7 @@
- assert:
that:
- "result.changed == true"
- - result.diff.prepared | search("\+ *disable")
+ - result.diff.prepared is search("\+ *disable")
- name: Enable interface
junos_interface:
@@ -131,7 +131,7 @@
- assert:
that:
- "result.changed == true"
- - result.diff.prepared | search("\- *disable")
+ - result.diff.prepared is search("\- *disable")
- name: Delete interface
junos_interface:
@@ -178,15 +178,15 @@
- assert:
that:
- 'result.changed == true'
- - result.diff.prepared | search("\+ *ge-0/0/1")
- - result.diff.prepared | search("\+ *description test-interface-1")
- - result.diff.prepared | search("\+ *speed 1g")
- - result.diff.prepared | search("\+ *mtu 512")
- - result.diff.prepared | search("\+ *link-mode full-duplex")
- - result.diff.prepared | search("\+ *description test-interface-2")
- - result.diff.prepared | search("\+ *speed 10m")
- - result.diff.prepared | search("\+ * mtu 256")
- - result.diff.prepared | search("\+ *link-mode full-duplex")
+ - result.diff.prepared is search("\+ *ge-0/0/1")
+ - result.diff.prepared is search("\+ *description test-interface-1")
+ - result.diff.prepared is search("\+ *speed 1g")
+ - result.diff.prepared is search("\+ *mtu 512")
+ - result.diff.prepared is search("\+ *link-mode full-duplex")
+ - result.diff.prepared is search("\+ *description test-interface-2")
+ - result.diff.prepared is search("\+ *speed 10m")
+ - result.diff.prepared is search("\+ * mtu 256")
+ - result.diff.prepared is search("\+ *link-mode full-duplex")
- name: Set interface on aggregate (idempotent)
junos_interface:
@@ -213,7 +213,7 @@
- assert:
that:
- 'result.changed == true'
- - result.diff.prepared | search("\+ *disable")
+ - result.diff.prepared is search("\+ *disable")
- name: Enable interface on aggregate
junos_interface:
@@ -227,7 +227,7 @@
- assert:
that:
- 'result.changed == true'
- - result.diff.prepared | search("\- *disable")
+ - result.diff.prepared is search("\- *disable")
- name: Deactivate interface configuration on aggregate
junos_interface:
@@ -242,8 +242,8 @@
- assert:
that:
- 'result.changed == true'
- - result.diff.prepared | search("! *inactive[:] ge-0/0/1")
- - result.diff.prepared | search("! *inactive[:] ge-0/0/2")
+ - result.diff.prepared is search("! *inactive[:] ge-0/0/1")
+ - result.diff.prepared is search("! *inactive[:] ge-0/0/2")
- name: Activate interface configuration on aggregate
junos_interface:
@@ -258,8 +258,8 @@
- assert:
that:
- 'result.changed == true'
- - result.diff.prepared | search("! *active[:] ge-0/0/1")
- - result.diff.prepared | search("! *active[:] ge-0/0/2")
+ - result.diff.prepared is search("! *active[:] ge-0/0/1")
+ - result.diff.prepared is search("! *active[:] ge-0/0/2")
- name: Delete interface on aggregate
junos_interface:
@@ -273,15 +273,15 @@
- assert:
that:
- 'result.changed == true'
- - result.diff.prepared | search("\- *ge-0/0/1")
- - result.diff.prepared | search("\- *description test-interface-1")
- - result.diff.prepared | search("\- *speed 1g")
- - result.diff.prepared | search("\- *mtu 512")
- - result.diff.prepared | search("\- *link-mode full-duplex")
- - result.diff.prepared | search("\- *description test-interface-2")
- - result.diff.prepared | search("\- *speed 10m")
- - result.diff.prepared | search("\- * mtu 256")
- - result.diff.prepared | search("\- *link-mode full-duplex")
+ - result.diff.prepared is search("\- *ge-0/0/1")
+ - result.diff.prepared is search("\- *description test-interface-1")
+ - result.diff.prepared is search("\- *speed 1g")
+ - result.diff.prepared is search("\- *mtu 512")
+ - result.diff.prepared is search("\- *link-mode full-duplex")
+ - result.diff.prepared is search("\- *description test-interface-2")
+ - result.diff.prepared is search("\- *speed 10m")
+ - result.diff.prepared is search("\- * mtu 256")
+ - result.diff.prepared is search("\- *link-mode full-duplex")
- name: Delete interface on aggregate (idempotent)
junos_interface:
diff --git a/test/integration/targets/junos_interface/tests/netconf/intent.yaml b/test/integration/targets/junos_interface/tests/netconf/intent.yaml
index e41df9c358..b99f72ce21 100644
--- a/test/integration/targets/junos_interface/tests/netconf/intent.yaml
+++ b/test/integration/targets/junos_interface/tests/netconf/intent.yaml
@@ -10,17 +10,17 @@
- name: Define interface name for vSRX
set_fact:
intf_name: pp0
- when: result['ansible_facts']['ansible_net_model'] | search("vSRX*")
+ when: result['ansible_facts']['ansible_net_model'] is search("vSRX*")
- name: Define interface name for vsrx
set_fact:
intf_name: pp0
- when: result['ansible_facts']['ansible_net_model'] | search("vsrx")
+ when: result['ansible_facts']['ansible_net_model'] is search("vsrx")
- name: Define interface name for vQFX
set_fact:
intf_name: gr-0/0/0
- when: result['ansible_facts']['ansible_net_model'] | search("vqfx*")
+ when: result['ansible_facts']['ansible_net_model'] is search("vqfx*")
- name: Check intent arguments
junos_interface:
@@ -63,7 +63,7 @@
- assert:
that:
- "result.failed == false"
- - result.diff.prepared | search("\+ *disable")
+ - result.diff.prepared is search("\+ *disable")
- name: Config + intent (fail)
junos_interface: