From dcbc085c64fa20da927fd76e7bddcf52dc97a67b Mon Sep 17 00:00:00 2001 From: rawal Date: Fri, 14 Feb 2025 18:41:25 -0500 Subject: [PATCH 1/5] Reg: Announce_routes --- ansible/library/announce_routes.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ansible/library/announce_routes.py b/ansible/library/announce_routes.py index d365534d5d9..a193c30143f 100644 --- a/ansible/library/announce_routes.py +++ b/ansible/library/announce_routes.py @@ -923,17 +923,19 @@ def fib_mx(topo, ptf_ip, action="announce"): """ -def fib_t2_lag(topo, ptf_ip, action="announce"): +def fib_t2_lag(topo, ptf_ip, action="announce"): route_set = [] vms = topo['topology']['VMs'] # T1 VMs per linecard(asic) - key is the dut index, and value is a list of T1 VMs 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() @@ -943,11 +945,14 @@ 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) + def generate_t2_routes(dut_vm_dict, topo, ptf_ip, action="announce"): common_config = topo['configuration_properties'].get('common', {}) vms = topo['topology']['VMs'] From 206e98c215b15de716ffbc4323eb5b92165051eb Mon Sep 17 00:00:00 2001 From: vikshaw-Nokia Date: Mon, 3 Mar 2025 17:28:42 -0500 Subject: [PATCH 2/5] Reg: Flake8 --- ansible/library/announce_routes.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ansible/library/announce_routes.py b/ansible/library/announce_routes.py index a193c30143f..2120b282a89 100644 --- a/ansible/library/announce_routes.py +++ b/ansible/library/announce_routes.py @@ -923,7 +923,7 @@ def fib_mx(topo, ptf_ip, action="announce"): """ -def fib_t2_lag(topo, ptf_ip, action="announce"): +def fib_t2_lag(topo, ptf_ip, action="announce"): route_set = [] vms = topo['topology']['VMs'] # T1 VMs per linecard(asic) - key is the dut index, and value is a list of T1 VMs @@ -931,8 +931,8 @@ def fib_t2_lag(topo, ptf_ip, action="announce"): # 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(): - if type(value['vlans'][0])==int: - dut_index=0 + 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)) @@ -946,13 +946,11 @@ def fib_t2_lag(topo, ptf_ip, action="announce"): 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) - def generate_t2_routes(dut_vm_dict, topo, ptf_ip, action="announce"): common_config = topo['configuration_properties'].get('common', {}) vms = topo['topology']['VMs'] From 842c4f239b4c56e1954e19ca7e354e8d1ec606e5 Mon Sep 17 00:00:00 2001 From: vikshaw-Nokia Date: Wed, 5 Mar 2025 18:48:45 -0500 Subject: [PATCH 3/5] Reg: Minigraph Artifact --- ansible/group_vars/sonic/variables | 2 +- ansible/module_utils/port_utils.py | 2 +- ansible/vars/topo_Nokia-IXR7250-X3B.yml | 16 + ansible/vars/topo_t2_single_node_max.yml | 777 +++++++++++++++++++++++ ansible/vars/topo_t2_single_node_min.yml | 160 +++++ 5 files changed, 955 insertions(+), 2 deletions(-) create mode 100644 ansible/vars/topo_Nokia-IXR7250-X3B.yml create mode 100644 ansible/vars/topo_t2_single_node_max.yml create mode 100644 ansible/vars/topo_t2_single_node_min.yml diff --git a/ansible/group_vars/sonic/variables b/ansible/group_vars/sonic/variables index 3fb464caed6..c8b812e4462 100644 --- a/ansible/group_vars/sonic/variables +++ b/ansible/group_vars/sonic/variables @@ -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'] -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', 'Nokia-IXR7250-X3B', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36'] 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'] diff --git a/ansible/module_utils/port_utils.py b/ansible/module_utils/port_utils.py index 2c8cc1d5007..4b3fc695b8e 100644 --- a/ansible/module_utils/port_utils.py +++ b/ansible/module_utils/port_utils.py @@ -331,7 +331,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 diff --git a/ansible/vars/topo_Nokia-IXR7250-X3B.yml b/ansible/vars/topo_Nokia-IXR7250-X3B.yml new file mode 100644 index 00000000000..0769e3c63fe --- /dev/null +++ b/ansible/vars/topo_Nokia-IXR7250-X3B.yml @@ -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: diff --git a/ansible/vars/topo_t2_single_node_max.yml b/ansible/vars/topo_t2_single_node_max.yml new file mode 100644 index 00000000000..2f287539120 --- /dev/null +++ b/ansible/vars/topo_t2_single_node_max.yml @@ -0,0 +1,777 @@ +topology: + VMs: + ARISTA01T3: + vlans: + - 0 + vm_offset: 0 + ARISTA02T3: + vlans: + - 1 + vm_offset: 1 + ARISTA03T3: + vlans: + - 2 + vm_offset: 2 + ARISTA04T3: + vlans: + - 3 + vm_offset: 3 + ARISTA05T3: + vlans: + - 4 + vm_offset: 4 + ARISTA06T3: + vlans: + - 5 + vm_offset: 5 + ARISTA07T3: + vlans: + - 6 + vm_offset: 6 + ARISTA08T3: + vlans: + - 7 + vm_offset: 7 + ARISTA21T1: + vlans: + - 8 + vm_offset: 8 + ARISTA22T1: + vlans: + - 9 + - 10 + vm_offset: 9 + ARISTA24T1: + vlans: + - 11 + - 12 + vm_offset: 10 + ARISTA26T1: + vlans: + - 13 + - 14 + vm_offset: 11 + ARISTA28T1: + vlans: + - 15 + - 16 + vm_offset: 12 + ARISTA30T1: + vlans: + - 17 + vm_offset: 13 + ARISTA31T1: + vlans: + - 18 + vm_offset: 14 + ARISTA32T1: + vlans: + - 19 + vm_offset: 15 + ARISTA33T1: + vlans: + - 20 + vm_offset: 16 + ARISTA34T1: + vlans: + - 21 + vm_offset: 17 + ARISTA09T3: + vlans: + - 22 + - 23 + vm_offset: 18 + ARISTA11T3: + vlans: + - 24 + - 25 + vm_offset: 19 + ARISTA13T3: + vlans: + - 26 + vm_offset: 20 + ARISTA14T3: + vlans: + - 27 + vm_offset: 21 + ARISTA15T3: + vlans: + - 28 + vm_offset: 22 + ARISTA16T3: + vlans: + - 29 + vm_offset: 23 + ARISTA17T3: + vlans: + - 30 + - 31 + vm_offset: 24 + ARISTA19T3: + vlans: + - 32 + - 33 + vm_offset: 25 + ARISTA35T1: + vlans: + - 34 + vm_offset: 26 + ARISTA36T1: + vlans: + - 35 + vm_offset: 27 + + + + DUT: + loopback: + ipv4: + - 10.1.0.1/32 + ipv6: + - FC00:10::1/128 + +configuration_properties: + common: + podset_number: 400 + tor_number: 16 + tor_subnet_number: 8 + max_tor_subnet_number: 32 + tor_subnet_size: 128 + dut_asn: 65100 + dut_type: SpineRouter + nhipv4: 10.10.246.254 + nhipv6: FC0A::FF + core: + swrole: core + leaf: + swrole: leaf + +configuration: + ARISTA01T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.0 + - FC00::1 + interfaces: + Loopback0: + ipv4: 100.1.0.1/32 + ipv6: 2064:100::1/128 + Ethernet1: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.1/31 + ipv6: FC00::2/126 + bp_interface: + ipv4: 10.10.246.1/24 + ipv6: fc0a::2/64 + + ARISTA02T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.2 + - FC00::5 + interfaces: + Loopback0: + ipv4: 100.1.0.2/32 + ipv6: 2064:100::2/128 + Ethernet1: + ipv4: 10.0.0.3/31 + ipv6: FC00::6/126 + bp_interface: + ipv4: 10.10.246.2/24 + ipv6: fc0a::4/64 + + ARISTA03T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.4 + - FC00::9 + interfaces: + Loopback0: + ipv4: 100.1.0.3/32 + ipv6: 2064:100::3/128 + Ethernet1: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.5/31 + ipv6: FC00::a/126 + bp_interface: + ipv4: 10.10.246.3/24 + ipv6: fc0a::6/64 + + ARISTA04T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.6 + - FC00::d + interfaces: + Loopback0: + ipv4: 100.1.0.5/32 + ipv6: 2064:100::5/128 + Ethernet1: + ipv4: 10.0.0.7/31 + ipv6: FC00::e/126 + bp_interface: + ipv4: 10.10.246.5/24 + ipv6: fc0a::8/64 + + ARISTA05T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.8 + - FC00::11 + interfaces: + Loopback0: + ipv4: 100.1.0.6/32 + ipv6: 2064:100::6/128 + Ethernet1: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.9/31 + ipv6: FC00::12/126 + bp_interface: + ipv4: 10.10.246.6/24 + ipv6: fc0a::a/64 + + ARISTA06T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.10 + - FC00::15 + interfaces: + Loopback0: + ipv4: 100.1.0.7/32 + ipv6: 2064:100::7/128 + Ethernet1: + ipv4: 10.0.0.11/31 + ipv6: FC00::16/126 + bp_interface: + ipv4: 10.10.246.7/24 + ipv6: fc0a::c/64 + + ARISTA07T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.12 + - FC00::19 + interfaces: + Loopback0: + ipv4: 100.1.0.8/32 + ipv6: 2064:100::8/128 + Ethernet1: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.13/31 + ipv6: FC00::1a/126 + bp_interface: + ipv4: 10.10.246.8/24 + ipv6: fc0a::e/64 + + ARISTA08T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.14 + - FC00::1d + interfaces: + Loopback0: + ipv4: 100.1.0.9/32 + ipv6: 2064:100::9/128 + Ethernet1: + ipv4: 10.0.0.15/31 + ipv6: FC00::1e/126 + bp_interface: + ipv4: 10.10.246.9/24 + ipv6: fc0a::10/64 + + ARISTA21T1: + properties: + - common + - leaf + bgp: + asn: 65012 + peers: + 65100: + - 10.0.0.98 + - fc00::c9 + interfaces: + Loopback0: + ipv4: 100.1.0.52/32 + ipv6: 2064:100::32/128 + Ethernet1: + ipv4: 10.0.0.99/31 + ipv6: fc00::ca/126 + bp_interface: + ipv4: 10.10.246.101/24 + ipv6: fc0a::64/64 + + ARISTA22T1: + properties: + - common + - leaf + bgp: + asn: 65013 + peers: + 65100: + - 10.0.0.100 + - fc00::cd + interfaces: + Loopback0: + ipv4: 100.1.0.53/32 + ipv6: 2064:100::33/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.101/31 + ipv6: fc00::ce/126 + bp_interface: + ipv4: 10.10.246.103/24 + ipv6: fc0a::66/64 + + ARISTA24T1: + properties: + - common + - leaf + bgp: + asn: 65014 + peers: + 65100: + - 10.0.0.104 + - fc00::d5 + interfaces: + Loopback0: + ipv4: 100.1.0.55/32 + ipv6: 2064:100::35/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.105/31 + ipv6: fc00::d6/126 + bp_interface: + ipv4: 10.10.246.107/24 + ipv6: fc0a::6a/64 + + ARISTA26T1: + properties: + - common + - leaf + bgp: + asn: 65015 + peers: + 65100: + - 10.0.0.108 + - fc00::dd + interfaces: + Loopback0: + ipv4: 100.1.0.57/32 + ipv6: 2064:100::37/128 + Ethernet1: + lacp: 1 + dut_index: 0 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.109/31 + ipv6: fc00::de/126 + bp_interface: + ipv4: 10.10.246.111/24 + ipv6: fc0a::6e/64 + + ARISTA28T1: + properties: + - common + - leaf + bgp: + asn: 65016 + peers: + 65100: + - 10.0.0.112 + - fc00::e5 + interfaces: + Loopback0: + ipv4: 100.1.0.59/32 + ipv6: 2064:100::39/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.113/31 + ipv6: fc00::e6/126 + bp_interface: + ipv4: 10.10.246.115/24 + ipv6: fc0a::72/64 + + ARISTA30T1: + properties: + - common + - leaf + bgp: + asn: 65017 + peers: + 65100: + - 10.0.0.116 + - fc00::ed + interfaces: + Loopback0: + ipv4: 100.1.0.61/32 + ipv6: 2064:100::3b/128 + Ethernet1: + ipv4: 10.0.0.117/31 + ipv6: fc00::ee/126 + bp_interface: + ipv4: 10.10.246.119/24 + ipv6: fc0a::76/64 + + ARISTA31T1: + properties: + - common + - leaf + bgp: + asn: 65018 + peers: + 65100: + - 10.0.0.118 + - fc00::f1 + interfaces: + Loopback0: + ipv4: 100.1.0.62/32 + ipv6: 2064:100::3c/128 + Ethernet1: + ipv4: 10.0.0.119/31 + ipv6: fc00::f2/126 + bp_interface: + ipv4: 10.10.246.120/24 + ipv6: fc0a::78/64 + + ARISTA32T1: + properties: + - common + - leaf + bgp: + asn: 65019 + peers: + 65100: + - 10.0.0.120 + - fc00::f5 + interfaces: + Loopback0: + ipv4: 100.1.0.63/32 + ipv6: 2064:100::3d/128 + Ethernet1: + ipv4: 10.0.0.121/31 + ipv6: fc00::f6/126 + bp_interface: + ipv4: 10.10.246.121/24 + ipv6: fc0a::7a/64 + + ARISTA33T1: + properties: + - common + - leaf + bgp: + asn: 65020 + peers: + 65100: + - 10.0.0.122 + - fc00::f9 + interfaces: + Loopback0: + ipv4: 100.1.0.64/32 + ipv6: 2064:100::3e/128 + Ethernet1: + ipv4: 10.0.0.123/31 + ipv6: fc00::fa/126 + bp_interface: + ipv4: 10.10.246.122/24 + ipv6: fc0a::7c/64 + + ARISTA34T1: + properties: + - common + - leaf + bgp: + asn: 65021 + peers: + 65100: + - 10.0.0.124 + - fc00::fd + interfaces: + Loopback0: + ipv4: 100.1.0.65/32 + ipv6: 2064:100::3f/128 + Ethernet1: + ipv4: 10.0.0.125/31 + ipv6: fc00::fe/126 + bp_interface: + ipv4: 10.10.246.123/24 + ipv6: fc0a::7e/64 + + ARISTA09T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.16 + - fc00::21 + interfaces: + Loopback0: + ipv4: 100.1.0.10/32 + ipv6: 2064:100::10/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.17/31 + ipv6: fc00::22/126 + bp_interface: + ipv4: 10.10.246.10/24 + ipv6: fc0a::12/64 + + ARISTA11T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.20 + - fc00::29 + interfaces: + Loopback0: + ipv4: 100.1.0.12/32 + ipv6: 2064:100::12/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.21/31 + ipv6: fc00::2a/126 + bp_interface: + ipv4: 10.10.246.12/24 + ipv6: fc0a::16/64 + + ARISTA13T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.24 + - fc00::31 + interfaces: + Loopback0: + ipv4: 100.1.0.14/32 + ipv6: 2064:100::14/128 + Ethernet1: + ipv4: 10.0.0.25/31 + ipv6: fc00::32/126 + bp_interface: + ipv4: 10.10.246.14/24 + ipv6: fc0a::1a/64 + + ARISTA14T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.26 + - fc00::35 + interfaces: + Loopback0: + ipv4: 100.1.0.15/32 + ipv6: 2064:100::15/128 + Ethernet1: + ipv4: 10.0.0.27/31 + ipv6: fc00::36/126 + bp_interface: + ipv4: 10.10.246.15/24 + ipv6: fc0a::1c/64 + + ARISTA15T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.28 + - fc00::39 + interfaces: + Loopback0: + ipv4: 100.1.0.16/32 + ipv6: 2064:100::16/128 + Ethernet1: + ipv4: 10.0.0.29/31 + ipv6: fc00::3a/126 + bp_interface: + ipv4: 10.10.246.16/24 + ipv6: fc0a::1e/64 + + ARISTA16T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.30 + - fc00::3d + interfaces: + Loopback0: + ipv4: 100.1.0.17/32 + ipv6: 2064:100::17/128 + Ethernet1: + ipv4: 10.0.0.31/31 + ipv6: fc00::3e/126 + bp_interface: + ipv4: 10.10.246.17/24 + ipv6: fc0a::20/64 + + ARISTA17T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.32 + - fc00::41 + interfaces: + Loopback0: + ipv4: 100.1.0.18/32 + ipv6: 2064:100::18/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.33/31 + ipv6: fc00::42/126 + bp_interface: + ipv4: 10.10.246.18/24 + ipv6: fc0a::22/64 + + ARISTA19T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.36 + - fc00::49 + interfaces: + Loopback0: + ipv4: 100.1.0.20/32 + ipv6: 2064:100::20/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.37/31 + ipv6: fc00::4A/126 + bp_interface: + ipv4: 10.10.246.20/24 + ipv6: fc0a::26/64 + + ARISTA35T1: + properties: + - common + - leaf + bgp: + asn: 65022 + peers: + 65100: + - 10.0.0.126 + - fc00::101 + interfaces: + Loopback0: + ipv4: 100.1.0.66/32 + ipv6: 2064:100::3e/128 + Ethernet1: + ipv4: 10.0.0.127/31 + ipv6: fc00::102/126 + bp_interface: + ipv4: 10.10.246.124/24 + ipv6: fc0a::80/64 + + ARISTA36T1: + properties: + - common + - leaf + bgp: + asn: 65023 + peers: + 65100: + - 10.0.0.128 + - fc00::105 + interfaces: + Loopback0: + ipv4: 100.1.0.67/32 + ipv6: 2064:100::3f/128 + Ethernet1: + ipv4: 10.0.0.129/31 + ipv6: fc00::106/126 + bp_interface: + ipv4: 10.10.246.125/24 + ipv6: fc0a::82/64 diff --git a/ansible/vars/topo_t2_single_node_min.yml b/ansible/vars/topo_t2_single_node_min.yml new file mode 100644 index 00000000000..d2181a0b410 --- /dev/null +++ b/ansible/vars/topo_t2_single_node_min.yml @@ -0,0 +1,160 @@ +topology: + VMs: + ARISTA01T3: + vlans: + - 6 + vm_offset: 0 + ARISTA02T3: + vlans: + - 12 + vm_offset: 1 + ARISTA03T3: + vlans: + - 13 + vm_offset: 2 + ARISTA05T1: + vlans: + - 24 + - 25 + vm_offset: 3 + ARISTA07T1: + vlans: + - 34 + vm_offset: 4 + + DUT: + loopback: + ipv4: + - 10.1.0.1/32 + ipv6: + - fc00:10::1/128 + +configuration_properties: + common: + podset_number: 400 + tor_number: 16 + tor_subnet_number: 8 + max_tor_subnet_number: 32 + tor_subnet_size: 128 + dut_asn: 65100 + dut_type: SpineRouter + nhipv4: 10.10.246.254 + nhipv6: fc0a::ff + core: + swrole: core + leaf: + swrole: leaf + +configuration: + ARISTA01T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.0 + - fc00::1 + interfaces: + Loopback0: + ipv4: 100.1.0.1/32 + ipv6: 2064:100::1/128 + Ethernet1: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.1/31 + ipv6: fc00::2/126 + bp_interface: + ipv4: 10.10.246.1/24 + ipv6: fc0a::2/64 + + ARISTA02T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.2 + - fc00::5 + interfaces: + Loopback0: + ipv4: 100.1.0.2/32 + ipv6: 2064:100::2/128 + Ethernet1: + ipv4: 10.0.0.3/31 + ipv6: fc00::6/126 + bp_interface: + ipv4: 10.10.246.2/24 + ipv6: fc0a::4/64 + + ARISTA03T3: + properties: + - common + - core + bgp: + asn: 65200 + peers: + 65100: + - 10.0.0.4 + - fc00::9 + interfaces: + Loopback0: + ipv4: 100.1.0.3/32 + ipv6: 2064:100::3/128 + Ethernet1: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.5/31 + ipv6: fc00::a/126 + bp_interface: + ipv4: 10.10.246.3/24 + ipv6: fc0a::6/64 + + ARISTA05T1: + properties: + - common + - leaf + bgp: + asn: 65012 + peers: + 65100: + - 10.0.0.100 + - fc00::d + interfaces: + Loopback0: + ipv4: 100.1.0.53/32 + ipv6: 2064:100::33/128 + Ethernet1: + lacp: 1 + Ethernet2: + lacp: 1 + Port-Channel1: + ipv4: 10.0.0.101/31 + ipv6: fc00::e/126 + bp_interface: + ipv4: 10.10.246.103/24 + ipv6: fc0a::66/64 + + ARISTA07T1: + properties: + - common + - leaf + bgp: + asn: 65013 + peers: + 65100: + - 10.0.0.102 + - fc00::11 + interfaces: + Loopback0: + ipv4: 100.1.0.55/32 + ipv6: 2064:100::37/128 + Ethernet1: + ipv4: 10.0.0.103/31 + ipv6: fc00::12/126 + bp_interface: + ipv4: 10.10.246.105/24 + ipv6: fc0a::6a/64 From 8c35d8db55fb557d0265777eef4932b54027a11d Mon Sep 17 00:00:00 2001 From: Arvindsrinivasan Lakshmi Narasimhan Date: Tue, 15 Apr 2025 17:29:38 +0000 Subject: [PATCH 4/5] fix the whitespaces --- ansible/vars/topo_t2_single_node_max.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ansible/vars/topo_t2_single_node_max.yml b/ansible/vars/topo_t2_single_node_max.yml index 2f287539120..401ff6535cf 100644 --- a/ansible/vars/topo_t2_single_node_max.yml +++ b/ansible/vars/topo_t2_single_node_max.yml @@ -121,8 +121,6 @@ topology: - 35 vm_offset: 27 - - DUT: loopback: ipv4: @@ -322,7 +320,7 @@ configuration: bp_interface: ipv4: 10.10.246.9/24 ipv6: fc0a::10/64 - + ARISTA21T1: properties: - common From 90750bb97239243cb66ffd6e4f51a6df628c19ab Mon Sep 17 00:00:00 2001 From: Arvindsrinivasan Lakshmi Narasimhan Date: Tue, 15 Apr 2025 17:40:55 +0000 Subject: [PATCH 5/5] Fix the whitespace again --- ansible/vars/topo_t2_single_node_max.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/vars/topo_t2_single_node_max.yml b/ansible/vars/topo_t2_single_node_max.yml index 401ff6535cf..877925c2007 100644 --- a/ansible/vars/topo_t2_single_node_max.yml +++ b/ansible/vars/topo_t2_single_node_max.yml @@ -127,7 +127,7 @@ topology: - 10.1.0.1/32 ipv6: - FC00:10::1/128 - + configuration_properties: common: podset_number: 400