From a0c9b84295b4c4a43f0607c5a2fa7ec36f827ea5 Mon Sep 17 00:00:00 2001 From: Pradchaya P Date: Thu, 14 Nov 2019 18:22:19 +0700 Subject: [PATCH 1/4] [device/celestica] hwsku:Seastone2 update port configuration --- .../Seastone_2/port_config.ini | 66 +-- .../Seastone_2/sai.profile | 2 +- .../td3-seastone_2-32x100G.config.bcm | 0 .../x86_64-cel_seastone_2-r0/minigraph.xml | 498 ------------------ 4 files changed, 34 insertions(+), 532 deletions(-) rename device/celestica/x86_64-cel_seastone_2-r0/{ => Seastone_2}/td3-seastone_2-32x100G.config.bcm (100%) delete mode 100644 device/celestica/x86_64-cel_seastone_2-r0/minigraph.xml diff --git a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/port_config.ini b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/port_config.ini index 0806a84739a..ed6bcff2331 100644 --- a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/port_config.ini +++ b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/port_config.ini @@ -1,33 +1,33 @@ -# name lanes alias fec index -Ethernet0 1,2,3,4 QSFP1 rs 1 -Ethernet1 5,6,7,8 QSFP2 rs 2 -Ethernet2 9,10,11,12 QSFP3 rs 3 -Ethernet3 13,14,15,16 QSFP4 rs 4 -Ethernet4 17,18,19,20 QSFP5 rs 5 -Ethernet5 21,22,23,24 QSFP6 rs 6 -Ethernet6 25,26,27,28 QSFP7 rs 7 -Ethernet7 29,30,31,32 QSFP8 rs 8 -Ethernet8 33,34,35,36 QSFP9 rs 9 -Ethernet9 37,38,39,40 QSFP10 rs 10 -Ethernet10 41,42,43,44 QSFP11 rs 11 -Ethernet11 45,46,47,48 QSFP12 rs 12 -Ethernet12 49,50,51,52 QSFP13 rs 13 -Ethernet13 53,54,55,56 QSFP14 rs 14 -Ethernet14 57,58,59,60 QSFP15 rs 15 -Ethernet15 61,62,63,64 QSFP16 rs 16 -Ethernet16 65,66,67,68 QSFP17 rs 17 -Ethernet17 69,70,71,72 QSFP18 rs 18 -Ethernet18 73,74,75,76 QSFP19 rs 19 -Ethernet19 77,78,79,80 QSFP20 rs 20 -Ethernet20 81,82,83,84 QSFP21 rs 21 -Ethernet21 85,86,87,88 QSFP22 rs 22 -Ethernet22 89,90,91,92 QSFP23 rs 23 -Ethernet23 93,94,95,96 QSFP24 rs 24 -Ethernet24 97,98,99,100 QSFP25 rs 25 -Ethernet25 101,102,103,104 QSFP26 rs 26 -Ethernet26 105,106,107,108 QSFP27 rs 27 -Ethernet27 109,110,111,112 QSFP28 rs 28 -Ethernet28 113,114,115,116 QSFP29 rs 29 -Ethernet29 117,118,119,120 QSFP30 rs 30 -Ethernet30 121,122,123,124 QSFP31 rs 31 -Ethernet31 125,126,127,128 QSFP32 rs 32 +# name lanes alias fec index speed +Ethernet0 1,2,3,4 QSFP1 rs 1 100000 +Ethernet4 5,6,7,8 QSFP2 rs 2 100000 +Ethernet8 9,10,11,12 QSFP3 rs 3 100000 +Ethernet12 13,14,15,16 QSFP4 rs 4 100000 +Ethernet16 17,18,19,20 QSFP5 rs 5 100000 +Ethernet20 21,22,23,24 QSFP6 rs 6 100000 +Ethernet24 25,26,27,28 QSFP7 rs 7 100000 +Ethernet28 29,30,31,32 QSFP8 rs 8 100000 +Ethernet32 33,34,35,36 QSFP9 rs 9 100000 +Ethernet36 37,38,39,40 QSFP10 rs 10 100000 +Ethernet40 41,42,43,44 QSFP11 rs 11 100000 +Ethernet44 45,46,47,48 QSFP12 rs 12 100000 +Ethernet48 49,50,51,52 QSFP13 rs 13 100000 +Ethernet52 53,54,55,56 QSFP14 rs 14 100000 +Ethernet56 57,58,59,60 QSFP15 rs 15 100000 +Ethernet60 61,62,63,64 QSFP16 rs 16 100000 +Ethernet64 65,66,67,68 QSFP17 rs 17 100000 +Ethernet68 69,70,71,72 QSFP18 rs 18 100000 +Ethernet72 73,74,75,76 QSFP19 rs 19 100000 +Ethernet76 77,78,79,80 QSFP20 rs 20 100000 +Ethernet80 81,82,83,84 QSFP21 rs 21 100000 +Ethernet84 85,86,87,88 QSFP22 rs 22 100000 +Ethernet88 89,90,91,92 QSFP23 rs 23 100000 +Ethernet92 93,94,95,96 QSFP24 rs 24 100000 +Ethernet96 97,98,99,100 QSFP25 rs 25 100000 +Ethernet100 101,102,103,104 QSFP26 rs 26 100000 +Ethernet104 105,106,107,108 QSFP27 rs 27 100000 +Ethernet108 109,110,111,112 QSFP28 rs 28 100000 +Ethernet112 113,114,115,116 QSFP29 rs 29 100000 +Ethernet116 117,118,119,120 QSFP30 rs 30 100000 +Ethernet120 121,122,123,124 QSFP31 rs 31 100000 +Ethernet124 125,126,127,128 QSFP32 rs 32 100000 \ No newline at end of file diff --git a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/sai.profile b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/sai.profile index c74f30fd54f..ea150bf237c 100644 --- a/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/sai.profile +++ b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/sai.profile @@ -1 +1 @@ -SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/td3-seastone_2-32x100G.config.bcm +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-seastone_2-32x100G.config.bcm diff --git a/device/celestica/x86_64-cel_seastone_2-r0/td3-seastone_2-32x100G.config.bcm b/device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm similarity index 100% rename from device/celestica/x86_64-cel_seastone_2-r0/td3-seastone_2-32x100G.config.bcm rename to device/celestica/x86_64-cel_seastone_2-r0/Seastone_2/td3-seastone_2-32x100G.config.bcm diff --git a/device/celestica/x86_64-cel_seastone_2-r0/minigraph.xml b/device/celestica/x86_64-cel_seastone_2-r0/minigraph.xml deleted file mode 100644 index 70df77fc038..00000000000 --- a/device/celestica/x86_64-cel_seastone_2-r0/minigraph.xml +++ /dev/null @@ -1,498 +0,0 @@ - - - - - - - - HostIP - Loopback0 - - 10.1.0.32/32 - - 10.1.0.32/32 - - - - - - - - sonic - - - - - - - - - - - - - sonic - Seastone_2 - - - - - - true - - - DeviceInterface - - true - true - 1 - QSFP1 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 2 - QSFP2 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 3 - QSFP3 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 4 - QSFP4 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 5 - QSFP5 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 6 - QSFP6 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 7 - QSFP7 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 8 - QSFP8 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 9 - QSFP9 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 10 - QSFP10 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 11 - QSFP11 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 12 - QSFP12 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 13 - QSFP13 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 14 - QSFP14 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 15 - QSFP15 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 16 - QSFP16 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 17 - QSFP17 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 18 - QSFP18 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 19 - QSFP19 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 20 - QSFP20 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 21 - QSFP21 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 22 - QSFP22 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 23 - QSFP23 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 24 - QSFP24 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 25 - QSFP25 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 26 - QSFP26 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 27 - QSFP27 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 28 - QSFP28 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 29 - QSFP29 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 30 - QSFP30 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 31 - QSFP31 - - false - 0 - 0 - 100000 - - - DeviceInterface - - true - true - 32 - QSFP32 - - false - 0 - 0 - 100000 - - - true - 0 - Seastone_2 - - - - - - - sonic - - - DhcpResources - - - - - NtpResources - - 0.debian.pool.ntp.org;1.debian.pool.ntp.org;2.debian.pool.ntp.org;3.debian.pool.ntp.org - - - SyslogResources - - - - - ErspanDestinationIpv4 - - 2.2.2.2 - - - - - - - sonic - Seastone_2 - From 42f5772bfaf2a828b9c487e1cfd62e05a8401d9d Mon Sep 17 00:00:00 2001 From: Pradchaya P Date: Thu, 14 Nov 2019 21:37:59 +0700 Subject: [PATCH 2/4] [plugins/psuutil] fix psutuil cannot run in pmon docker --- device/celestica/x86_64-cel_seastone_2-r0/plugins/psuutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/celestica/x86_64-cel_seastone_2-r0/plugins/psuutil.py b/device/celestica/x86_64-cel_seastone_2-r0/plugins/psuutil.py index e39e11d8b57..f315e875542 100644 --- a/device/celestica/x86_64-cel_seastone_2-r0/plugins/psuutil.py +++ b/device/celestica/x86_64-cel_seastone_2-r0/plugins/psuutil.py @@ -14,7 +14,7 @@ class PsuUtil(PsuBase): """Platform-specific PSUutil class""" def __init__(self): - self.ipmi_sensor = "docker exec -ti pmon ipmitool sensor" + self.ipmi_sensor = "ipmitool sensor" PsuBase.__init__(self) def run_command(self, command): From 806aa7706db6860e3feff77f741bb39e696a39ac Mon Sep 17 00:00:00 2001 From: Pradchaya P Date: Thu, 14 Nov 2019 21:39:01 +0700 Subject: [PATCH 3/4] [plugins/sfputil] raise error in get_transceiver_change_event --- device/celestica/x86_64-cel_seastone_2-r0/plugins/sfputil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/celestica/x86_64-cel_seastone_2-r0/plugins/sfputil.py b/device/celestica/x86_64-cel_seastone_2-r0/plugins/sfputil.py index c35b20d8fbd..db3ca9976e3 100755 --- a/device/celestica/x86_64-cel_seastone_2-r0/plugins/sfputil.py +++ b/device/celestica/x86_64-cel_seastone_2-r0/plugins/sfputil.py @@ -178,5 +178,5 @@ def get_transceiver_change_event(self, timeout=0): """ TBD: When the feature request. """ - return NotImplementedError + raise NotImplementedError From b4ac09ed6d07c91a1400eebeb93640a3f37869a8 Mon Sep 17 00:00:00 2001 From: Pradchaya P Date: Fri, 15 Nov 2019 00:35:28 +0700 Subject: [PATCH 4/4] [device/celestica] Seastone2 add config to skip ledd in pmon --- .../x86_64-cel_seastone_2-r0/pmon_daemon_control.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 device/celestica/x86_64-cel_seastone_2-r0/pmon_daemon_control.json diff --git a/device/celestica/x86_64-cel_seastone_2-r0/pmon_daemon_control.json b/device/celestica/x86_64-cel_seastone_2-r0/pmon_daemon_control.json new file mode 100644 index 00000000000..294259681a1 --- /dev/null +++ b/device/celestica/x86_64-cel_seastone_2-r0/pmon_daemon_control.json @@ -0,0 +1,6 @@ +{ + "skip_ledd": true, + "skip_xcvrd": false, + "skip_psud": false, + "skip_syseepromd": false +} \ No newline at end of file