From 128ee6f48fa8ed53783a15fa487b47abc61f17f0 Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Fri, 19 Jan 2018 10:53:05 +0530 Subject: [PATCH] fix conflict nxos tests (#35078) Signed-off-by: Trishna Guha --- .../targets/nxos_bgp/tests/common/dis_policy.yaml | 6 ++---- test/integration/targets/nxos_bgp/tests/common/hels.yaml | 6 ++---- test/integration/targets/nxos_bgp/tests/common/isolate.yaml | 6 ++---- test/integration/targets/nxos_bgp/tests/common/param.yaml | 6 ++---- .../integration/targets/nxos_bgp/tests/common/supp_fib.yaml | 6 ++---- .../targets/nxos_vxlan_vtep/tests/common/sanity.yaml | 4 +--- 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"