From 4006b5d18f076fbcf7bad3945fb7a75f322a5415 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 12 Jul 2017 09:25:26 +0200 Subject: [PATCH] Replace Ethernet5 for Ethernet2 on eos integration tests (#26674) In our CI, we only have 3 NICS: Management1, Ethernet1 and Ethernet2. --- test/integration/targets/eos_config/config.txt | 10 ---------- .../targets/eos_config/templates/basic/config.j2 | 2 +- .../integration/targets/eos_config/templates/config.js | 2 +- .../targets/eos_config/templates/defaults/config.j2 | 2 +- .../targets/eos_config/templates/defaults/test.j2 | 2 +- .../targets/eos_config/tests/cli/backup.yaml | 2 +- .../targets/eos_config/tests/cli/defaults.yaml | 2 +- .../integration/targets/eos_config/tests/cli/save.yaml | 2 +- .../targets/eos_config/tests/cli/src_basic.yaml | 2 +- .../targets/eos_config/tests/cli/src_match_none.yaml | 2 +- .../targets/eos_config/tests/eapi/backup.yaml | 2 +- .../targets/eos_config/tests/eapi/defaults.yaml | 2 +- .../targets/eos_config/tests/eapi/save.yaml | 2 +- .../targets/eos_config/tests/eapi/src_basic.yaml | 2 +- .../targets/eos_config/tests/eapi/src_match_none.yaml | 2 +- .../targets/eos_template/templates/basic/config.j2 | 2 +- .../targets/eos_template/templates/config.js | 2 +- .../targets/eos_template/templates/defaults/config.j2 | 2 +- .../targets/eos_template/templates/defaults/test.j2 | 2 +- .../targets/eos_template/tests/cli/backup.yaml | 2 +- .../targets/eos_template/tests/cli/basic.yaml | 2 +- .../targets/eos_template/tests/cli/defaults.yaml | 2 +- .../targets/eos_template/tests/cli/force.yaml | 2 +- .../targets/eos_template/tests/eapi/backup.yaml | 2 +- .../targets/eos_template/tests/eapi/basic.yaml | 2 +- .../targets/eos_template/tests/eapi/defaults.yaml | 2 +- .../targets/eos_template/tests/eapi/force.yaml | 2 +- 27 files changed, 26 insertions(+), 36 deletions(-) diff --git a/test/integration/targets/eos_config/config.txt b/test/integration/targets/eos_config/config.txt index e9c84cd14b..fba5bde0e0 100644 --- a/test/integration/targets/eos_config/config.txt +++ b/test/integration/targets/eos_config/config.txt @@ -13,16 +13,6 @@ interface Ethernet1 ! interface Ethernet2 ! -interface Ethernet3 -! -interface Ethernet4 -! -interface Ethernet5 -! -interface Ethernet6 -! -interface Ethernet7 -! ! no ip routing ! diff --git a/test/integration/targets/eos_config/templates/basic/config.j2 b/test/integration/targets/eos_config/templates/basic/config.j2 index f6a410eece..82a61b62df 100644 --- a/test/integration/targets/eos_config/templates/basic/config.j2 +++ b/test/integration/targets/eos_config/templates/basic/config.j2 @@ -1,4 +1,4 @@ -interface Ethernet5 +interface Ethernet2 description this is a test shutdown diff --git a/test/integration/targets/eos_config/templates/config.js b/test/integration/targets/eos_config/templates/config.js index 931baf48e4..865b0545ad 100644 --- a/test/integration/targets/eos_config/templates/config.js +++ b/test/integration/targets/eos_config/templates/config.js @@ -1,4 +1,4 @@ -interface Ethernet5 +interface Ethernet2 description test description from ansible shutdown diff --git a/test/integration/targets/eos_config/templates/defaults/config.j2 b/test/integration/targets/eos_config/templates/defaults/config.j2 index aec2515cb9..8ff8f305c0 100644 --- a/test/integration/targets/eos_config/templates/defaults/config.j2 +++ b/test/integration/targets/eos_config/templates/defaults/config.j2 @@ -1,3 +1,3 @@ -interface Ethernet5 +interface Ethernet2 description this is a test no shutdown diff --git a/test/integration/targets/eos_config/templates/defaults/test.j2 b/test/integration/targets/eos_config/templates/defaults/test.j2 index f6a410eece..82a61b62df 100644 --- a/test/integration/targets/eos_config/templates/defaults/test.j2 +++ b/test/integration/targets/eos_config/templates/defaults/test.j2 @@ -1,4 +1,4 @@ -interface Ethernet5 +interface Ethernet2 description this is a test shutdown diff --git a/test/integration/targets/eos_config/tests/cli/backup.yaml b/test/integration/targets/eos_config/tests/cli/backup.yaml index f836b553ab..47ff0f5259 100644 --- a/test/integration/targets/eos_config/tests/cli/backup.yaml +++ b/test/integration/targets/eos_config/tests/cli/backup.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_config/tests/cli/defaults.yaml b/test/integration/targets/eos_config/tests/cli/defaults.yaml index f2880a8cb1..c80556c8d3 100644 --- a/test/integration/targets/eos_config/tests/cli/defaults.yaml +++ b/test/integration/targets/eos_config/tests/cli/defaults.yaml @@ -7,7 +7,7 @@ - no description - shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_config/tests/cli/save.yaml b/test/integration/targets/eos_config/tests/cli/save.yaml index b6e6ce6938..0e8c7b4218 100644 --- a/test/integration/targets/eos_config/tests/cli/save.yaml +++ b/test/integration/targets/eos_config/tests/cli/save.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_config/tests/cli/src_basic.yaml b/test/integration/targets/eos_config/tests/cli/src_basic.yaml index 3ab9f4f8d2..6ab4e252cd 100644 --- a/test/integration/targets/eos_config/tests/cli/src_basic.yaml +++ b/test/integration/targets/eos_config/tests/cli/src_basic.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_config/tests/cli/src_match_none.yaml b/test/integration/targets/eos_config/tests/cli/src_match_none.yaml index b3ffff9eac..fe67c5beb0 100644 --- a/test/integration/targets/eos_config/tests/cli/src_match_none.yaml +++ b/test/integration/targets/eos_config/tests/cli/src_match_none.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_config/tests/eapi/backup.yaml b/test/integration/targets/eos_config/tests/eapi/backup.yaml index cc09511863..0ac02c288e 100644 --- a/test/integration/targets/eos_config/tests/eapi/backup.yaml +++ b/test/integration/targets/eos_config/tests/eapi/backup.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_config/tests/eapi/defaults.yaml b/test/integration/targets/eos_config/tests/eapi/defaults.yaml index 41e5586f1d..2e295e1d09 100644 --- a/test/integration/targets/eos_config/tests/eapi/defaults.yaml +++ b/test/integration/targets/eos_config/tests/eapi/defaults.yaml @@ -7,7 +7,7 @@ - no description - shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_config/tests/eapi/save.yaml b/test/integration/targets/eos_config/tests/eapi/save.yaml index 1cbd4f8026..4bc43fc11e 100644 --- a/test/integration/targets/eos_config/tests/eapi/save.yaml +++ b/test/integration/targets/eos_config/tests/eapi/save.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_config/tests/eapi/src_basic.yaml b/test/integration/targets/eos_config/tests/eapi/src_basic.yaml index 09918936e8..f5d0b0404d 100644 --- a/test/integration/targets/eos_config/tests/eapi/src_basic.yaml +++ b/test/integration/targets/eos_config/tests/eapi/src_basic.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_config/tests/eapi/src_match_none.yaml b/test/integration/targets/eos_config/tests/eapi/src_match_none.yaml index febcc5104c..6535c66026 100644 --- a/test/integration/targets/eos_config/tests/eapi/src_match_none.yaml +++ b/test/integration/targets/eos_config/tests/eapi/src_match_none.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_template/templates/basic/config.j2 b/test/integration/targets/eos_template/templates/basic/config.j2 index f6a410eece..82a61b62df 100644 --- a/test/integration/targets/eos_template/templates/basic/config.j2 +++ b/test/integration/targets/eos_template/templates/basic/config.j2 @@ -1,4 +1,4 @@ -interface Ethernet5 +interface Ethernet2 description this is a test shutdown diff --git a/test/integration/targets/eos_template/templates/config.js b/test/integration/targets/eos_template/templates/config.js index 931baf48e4..865b0545ad 100644 --- a/test/integration/targets/eos_template/templates/config.js +++ b/test/integration/targets/eos_template/templates/config.js @@ -1,4 +1,4 @@ -interface Ethernet5 +interface Ethernet2 description test description from ansible shutdown diff --git a/test/integration/targets/eos_template/templates/defaults/config.j2 b/test/integration/targets/eos_template/templates/defaults/config.j2 index aec2515cb9..8ff8f305c0 100644 --- a/test/integration/targets/eos_template/templates/defaults/config.j2 +++ b/test/integration/targets/eos_template/templates/defaults/config.j2 @@ -1,3 +1,3 @@ -interface Ethernet5 +interface Ethernet2 description this is a test no shutdown diff --git a/test/integration/targets/eos_template/templates/defaults/test.j2 b/test/integration/targets/eos_template/templates/defaults/test.j2 index f6a410eece..82a61b62df 100644 --- a/test/integration/targets/eos_template/templates/defaults/test.j2 +++ b/test/integration/targets/eos_template/templates/defaults/test.j2 @@ -1,4 +1,4 @@ -interface Ethernet5 +interface Ethernet2 description this is a test shutdown diff --git a/test/integration/targets/eos_template/tests/cli/backup.yaml b/test/integration/targets/eos_template/tests/cli/backup.yaml index 5088f9ede2..261e5004c6 100644 --- a/test/integration/targets/eos_template/tests/cli/backup.yaml +++ b/test/integration/targets/eos_template/tests/cli/backup.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_template/tests/cli/basic.yaml b/test/integration/targets/eos_template/tests/cli/basic.yaml index c698928b41..c98dc1414b 100644 --- a/test/integration/targets/eos_template/tests/cli/basic.yaml +++ b/test/integration/targets/eos_template/tests/cli/basic.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_template/tests/cli/defaults.yaml b/test/integration/targets/eos_template/tests/cli/defaults.yaml index 9eb6423138..d3354b2c32 100644 --- a/test/integration/targets/eos_template/tests/cli/defaults.yaml +++ b/test/integration/targets/eos_template/tests/cli/defaults.yaml @@ -7,7 +7,7 @@ - no description - shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_template/tests/cli/force.yaml b/test/integration/targets/eos_template/tests/cli/force.yaml index 9a929a83fa..ad8f660c52 100644 --- a/test/integration/targets/eos_template/tests/cli/force.yaml +++ b/test/integration/targets/eos_template/tests/cli/force.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ cli }}" diff --git a/test/integration/targets/eos_template/tests/eapi/backup.yaml b/test/integration/targets/eos_template/tests/eapi/backup.yaml index 4b510801d4..576dfe0d92 100644 --- a/test/integration/targets/eos_template/tests/eapi/backup.yaml +++ b/test/integration/targets/eos_template/tests/eapi/backup.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_template/tests/eapi/basic.yaml b/test/integration/targets/eos_template/tests/eapi/basic.yaml index 22d1085581..139e7ce2ee 100644 --- a/test/integration/targets/eos_template/tests/eapi/basic.yaml +++ b/test/integration/targets/eos_template/tests/eapi/basic.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_template/tests/eapi/defaults.yaml b/test/integration/targets/eos_template/tests/eapi/defaults.yaml index 74e423299c..43bf6b8c95 100644 --- a/test/integration/targets/eos_template/tests/eapi/defaults.yaml +++ b/test/integration/targets/eos_template/tests/eapi/defaults.yaml @@ -7,7 +7,7 @@ - no description - shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}" diff --git a/test/integration/targets/eos_template/tests/eapi/force.yaml b/test/integration/targets/eos_template/tests/eapi/force.yaml index de2c051137..b97eb938a0 100644 --- a/test/integration/targets/eos_template/tests/eapi/force.yaml +++ b/test/integration/targets/eos_template/tests/eapi/force.yaml @@ -7,7 +7,7 @@ - no description - no shutdown parents: - - interface Ethernet5 + - interface Ethernet2 match: none provider: "{{ eapi }}"