Skip to content

Commit 901068c

Browse files
Issue 20728: Enhance configlet/test_add_rack.py for ipv6-only topos
Currently, the test checks for both ipv4 and ipv6 neighbors unconditionally, and will fail if either is missing. Change that behavior to instead check to see if neighbors exist before running the bgp checks. Add a failure case if no neighbors are found in either AF. This way the test is AF-agnostic.
1 parent 7294362 commit 901068c

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

tests/configlet/util/base_test.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,12 @@ def apply_clet(duthost, skip_test=False):
204204
"DB compare failed after apply-clet"
205205

206206
# Ensure BGP session is up
207-
chk_bgp_session(duthost, tor_data["ip"]["remote"], "post-clet test")
208-
chk_bgp_session(duthost, tor_data["ipv6"]["remote"].lower(), "post-clet test")
207+
if len(tor_data.get("ip", []).get("remote", [])):
208+
chk_bgp_session(duthost, tor_data["ip"]["remote"], "post-clet test")
209+
elif len(tor_data.get("ipv6", []).get("remote", [])):
210+
chk_bgp_session(duthost, tor_data["ipv6"]["remote"].lower(), "post-clet test")
211+
else:
212+
report_error("No neighbors detected")
209213

210214
log_info("AddRack by template succeeded")
211215

@@ -265,8 +269,12 @@ def do_test_add_rack(duthost, is_storage_backend=False, skip_load=False,
265269
is_storage_backend=is_storage_backend)
266270

267271
# Ensure BGP session is up before we apply stripped minigraph
268-
chk_bgp_session(duthost, tor_data["ip"]["remote"], "pre-clet test")
269-
chk_bgp_session(duthost, tor_data["ipv6"]["remote"].lower(), "pre-clet test")
272+
if len(tor_data.get("ip", []).get("remote", [])):
273+
chk_bgp_session(duthost, tor_data["ip"]["remote"], "pre-clet test")
274+
elif len(tor_data.get("ipv6", []).get("remote", [])):
275+
chk_bgp_session(duthost, tor_data["ipv6"]["remote"].lower(), "pre-clet test")
276+
else:
277+
report_error("No neighbors detected")
270278

271279
set_log_prefix_msg("test prepare")
272280
prepare_for_test(duthost)

tests/configlet/util/generic_patch.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,12 @@ def generic_patch_add_t0(duthost, skip_load=False, hack_apply=False):
171171
"DB compare failed after adding T0 via generic patch updater"
172172

173173
# Ensure BGP session is up
174-
chk_bgp_session(duthost, tor_data["ip"]["remote"], "post-patch-add test")
175-
chk_bgp_session(duthost, tor_data["ipv6"]["remote"].lower(), "post-patch-add test")
174+
if len(tor_data.get("ip", []).get("remote", [])):
175+
chk_bgp_session(duthost, tor_data["ip"]["remote"], "post-patch-add test")
176+
elif len(tor_data.get("ipv6", []).get("remote", [])):
177+
chk_bgp_session(duthost, tor_data["ipv6"]["remote"].lower(), "post-patch-add test")
178+
else:
179+
report_error("No neighbors detected")
176180

177181

178182
def generic_patch_rm_t0(duthost, skip_load=False, hack_apply=False):

0 commit comments

Comments
 (0)