Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix conflict nxos tests #35078

Merged
merged 1 commit into from
Jan 19, 2018
Merged

fix conflict nxos tests #35078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions test/integration/targets/nxos_bgp/tests/common/dis_policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
6 changes: 2 additions & 4 deletions test/integration/targets/nxos_bgp/tests/common/hels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
6 changes: 2 additions & 4 deletions test/integration/targets/nxos_bgp/tests/common/isolate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
6 changes: 2 additions & 4 deletions test/integration/targets/nxos_bgp/tests/common/param.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
6 changes: 2 additions & 4 deletions test/integration/targets/nxos_bgp/tests/common/supp_fib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
4 changes: 1 addition & 3 deletions test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down