diff --git a/.gitmodules b/.gitmodules index e0cfc0869d05..4f74399ce9a0 100755 --- a/.gitmodules +++ b/.gitmodules @@ -56,9 +56,6 @@ [submodule "platform/broadcom/sonic-platform-modules-accton"] path = platform/broadcom/sonic-platform-modules-accton url = https://github.com/edge-core/sonic-platform-modules-accton.git -[submodule "platform/broadcom/sonic-platform-modules-cel"] - path = platform/broadcom/sonic-platform-modules-cel - url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git [submodule "src/sonic-frr/frr"] path = src/sonic-frr/frr url = https://github.com/FRRouting/frr.git @@ -77,3 +74,6 @@ [submodule "platform/broadcom/sonic-platform-modules-mitac"] path = platform/broadcom/sonic-platform-modules-mitac url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git +[submodule "platform/broadcom/sonic-platform-modules-cel"] + path = platform/broadcom/sonic-platform-modules-cel + url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git diff --git a/device/celestica/x86_64-cel_e1031-r0/E1031-T48S4/port_config.ini b/device/celestica/x86_64-cel_e1031-r0/E1031-T48S4/port_config.ini new file mode 100644 index 000000000000..faad181486a9 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/E1031-T48S4/port_config.ini @@ -0,0 +1,53 @@ +# name lanes speed +Ethernet0 1 1000 +Ethernet1 2 1000 +Ethernet2 3 1000 +Ethernet3 4 1000 +Ethernet4 5 1000 +Ethernet5 6 1000 +Ethernet6 7 1000 +Ethernet7 8 1000 +Ethernet8 9 1000 +Ethernet9 10 1000 +Ethernet10 11 1000 +Ethernet11 12 1000 +Ethernet12 13 1000 +Ethernet13 14 1000 +Ethernet14 15 1000 +Ethernet15 16 1000 +Ethernet16 17 1000 +Ethernet17 18 1000 +Ethernet18 19 1000 +Ethernet19 20 1000 +Ethernet20 21 1000 +Ethernet21 22 1000 +Ethernet22 23 1000 +Ethernet23 24 1000 +Ethernet24 25 1000 +Ethernet25 26 1000 +Ethernet26 27 1000 +Ethernet27 28 1000 +Ethernet28 29 1000 +Ethernet29 30 1000 +Ethernet30 31 1000 +Ethernet31 32 1000 +Ethernet32 33 1000 +Ethernet33 34 1000 +Ethernet34 35 1000 +Ethernet35 36 1000 +Ethernet36 37 1000 +Ethernet37 38 1000 +Ethernet38 39 1000 +Ethernet39 40 1000 +Ethernet40 41 1000 +Ethernet41 42 1000 +Ethernet42 43 1000 +Ethernet43 44 1000 +Ethernet44 45 1000 +Ethernet45 46 1000 +Ethernet46 47 1000 +Ethernet47 48 1000 +Ethernet48 54 10000 +Ethernet49 53 10000 +Ethernet50 56 10000 +Ethernet51 55 10000 diff --git a/device/celestica/x86_64-cel_e1031-r0/E1031-T48S4/sai.profile b/device/celestica/x86_64-cel_e1031-r0/E1031-T48S4/sai.profile new file mode 100644 index 000000000000..1f36f82fd515 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/E1031-T48S4/sai.profile @@ -0,0 +1 @@ +SAI_INIT_CONFIG_FILE=/etc/bcm/helix4-e1031-48x1G+4x10G.config.bcm diff --git a/device/celestica/x86_64-cel_e1031-r0/fancontrol b/device/celestica/x86_64-cel_e1031-r0/fancontrol new file mode 100644 index 000000000000..a94c63055fd7 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/fancontrol @@ -0,0 +1,12 @@ +# Configuration file generated by pwmconfig, changes will be lost +INTERVAL=2 +DEVPATH=hwmon3=devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-23/23-004d/ hwmon2=devices/pci0000:00/0000:00:13.0/i2c-0/i2c-8/i2c-11/11-001a/hwmon/hwmon2 +DEVNAME=hwmon3=emc2305 hwmon2=max6697 +FCTEMPS=hwmon3/pwm1=hwmon2/temp2_input hwmon3/pwm2=hwmon2/temp2_input hwmon3/pwm4=hwmon2/temp2_input +FCFANS=hwmon3/device/pwm1=hwmon3/device/fan1_input hwmon3/device/pwm2=hwmon3/device/fan2_input hwmon3/device/pwm4=hwmon3/device/fan4_input +MINTEMP=hwmon3/device/pwm1=29 hwmon3/device/pwm2=29 hwmon3/device/pwm4=29 +MAXTEMP=hwmon3/device/pwm1=44 hwmon3/device/pwm2=44 hwmon3/device/pwm4=44 +MINSTART=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102 +MINSTOP=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102 +MINPWM=hwmon3/device/pwm1=102 hwmon3/device/pwm2=102 hwmon3/device/pwm4=102 +MAXPWM=hwmon3/device/pwm1=255 hwmon3/device/pwm2=255 hwmon3/device/pwm4=255 diff --git a/device/celestica/x86_64-cel_e1031-r0/installer.conf b/device/celestica/x86_64-cel_e1031-r0/installer.conf new file mode 100644 index 000000000000..14404194ef53 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/installer.conf @@ -0,0 +1,3 @@ +CONSOLE_PORT=0x2f8 +CONSOLE_DEV=1 +CONSOLE_SPEED=115200 diff --git a/device/celestica/x86_64-cel_e1031-r0/minigraph.xml b/device/celestica/x86_64-cel_e1031-r0/minigraph.xml new file mode 100644 index 000000000000..294d2bffd1f9 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/minigraph.xml @@ -0,0 +1,810 @@ + + + + + + ARISTA01T1 + 10.0.0.1 + sonic + 10.0.0.0 + 1 + 180 + 60 + + + ARISTA02T1 + 10.0.0.5 + sonic + 10.0.0.4 + 1 + 180 + 60 + + + ARISTA03T1 + 10.0.0.9 + sonic + 10.0.0.8 + 1 + 180 + 60 + + + ARISTA04T1 + 10.0.0.13 + sonic + 10.0.0.12 + 1 + 180 + 60 + + + ARISTA01T1 + FC00::2 + sonic + FC00::1 + 1 + 180 + 60 + + + ARISTA02T1 + FC00::A + sonic + FC00::9 + 1 + 180 + 60 + + + ARISTA03T1 + FC00::12 + sonic + FC00::11 + 1 + 180 + 60 + + + ARISTA04T1 + FC00::1A + sonic + FC00::19 + 1 + 180 + 60 + + + + + 64601 + sonic + + + BGPPeer +
10.0.0.1
+ + + + + + BGPPeer +
10.0.0.5
+ + + + + + BGPPeer +
10.0.0.9
+ + + + + + BGPPeer +
10.0.0.13
+ + + + + + BGPPeer +
FC00::2
+ + + + + + BGPPeer +
FC00::A
+ + + + + + BGPPeer +
FC00::12
+ + + + + + BGPPeer +
FC00::1A
+ + + + + + + + + 64802 + ARISTA01T1 + + + + 64802 + ARISTA02T1 + + + + 64802 + ARISTA03T1 + + + + 64802 + ARISTA04T1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + + + HostIP + eth0 + + 10.251.0.243/23 + + 10.251.0.243/23 + + + + + + sonic + + + + VlanInterface + Vlan2 + Ethernet0;Ethernet1;Ethernet2;Ethernet3;Ethernet4;Ethernet5;Ethernet6;Ethernet7;Ethernet8;Ethernet9;Ethernet10;Ethernet11;Ethernet12;Ethernet13;Ethernet14;Ethernet15;Ethernet16;Ethernet17;Ethernet18;Ethernet19;Ethernet20;Ethernet21;Ethernet22;Ethernet23;Ethernet24;Ethernet25;Ethernet26;Ethernet27;Ethernet28;Ethernet29;Ethernet30;Ethernet31;Ethernet32;Ethernet33;Ethernet34;Ethernet35;Ethernet36;Ethernet37;Ethernet38;Ethernet39;Ethernet40;Ethernet41;Ethernet42;Ethernet43;Ethernet44;Ethernet45;Ethernet46;Ethernet47 + False + 0.0.0.0/0 + + 2 + 2 + 172.0.0.0/26 + + + + + IPInterface + + Ethernet48 + 10.0.0.0/31 + + + IPInterface + + Ethernet49 + 10.0.0.4/31 + + + IPInterface + + Ethernet50 + 10.0.0.8/31 + + + IPInterface + + Ethernet51 + 10.0.0.12/31 + + + IPInterface + + Ethernet48 + FC00::1/126 + + + IPInterface + + Ethernet49 + FC00::9/126 + + + IPInterface + + Ethernet50 + FC00::11/126 + + + IPInterface + + Ethernet51 + FC00::19/126 + + + IPInterface + + Vlan2 + 172.0.0.1/26 + + + + + + + + + + + + DeviceInterfaceLink + true + 10000 + ARISTA01T1 + Ethernet1 + true + sonic + Ethernet48 + + + DeviceInterfaceLink + true + 10000 + ARISTA02T1 + Ethernet1 + true + sonic + Ethernet49 + + + DeviceInterfaceLink + true + 10000 + ARISTA03T1 + Ethernet1 + true + sonic + Ethernet50 + + + DeviceInterfaceLink + true + 10000 + ARISTA04T1 + Ethernet1 + true + sonic + Ethernet51 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet0 + true + server-01 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet1 + true + server-02 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet2 + true + server-03 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet3 + true + server-04 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet4 + true + server-05 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet5 + true + server-06 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet6 + true + server-07 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet7 + true + server-08 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet8 + true + server-09 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet9 + true + server-10 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet10 + true + server-11 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet11 + true + server-12 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet12 + true + server-13 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet13 + true + server-14 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet14 + true + server-15 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet15 + true + server-16 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet16 + true + server-17 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet17 + true + server-18 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet18 + true + server-19 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet19 + true + server-20 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet20 + true + server-21 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet21 + true + server-22 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet22 + true + server-23 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet23 + true + server-24 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet24 + true + server-25 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet25 + true + server-26 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet26 + true + server-27 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet27 + true + server-28 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet28 + true + server-29 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet29 + true + server-30 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet30 + true + server-31 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet31 + true + server-32 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet32 + true + server-33 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet33 + true + server-34 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet34 + true + server-35 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet35 + true + server-36 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet36 + true + server-37 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet37 + true + server-38 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet38 + true + server-39 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet39 + true + server-40 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet40 + true + server-41 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet41 + true + server-42 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet42 + true + server-43 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet43 + true + server-44 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet44 + true + server-45 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet45 + true + server-46 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet46 + true + server-47 + 0 + + + DeviceInterfaceLink + true + 1000 + sonic + Ethernet47 + true + server-48 + 0 + + + + + sonic + E1031-T48S4 + + 10.251.0.243 + + + + + sonic + E1031-T48S4 + diff --git a/device/celestica/x86_64-cel_e1031-r0/plugins/eeprom.py b/device/celestica/x86_64-cel_e1031-r0/plugins/eeprom.py new file mode 100644 index 000000000000..6577631c8908 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/plugins/eeprom.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +############################################################################# +# Celestica Haliburton +# +# Platform and model specific eeprom subclass, inherits from the base class, +# and provides the followings: +# - the eeprom format definition +# - specific encoder/decoder if there is special need +############################################################################# + +try: + from sonic_eeprom import eeprom_tlvinfo +except ImportError, e: + raise ImportError (str(e) + "- required module not found") + + +class board(eeprom_tlvinfo.TlvInfoDecoder): + + def __init__(self, name, path, cpld_root, ro): + self.eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0050/eeprom" + super(board, self).__init__(self.eeprom_path, 0, '', True) + diff --git a/device/celestica/x86_64-cel_e1031-r0/sensors.conf b/device/celestica/x86_64-cel_e1031-r0/sensors.conf new file mode 100644 index 000000000000..1874548cff64 --- /dev/null +++ b/device/celestica/x86_64-cel_e1031-r0/sensors.conf @@ -0,0 +1,12 @@ +# libsensors configuration file for Celestica DX010. +# The i2c bus portion is omit because adapter name +# changes every time when system boot up. + +chip "max6697-i2c-*-1a" + label temp1 "temp sensor 1" + label temp2 "temp sensor 2" + label temp3 "temp sensor 3" + label temp4 "temp sensor 4" + label temp5 "temp sensor 5" + ignore temp6 + ignore temp7 diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh index 0e4321345167..f86265c4e4b3 100755 --- a/installer/x86_64/install.sh +++ b/installer/x86_64/install.sh @@ -65,9 +65,9 @@ fi echo "onie_platform: $onie_platform" # default console settings -CONSOLE_PORT=0x3f8 -CONSOLE_DEV=0 -CONSOLE_SPEED=9600 +CONSOLE_PORT=0x2f8 +CONSOLE_DEV=1 +CONSOLE_SPEED=115200 # Get platform specific linux kernel command line arguments ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="" diff --git a/platform/broadcom/one-image.mk b/platform/broadcom/one-image.mk index 001d7486101e..0b0dd85911e2 100755 --- a/platform/broadcom/one-image.mk +++ b/platform/broadcom/one-image.mk @@ -22,6 +22,7 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \ $(INVENTEC_D7032Q28B_PLATFORM_MODULE) \ $(INVENTEC_D7054Q28B_PLATFORM_MODULE) \ $(CEL_DX010_PLATFORM_MODULE) \ + $(CEL_HALIBURTON_PLATFORM_MODULE) \ $(DELTA_AG9032V1_PLATFORM_MODULE) \ $(DELTA_AG9064_PLATFORM_MODULE) \ $(DELTA_AG5648_PLATFORM_MODULE) \ diff --git a/platform/broadcom/platform-modules-cel.mk b/platform/broadcom/platform-modules-cel.mk index 09e8b374e861..0cd5f4c6646d 100644 --- a/platform/broadcom/platform-modules-cel.mk +++ b/platform/broadcom/platform-modules-cel.mk @@ -1,6 +1,6 @@ -# Celestica DX010 Platform modules +# Celestica Platform modules -CEL_DX010_PLATFORM_MODULE_VERSION = 0.6 +CEL_DX010_PLATFORM_MODULE_VERSION = 0.7 export CEL_DX010_PLATFORM_MODULE_VERSION @@ -9,3 +9,14 @@ $(CEL_DX010_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules- $(CEL_DX010_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(CEL_DX010_PLATFORM_MODULE)_PLATFORM = x86_64-cel_seastone-r0 SONIC_DPKG_DEBS += $(CEL_DX010_PLATFORM_MODULE) + + +CEL_HALIBURTON_PLATFORM_MODULE_VERSION = 0.7 + +export CEL_HALIBURTON_PLATFORM_MODULE_VERSION + +CEL_HALIBURTON_PLATFORM_MODULE = platform-modules-haliburton_$(CEL_HALIBURTON_PLATFORM_MODULE_VERSION)_amd64.deb +$(CEL_HALIBURTON_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-cel +$(CEL_HALIBURTON_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) +$(CEL_HALIBURTON_PLATFORM_MODULE)_PLATFORM = x86_64-cel_e1031-r0 +SONIC_DPKG_DEBS += $(CEL_HALIBURTON_PLATFORM_MODULE) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 1f124e1b9232..8424ce369e4b 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,9 +1,9 @@ -BRCM_SAI = libsaibcm_3.1.3.4-7_amd64.deb -$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.4-7_amd64.deb?sv=2015-04-05&sr=b&sig=elzOgHCA3G8oKKMfWcbFa%2BvQzAh727mtYJnnVOzVJtY%3D&se=2155-02-07T23%3A37%3A54Z&sp=r" +BRCM_SAI = libsaibcm_3.1.3.4-8_amd64.deb +$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.4-8_amd64.deb?sv=2015-04-05&sr=b&sig=bYM539jLDK2wqWYYgEcf%2BPLChJ%2FkUc6wfyWJTpqJQkM%3D&se=2155-02-19T10%3A58%3A03Z&sp=r" -BRCM_SAI_DEV = libsaibcm-dev_3.1.3.4-7_amd64.deb +BRCM_SAI_DEV = libsaibcm-dev_3.1.3.4-8_amd64.deb $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.4-7_amd64.deb?sv=2015-04-05&sr=b&sig=rysxdbCA%2BaqBgDnxztdRA2ixiME3ypqRvzyEds8hLw4%3D&se=2155-02-07T23%3A38%3A39Z&sp=r" +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.4-8_amd64.deb?sv=2015-04-05&sr=b&sig=CNopVxzI4nPSUb6bw56EPUvi03pjKXLGJR%2BfO1jxP2I%3D&se=2155-02-19T11%3A00%3A27Z&sp=r" SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) diff --git a/platform/broadcom/sonic-platform-modules-cel b/platform/broadcom/sonic-platform-modules-cel index 190d0b71ac19..12e741b8a1e8 160000 --- a/platform/broadcom/sonic-platform-modules-cel +++ b/platform/broadcom/sonic-platform-modules-cel @@ -1 +1 @@ -Subproject commit 190d0b71ac1902679e2d720368e100d78eb09f3e +Subproject commit 12e741b8a1e838286d6c32c1355496131a1c3888 diff --git a/src/sonic-config-engine/sonic_platform.py b/src/sonic-config-engine/sonic_platform.py index f573d6a6575d..e3895d2ff40d 100644 --- a/src/sonic-config-engine/sonic_platform.py +++ b/src/sonic-config-engine/sonic_platform.py @@ -21,7 +21,7 @@ def get_machine_info(): tokens = line.split('=') if len(tokens) < 2: continue - machine_vars[tokens[0]] = tokens[1].strip() + machine_vars[tokens[0]] = tokens[1].strip().strip("'") return machine_vars def get_platform_info(machine_info):