Skip to content

feat:Seastone2 adaptation #4

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
celestica-gl merged 1 commit into from
Dec 22, 2020
Merged

feat:Seastone2 adaptation #4

Show file tree
Hide file tree
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
32 changes: 32 additions & 0 deletions ansible/files/lab_connection_graph.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<Device Hostname="str-7260-11" HwSku="Arista-7260QX-64" Type="FanoutRoot"/>
<Device Hostname="str-acs-serv-01" HwSku="TestServ" Type="Server"/>
<Device Hostname="seastone-fanout" HwSku="Celestica-DX010-C32" Type="FanoutLeafSonic"/>
<Device Hostname="cel-seastone2-01" HwSku="Seastone_2" Type="DevSonic"/>
<Device Hostname="cel-seastone-01" HwSku="Celestica-DX010-C32" Type="DevSonic"/>
<Device Hostname="cel-seastone-02" HwSku="Seastone-DX010-10-50" Type="DevSonic"/>
<Device Hostname="cel-seastone-03" HwSku="Seastone-DX010-50" Type="DevSonic"/>
Expand Down Expand Up @@ -44,6 +45,37 @@
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet112" StartDevice="cel-seastone-01" StartPort="Ethernet112"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet116" StartDevice="cel-seastone-01" StartPort="Ethernet116"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet120" StartDevice="cel-seastone-01" StartPort="Ethernet120"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet0" StartDevice="cel-seastone2-01" StartPort="Ethernet0"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet4" StartDevice="cel-seastone2-01" StartPort="Ethernet4"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet8" StartDevice="cel-seastone2-01" StartPort="Ethernet8"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet12" StartDevice="cel-seastone2-01" StartPort="Ethernet12"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet16" StartDevice="cel-seastone2-01" StartPort="Ethernet16"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet20" StartDevice="cel-seastone2-01" StartPort="Ethernet20"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet24" StartDevice="cel-seastone2-01" StartPort="Ethernet24"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet28" StartDevice="cel-seastone2-01" StartPort="Ethernet28"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet32" StartDevice="cel-seastone2-01" StartPort="Ethernet32"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet36" StartDevice="cel-seastone2-01" StartPort="Ethernet36"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet40" StartDevice="cel-seastone2-01" StartPort="Ethernet40"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet44" StartDevice="cel-seastone2-01" StartPort="Ethernet44"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet48" StartDevice="cel-seastone2-01" StartPort="Ethernet48"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet52" StartDevice="cel-seastone2-01" StartPort="Ethernet52"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet56" StartDevice="cel-seastone2-01" StartPort="Ethernet56"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet60" StartDevice="cel-seastone2-01" StartPort="Ethernet60"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet64" StartDevice="cel-seastone2-01" StartPort="Ethernet64"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet68" StartDevice="cel-seastone2-01" StartPort="Ethernet68"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet72" StartDevice="cel-seastone2-01" StartPort="Ethernet72"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet76" StartDevice="cel-seastone2-01" StartPort="Ethernet76"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet80" StartDevice="cel-seastone2-01" StartPort="Ethernet80"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet84" StartDevice="cel-seastone2-01" StartPort="Ethernet84"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet88" StartDevice="cel-seastone2-01" StartPort="Ethernet88"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet92" StartDevice="cel-seastone2-01" StartPort="Ethernet92"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet96" StartDevice="cel-seastone2-01" StartPort="Ethernet96"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet100" StartDevice="cel-seastone2-01" StartPort="Ethernet100"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet104" StartDevice="cel-seastone2-01" StartPort="Ethernet104"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet108" StartDevice="cel-seastone2-01" StartPort="Ethernet108"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet112" StartDevice="cel-seastone2-01" StartPort="Ethernet112"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet116" StartDevice="cel-seastone2-01" StartPort="Ethernet116"/>
<DeviceInterfaceLink BandWidth="100000" EndDevice="seastone-fanout" EndPort="Ethernet120" StartDevice="cel-seastone2-01" StartPort="Ethernet120"/>
<DeviceInterfaceLink BandWidth="1000" EndDevice="e1031-fanout" EndPort="Ethernet1" StartDevice="cel-e1031-01" StartPort="Ethernet1"/>
<DeviceInterfaceLink BandWidth="1000" EndDevice="e1031-fanout" EndPort="Ethernet2" StartDevice="cel-e1031-01" StartPort="Ethernet2"/>
<DeviceInterfaceLink BandWidth="1000" EndDevice="e1031-fanout" EndPort="Ethernet3" StartDevice="cel-e1031-01" StartPort="Ethernet3"/>
Expand Down
1 change: 1 addition & 0 deletions ansible/files/sonic_lab_devices.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ cel-e1031-01,10.250.0.100/23,Celestica-E1031-T48S4,DevSonic
cel-seastone-01,10.251.0.100/23,Celestica-DX010-C32,DevSonic
cel-seastone-02,10.250.0.100/23,Seastone-DX010-10-50,DevSonic
cel-seastone-03,10.250.0.100/23,Seastone-DX010-50,DevSonic
cel-seastone2-01,10.251.0.100/23,Seastone_2,DevSonic
e1031-fanout,10.250.0.235/23,Celestica-E1031-T48S4,FanoutLeafSonic
seastone-fanout,10.251.0.235/23,Celestica-DX010-C32,FanoutLeafSonic
str-msn2700-01,10.251.0.188/23,Mellanox-2700,DevSonic
Expand Down
31 changes: 31 additions & 0 deletions ansible/files/sonic_lab_links.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,34 @@ cel-seastone-01,Ethernet108,seastone-fanout,Ethernet108,100000,127,Access
cel-seastone-01,Ethernet112,seastone-fanout,Ethernet112,100000,128,Access
cel-seastone-01,Ethernet116,seastone-fanout,Ethernet116,100000,129,Access
cel-seastone-01,Ethernet120,seastone-fanout,Ethernet120,100000,130,Access
cel-seastone2-01,Ethernet0,seastone-fanout,Ethernet0,100000,100,Access
cel-seastone2-01,Ethernet4,seastone-fanout,Ethernet4,100000,101,Access
cel-seastone2-01,Ethernet8,seastone-fanout,Ethernet8,100000,102,Access
cel-seastone2-01,Ethernet12,seastone-fanout,Ethernet12,100000,103,Access
cel-seastone2-01,Ethernet16,seastone-fanout,Ethernet16,100000,104,Access
cel-seastone2-01,Ethernet20,seastone-fanout,Ethernet20,100000,105,Access
cel-seastone2-01,Ethernet24,seastone-fanout,Ethernet24,100000,106,Access
cel-seastone2-01,Ethernet28,seastone-fanout,Ethernet28,100000,107,Access
cel-seastone2-01,Ethernet32,seastone-fanout,Ethernet32,100000,108,Access
cel-seastone2-01,Ethernet36,seastone-fanout,Ethernet36,100000,109,Access
cel-seastone2-01,Ethernet40,seastone-fanout,Ethernet40,100000,110,Access
cel-seastone2-01,Ethernet44,seastone-fanout,Ethernet44,100000,111,Access
cel-seastone2-01,Ethernet48,seastone-fanout,Ethernet48,100000,112,Access
cel-seastone2-01,Ethernet52,seastone-fanout,Ethernet52,100000,113,Access
cel-seastone2-01,Ethernet56,seastone-fanout,Ethernet56,100000,114,Access
cel-seastone2-01,Ethernet60,seastone-fanout,Ethernet60,100000,115,Access
cel-seastone2-01,Ethernet64,seastone-fanout,Ethernet64,100000,116,Access
cel-seastone2-01,Ethernet68,seastone-fanout,Ethernet68,100000,117,Access
cel-seastone2-01,Ethernet72,seastone-fanout,Ethernet72,100000,118,Access
cel-seastone2-01,Ethernet76,seastone-fanout,Ethernet76,100000,119,Access
cel-seastone2-01,Ethernet80,seastone-fanout,Ethernet80,100000,120,Access
cel-seastone2-01,Ethernet84,seastone-fanout,Ethernet84,100000,121,Access
cel-seastone2-01,Ethernet88,seastone-fanout,Ethernet88,100000,122,Access
cel-seastone2-01,Ethernet92,seastone-fanout,Ethernet92,100000,123,Access
cel-seastone2-01,Ethernet96,seastone-fanout,Ethernet96,100000,124,Access
cel-seastone2-01,Ethernet100,seastone-fanout,Ethernet100,100000,125,Access
cel-seastone2-01,Ethernet104,seastone-fanout,Ethernet104,100000,126,Access
cel-seastone2-01,Ethernet108,seastone-fanout,Ethernet108,100000,127,Access
cel-seastone2-01,Ethernet112,seastone-fanout,Ethernet112,100000,128,Access
cel-seastone2-01,Ethernet116,seastone-fanout,Ethernet116,100000,129,Access
cel-seastone2-01,Ethernet120,seastone-fanout,Ethernet120,100000,130,Access
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 @@ -5,7 +5,7 @@ sonic_version: "v2"
broadcom_hwskus: [ "Force10-S6000", "Accton-AS7712-32X", "Celestica-DX010-C32", "Seastone-DX010", "Celestica-E1031-T48S4"]

broadcom_td2_hwskus: ['Force10-S6000', 'Force10-S6000-Q24S32', 'Arista-7050-QX32', 'Arista-7050-QX-32S']
broadcom_th_hwskus: ['Force10-S6100', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-C32-T1', 'Arista-7060CX-32S-D48C8', 'Celestica-DX010-C32', "Seastone-DX010" ]
Copy link
Copy Markdown
Owner

@celestica-gl celestica-gl Dec 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please confirm whether we need to delete this line?
Will this action impact the seastone testbed?

broadcom_th_hwskus: ['Force10-S6100', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-C32-T1', 'Arista-7060CX-32S-D48C8', 'Celestica-DX010-C32', "Seastone_2", "Seastone-DX010" ]
broadcom_th2_hwskus: ['Arista-7260CX3-D108C8', 'Arista-7260CX3-C64', 'Arista-7260CX3-Q64']

mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-D48C8' ]
Expand Down
8 changes: 8 additions & 0 deletions ansible/lab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@ cel-e1031-01 ansible_host=10.250.0.100
hwsku="Celestica-E1031-T48S4"
iface_speed='1000'

[sonic_slx2]
cel-seastone2-01 ansible_host=10.251.0.100 pdu_host=pdu-1

[sonic_slx2:vars]
hwsku="Seastone_2"
iface_speed='100000'

[sonic:children]
sonic_slx
sonic_e1031
sonic_slx2

[ptf]
ptf1 ansible_host=10.250.0.110 ansible_ssh_user=root ansible_ssh_pass=root
Expand Down
5 changes: 4 additions & 1 deletion ansible/library/minigraph_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def parse_dpg(dpg, hname):
pcintfname = pcintf.find(str(QName(ns, "Name"))).text
pcintfmbr = pcintf.find(str(QName(ns, "AttachTo"))).text
pcmbr_list = pcintfmbr.split(';', 1)
for i, member in enumerate(pcmbr_list):
for i, member in enumerate(pcmbr_list):
pcmbr_list[i] = port_alias_to_name_map[member]
ports[port_alias_to_name_map[member]] = {'name': port_alias_to_name_map[member], 'alias': member}
pcs[pcintfname] = {'name': pcintfname, 'members': pcmbr_list}
Expand Down Expand Up @@ -528,6 +528,9 @@ def parse_xml(filename, hostname):
elif hwsku == "Celestica-DX010-C32":
for i in range(1, 33):
port_alias_to_name_map["etp%d" % i] = "Ethernet%d" % ((i - 1) * 4)
elif hwsku == "Seastone_2":
for i in range(1, 33):
port_alias_to_name_map["QSFP%d" % i] = "Ethernet%d" % ((i - 1) * 4)
elif hwsku == "Seastone-DX010":
for i in range(1, 33):
port_alias_to_name_map["Eth%d" % i] = "Ethernet%d" % ((i - 1) * 4)
Expand Down
1 change: 1 addition & 0 deletions ansible/testbed.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# conf-name,group-name,topo,ptf_image_name,ptf,ptf_ip,ptf_ipv6,server,vm_base,dut,comment
cel_slx_t0,ptf2,t0-slx,docker-ptf,ptf2,10.251.0.110/24,,server_2,VM0300,cel-seastone-01,Tests ptf
cel_slx2_t0,ptf2,t0-slx,docker-ptf,ptf2,10.251.0.110/24,,server_2,VM0300,cel-seastone2-01,Tests ptf
cel_slx_t1,ptf2,t1-slx,docker-ptf,ptf2,10.251.0.110/24,,server_3,VM0400,cel-seastone-01,Tests ptf
cel_e1031_t0,ptf1,t0-e1031,docker-ptf,ptf-unknown,10.250.0.110/24,,server_1,VM0100,cel-e1031-01,Tests ptf
ptf1-m,ptf1,ptf32,docker-ptf-sai-mlnx,ptf-unknown,10.255.0.188/24,,server_1,,str-msn2700-01,Test ptf Mellanox
Expand Down