Skip to content

Introducing changes for minigraph generation and add topo to work for single node T2 #17986

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
arlakshm merged 6 commits into from
Apr 18, 2025
Merged

Introducing changes for minigraph generation and add topo to work for single node T2 #17986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dcbc085
Reg: Announce_routes
rawal01 Feb 14, 2025
206e98c
Reg: Flake8
vikshaw-Nokia Mar 3, 2025
842c4f2
Reg: Minigraph Artifact
vikshaw-Nokia Mar 5, 2025
4a2dbbc
Merge remote-tracking branch 'github/master' into arlakshm/dev/x3b
arlakshm Apr 15, 2025
8c35d8d
fix the whitespaces
arlakshm Apr 15, 2025
90750bb
Fix the whitespace again
arlakshm Apr 15, 2025
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
2 changes: 1 addition & 1 deletion ansible/group_vars/sonic/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ broadcom_th2_hwskus: ['Arista-7260CX3-D108C8', 'Arista-7260CX3-D108C10', 'Arista
broadcom_th3_hwskus: ['DellEMC-Z9332f-M-O16C64', 'DellEMC-Z9332f-O32']
broadcom_th4_hwskus: ['Arista-7060DX5-32', 'Arista-7060DX5-64S']
broadcom_th5_hwskus: ['Arista-7060X6-64DE', 'Arista-7060X6-64DE-64x400G', 'Arista-7060X6-64DE-O128S2', 'Arista-7060X6-64DE-256x200G', 'Arista-7060X6-64PE', 'Arista-7060X6-64PE-64x400G', 'Arista-7060X6-64PE-O128S2', 'Arista-7060X6-64PE-256x200G', 'Arista-7060X6-64PE-C256S2', 'Arista-7060X6-64PE-C224O8', 'Arista-7060X6-64PE-B-C512S2', 'Arista-7060X6-64PE-B-C448O16', 'Arista-7060X6-16PE-384C-O128S2']
broadcom_j2c+_hwskus: ['Nokia-IXR7250E-36x100G', 'Nokia-IXR7250E-36x400G', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36']
broadcom_j2c+_hwskus: ['Nokia-IXR7250E-36x100G', 'Nokia-IXR7250E-36x400G', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36', 'Nokia-IXR7250-X3B']
broadcom_jr2_hwskus: ['Arista-7800R3-48CQ2-C48', 'Arista-7800R3-48CQM2-C48']

mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-A1', 'Mellanox-SN2700-D48C8','Mellanox-SN2700-D40C8S8', 'Mellanox-SN2700-A1-D48C8']
Expand Down
9 changes: 6 additions & 3 deletions ansible/library/announce_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,10 +1107,12 @@ def fib_t2_lag(topo, ptf_ip, action="announce"):
t1_vms = {}
# T3 VMs per linecard(asic) - key is the dut index, and value is a list of T3 VMs
t3_vms = {}

for key, value in vms.items():
m = re.match(r"(\d+)\.(\d+)@(\d+)", value['vlans'][0])
dut_index = int(m.group(1))
if type(value['vlans'][0]) == int:
dut_index = 0
else:
m = re.match(r"(\d+)\.(\d+)@(\d+)", value['vlans'][0])
dut_index = int(m.group(1))
if 'T1' in key:
if dut_index not in t1_vms:
t1_vms[dut_index] = list()
Expand All @@ -1120,6 +1122,7 @@ def fib_t2_lag(topo, ptf_ip, action="announce"):
if dut_index not in t3_vms:
t3_vms[dut_index] = list()
t3_vms[dut_index].append(key)

route_set += generate_t2_routes(t1_vms, topo, ptf_ip, action)
route_set += generate_t2_routes(t3_vms, topo, ptf_ip, action)
send_routes_in_parallel(route_set)
Expand Down
2 changes: 1 addition & 1 deletion ansible/module_utils/port_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
port_alias_to_name_map["twod5GigE%d" % i] = "Ethernet%d" % i
for i in range(48, 54):
port_alias_to_name_map["twenty5GigE%d" % i] = "Ethernet%d" % i
elif hwsku == "Nokia-IXR7250E-36x400G" or hwsku == "Nokia-IXR7250E-36x100G":
elif hwsku in ["Nokia-IXR7250E-36x400G", "Nokia-IXR7250E-36x100G", "Nokia-IXR7250-X3B"]:
for i in range(1, 37):
sonic_name = "Ethernet%d" % ((i - 1) * 8)
port_alias_to_name_map["Ethernet{}/{}".format(i, 1)] = sonic_name
Expand Down
16 changes: 16 additions & 0 deletions ansible/vars/topo_Nokia-IXR7250-X3B.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
slot0:
ASIC0:
topology:
NEIGH_ASIC:
configuration_properties:
common:
asic_type: FrontEnd
configuration:

ASIC1:
topology:
NEIGH_ASIC:
configuration_properties:
common:
asic_type: FrontEnd
configuration:
Loading
Loading