summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorTrishna Guha <trishnaguha17@gmail.com>2018-01-19 10:53:05 +0530
committerToshio Kuratomi <a.badger@gmail.com>2018-01-31 17:31:51 -0800
commit128ee6f48fa8ed53783a15fa487b47abc61f17f0 (patch)
treeb0dfe9a52d8d273a9d014e9ee5cef048b68d572e /test/integration
parentd16b5c23c9d8daf79750b26af5e6bb01ea0025a9 (diff)
downloadansible-128ee6f48fa8ed53783a15fa487b47abc61f17f0.tar.gz
fix conflict nxos tests (#35078)
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/targets/nxos_bgp/tests/common/dis_policy.yaml6
-rw-r--r--test/integration/targets/nxos_bgp/tests/common/hels.yaml6
-rw-r--r--test/integration/targets/nxos_bgp/tests/common/isolate.yaml6
-rw-r--r--test/integration/targets/nxos_bgp/tests/common/param.yaml6
-rw-r--r--test/integration/targets/nxos_bgp/tests/common/supp_fib.yaml6
-rw-r--r--test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml4
6 files changed, 11 insertions, 23 deletions
diff --git a/test/integration/targets/nxos_bgp/tests/common/dis_policy.yaml b/test/integration/targets/nxos_bgp/tests/common/dis_policy.yaml
index 367289d1b4..7647c9dcbe 100644
--- a/test/integration/targets/nxos_bgp/tests/common/dis_policy.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/dis_policy.yaml
@@ -1,7 +1,5 @@
---
-- debug: msg="START connection={{ ansible_connection }} nxos_bgp parameter test"
-- debug: msg="Using provider={{ connection.transport }}"
- when: ansible_connection == "local"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
- name: "Disable feature BGP"
nxos_feature:
@@ -69,4 +67,4 @@
provider: "{{ connection }}"
ignore_errors: yes
- - debug: msg="END connection={{ ansible_connection }} nxos_bgp parameter test"
+ - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
diff --git a/test/integration/targets/nxos_bgp/tests/common/hels.yaml b/test/integration/targets/nxos_bgp/tests/common/hels.yaml
index 7417a5132e..e3be7ecd67 100644
--- a/test/integration/targets/nxos_bgp/tests/common/hels.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/hels.yaml
@@ -1,7 +1,5 @@
---
-- debug: msg="START connection={{ ansible_connection }} nxos_bgp parameter test"
-- debug: msg="Using provider={{ connection.transport }}"
- when: ansible_connection == "local"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
- name: "Disable feature BGP"
nxos_feature:
@@ -82,4 +80,4 @@
provider: "{{ connection }}"
ignore_errors: yes
- - debug: msg="END connection={{ ansible_connection }} nxos_bgp parameter test"
+ - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
diff --git a/test/integration/targets/nxos_bgp/tests/common/isolate.yaml b/test/integration/targets/nxos_bgp/tests/common/isolate.yaml
index 8afd8a1d1c..624915c778 100644
--- a/test/integration/targets/nxos_bgp/tests/common/isolate.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/isolate.yaml
@@ -1,7 +1,5 @@
---
-- debug: msg="START connection={{ ansible_connection }} nxos_bgp parameter test"
-- debug: msg="Using provider={{ connection.transport }}"
- when: ansible_connection == "local"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
- name: "Disable feature BGP"
nxos_feature:
@@ -65,4 +63,4 @@
provider: "{{ connection }}"
ignore_errors: yes
- - debug: msg="END connection={{ ansible_connection }} nxos_bgp parameter test"
+ - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
diff --git a/test/integration/targets/nxos_bgp/tests/common/param.yaml b/test/integration/targets/nxos_bgp/tests/common/param.yaml
index 5ea70bf6a6..b716075c1e 100644
--- a/test/integration/targets/nxos_bgp/tests/common/param.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/param.yaml
@@ -1,7 +1,5 @@
---
-- debug: msg="START connection={{ ansible_connection }} nxos_bgp parameter test"
-- debug: msg="Using provider={{ connection.transport }}"
- when: ansible_connection == "local"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
- name: "Disable feature BGP"
nxos_feature:
@@ -273,4 +271,4 @@
provider: "{{ connection }}"
ignore_errors: yes
- - debug: msg="END connection={{ ansible_connection }} nxos_bgp parameter test"
+ - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
diff --git a/test/integration/targets/nxos_bgp/tests/common/supp_fib.yaml b/test/integration/targets/nxos_bgp/tests/common/supp_fib.yaml
index 46ab3e3bde..b4431c542d 100644
--- a/test/integration/targets/nxos_bgp/tests/common/supp_fib.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/supp_fib.yaml
@@ -1,7 +1,5 @@
---
-- debug: msg="START connection={{ ansible_connection }} nxos_bgp parameter test"
-- debug: msg="Using provider={{ connection.transport }}"
- when: ansible_connection == "local"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
- name: "Disable feature BGP"
nxos_feature:
@@ -103,4 +101,4 @@
provider: "{{ connection }}"
ignore_errors: yes
- - debug: msg="END connection={{ ansible_connection }} nxos_bgp parameter test"
+ - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_bgp parameter test"
diff --git a/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml b/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml
index 722fe425ed..19a770e026 100644
--- a/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml
+++ b/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml
@@ -1,7 +1,5 @@
---
-- debug: msg="START connection={{ ansible_connection }} nxos_vxlan_vtep sanity test"
-- debug: msg="Using provider={{ connection.transport }}"
- when: ansible_connection == "local"
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_vxlan_vtep sanity test"
- block:
- name: "Apply N7K specific setup config"