From 5d0748df03b6adfaa70fa68d09fb14cb350cf823 Mon Sep 17 00:00:00 2001 From: Andriy Moroz Date: Tue, 24 Jul 2018 01:51:03 +0300 Subject: [PATCH] [Mellanox] Use MAC from EEPROM for PortChannels and VLAN Interfaces (#1793) * Use MAC from EEPROM for PortChannels Signed-off-by: Andriy Moroz * Use MAC from EEPROM in DEVICE_METADATA Will affect MAC for VLAN interfaces Signed-off-by: Andriy Moroz * Get MAC via decode-syseeprom Signed-off-by: Andriy Moroz * hw-management is now a service Signed-off-by: Andriy Moroz * Add error handling for MAC fetch process Signed-off-by: Andriy Moroz --- dockers/docker-teamd/start.sh | 7 ++- .../build_templates/sonic_debian_extension.j2 | 2 +- .../updategraph.service.j2} | 4 ++ platform/mellanox/.gitignore | 1 + .../Add-systemd-service-config.patch | 58 +++++++++++++++++++ slave.mk | 2 + src/sonic-config-engine/sonic_platform.py | 13 ++++- 7 files changed, 83 insertions(+), 4 deletions(-) rename files/{image_config/updategraph/updategraph.service => build_templates/updategraph.service.j2} (74%) create mode 100644 platform/mellanox/hw-management/Add-systemd-service-config.patch diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh index 6e80f6eb9a..fb3b7c3dad 100755 --- a/dockers/docker-teamd/start.sh +++ b/dockers/docker-teamd/start.sh @@ -6,7 +6,12 @@ rm -rf $TEAMD_CONF_PATH mkdir -p $TEAMD_CONF_PATH SONIC_ASIC_TYPE=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type) -MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}') + +if [ "$SONIC_ASIC_TYPE" == "mellanox" ]; then + MAC_ADDRESS=$(sonic-cfggen -d -v DEVICE_METADATA.localhost.mac) +else + MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}') +fi # Align last byte if [ "$SONIC_ASIC_TYPE" == "mellanox" -o "$SONIC_ASIC_TYPE" == "centec" ]; then diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index 7e22aad82f..29bfdfcd37 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -160,7 +160,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable hostname-config.service sudo cp $IMAGE_CONFIGS/hostname/hostname-config.sh $FILESYSTEM_ROOT/usr/bin/ # Copy updategraph script and service file -sudo cp $IMAGE_CONFIGS/updategraph/updategraph.service $FILESYSTEM_ROOT/etc/systemd/system/ +j2 files/build_templates/updategraph.service.j2 | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/updategraph.service sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable updategraph.service sudo cp $IMAGE_CONFIGS/updategraph/updategraph $FILESYSTEM_ROOT/usr/bin/ {% if enable_dhcp_graph_service == "y" %} diff --git a/files/image_config/updategraph/updategraph.service b/files/build_templates/updategraph.service.j2 similarity index 74% rename from files/image_config/updategraph/updategraph.service rename to files/build_templates/updategraph.service.j2 index ec478d93a1..8039f42531 100644 --- a/files/image_config/updategraph/updategraph.service +++ b/files/build_templates/updategraph.service.j2 @@ -3,6 +3,10 @@ Description=Update minigraph and set configuration based on minigraph After=rc-local.service After=database.service Requires=database.service +{% if sonic_asic_platform == 'mellanox' -%} +Requires=hw-management.service +{% endif -%} + [Service] Type=oneshot diff --git a/platform/mellanox/.gitignore b/platform/mellanox/.gitignore index 3c07690674..ac1ce990d5 100644 --- a/platform/mellanox/.gitignore +++ b/platform/mellanox/.gitignore @@ -3,6 +3,7 @@ mlnx-sai/* !mlnx-sai/Makefile hw-management/* !hw-management/Makefile +!hw-management/*.patch mft/* !mft/Makefile diff --git a/platform/mellanox/hw-management/Add-systemd-service-config.patch b/platform/mellanox/hw-management/Add-systemd-service-config.patch new file mode 100644 index 0000000000..4903f508bc --- /dev/null +++ b/platform/mellanox/hw-management/Add-systemd-service-config.patch @@ -0,0 +1,58 @@ +From 22fef644b1150677353ab0559828ea45a982d901 Mon Sep 17 00:00:00 2001 +From: Andriy Moroz +Date: Wed, 11 Jul 2018 16:51:07 +0300 +Subject: [PATCH] Add systemd service config + +Signed-off-by: Andriy Moroz +--- + debian/control | 2 +- + debian/hw-management.service | 10 ++++++++++ + debian/rules | 2 +- + 3 files changed, 12 insertions(+), 2 deletions(-) + create mode 100644 debian/hw-management.service + +diff --git a/debian/control b/debian/control +index 048cd61..7e3a545 100644 +--- a/debian/control ++++ b/debian/control +@@ -1,7 +1,7 @@ + Source: hw-management + Priority: extra + Maintainer: Adir Atias +-Build-Depends: ++Build-Depends: dh-systemd + Standards-Version: + Section: libs + Homepage: http://www.mellanox.com +diff --git a/debian/hw-management.service b/debian/hw-management.service +new file mode 100644 +index 0000000..d18916d +--- /dev/null ++++ b/debian/hw-management.service +@@ -0,0 +1,10 @@ ++[Unit] ++Description=Mellanox Hardware Management ++ ++[Service] ++Type=oneshot ++EnvironmentFile=/host/machine.conf ++ExecStart=/bin/bash -c "/usr/share/sonic/device/$onie_platform/hw-management start" ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/debian/rules b/debian/rules +index fc38817..fba4150 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -8,7 +8,7 @@ K_SRC ?= "/lib/modules/$(KVERSION)/build" + pwd=$(shell pwd) + + %: +- dh $@ ++ dh $@ --with systemd + + override_dh_auto_configure: + +-- +1.9.1 + diff --git a/slave.mk b/slave.mk index 2beb127b0c..6490dcb5db 100644 --- a/slave.mk +++ b/slave.mk @@ -474,6 +474,8 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ j2 -f env files/initramfs-tools/union-mount.j2 onie-image.conf > files/initramfs-tools/union-mount j2 -f env files/initramfs-tools/arista-convertfs.j2 onie-image.conf > files/initramfs-tools/arista-convertfs + j2 files/build_templates/updategraph.service.j2 > updategraph.service + $(if $($*_DOCKERS), j2 files/build_templates/sonic_debian_extension.j2 > sonic_debian_extension.sh chmod +x sonic_debian_extension.sh, diff --git a/src/sonic-config-engine/sonic_platform.py b/src/sonic-config-engine/sonic_platform.py index 9715b4b3e0..9ce9a7cec5 100644 --- a/src/sonic-config-engine/sonic_platform.py +++ b/src/sonic-config-engine/sonic_platform.py @@ -41,12 +41,21 @@ def get_sonic_version_info(): return data def get_system_mac(): - proc = subprocess.Popen("ip link show eth0 | grep ether | awk '{print $2}'", shell=True, stdout=subprocess.PIPE) + version_info = get_sonic_version_info() + + if (version_info['asic_type'] == 'mellanox'): + get_mac_cmd = "sudo decode-syseeprom -m" + else: + get_mac_cmd = "ip link show eth0 | grep ether | awk '{print $2}'" + + proc = subprocess.Popen(get_mac_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (mac, err) = proc.communicate() + if err: + return None + mac = mac.strip() # Align last byte of MAC if necessary - version_info = get_sonic_version_info() if version_info and (version_info['asic_type'] == 'mellanox' or version_info['asic_type'] == 'centec'): last_byte = mac[-2:] aligned_last_byte = format(int(int(last_byte, 16) & 0b11000000), '02x')