Skip to content

[bgp] Fix overwrite in bgp conftest #7389

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

Merged
yaqiangz merged 1 commit into from
Feb 7, 2023
Merged

[bgp] Fix overwrite in bgp conftest #7389

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tests/bgp/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,24 +378,24 @@ def _setup_interfaces_t1_or_t2(mg_facts, peer_count):

for intf, subnet in zip(random.sample(ipv4_interfaces + ipv4_lag_interfaces + vlan_sub_interfaces,
peer_count), subnets):
def _get_namespace(minigraph_config, intf):
namespace = DEFAULT_NAMESPACE
if intf in minigraph_config and 'namespace' in minigraph_config[intf] and \
minigraph_config[intf]['namespace']:
namespace = minigraph_config[intf]['namespace']
return namespace
conn = {}
local_addr, neighbor_addr = [_ for _ in subnet][:2]
conn["local_intf"] = "%s" % intf
conn["local_addr"] = "%s/%s" % (local_addr, subnet_prefixlen)
conn["neighbor_addr"] = "%s/%s" % (neighbor_addr, subnet_prefixlen)
conn["loopback_ip"] = loopback_ip

if intf in mg_facts['minigraph_neighbors'] and \
'namespace' in mg_facts['minigraph_neighbors'][intf] and \
mg_facts['minigraph_neighbors'][intf]['namespace']:
conn["namespace"] = mg_facts['minigraph_neighbors'][intf]['namespace']
else:
conn["namespace"] = DEFAULT_NAMESPACE
conn["namespace"] = _get_namespace(mg_facts['minigraph_neighbors'], intf)

if intf.startswith("PortChannel"):
member_intf = mg_facts["minigraph_portchannels"][intf]["members"][0]
conn["neighbor_intf"] = "eth%s" % mg_facts["minigraph_ptf_indices"][member_intf]
conn["namespace"] = mg_facts["minigraph_portchannels"][intf]["namespace"]
conn["namespace"] = _get_namespace(mg_facts["minigraph_portchannels"], intf)
elif constants.VLAN_SUB_INTERFACE_SEPARATOR in intf:
orig_intf, vlan_id = intf.split(constants.VLAN_SUB_INTERFACE_SEPARATOR)
ptf_port_index = str(mg_facts["minigraph_port_indices"][orig_intf])
Expand Down