From 49dff57c94a58f51129d764d734497a0dbd45706 Mon Sep 17 00:00:00 2001 From: Mykola Kostenok Date: Mon, 11 Feb 2019 15:48:23 +0000 Subject: [PATCH] remove outdated script call. Signed-off-by: Mykola Kostenok --- .../python/x86_64_mlnx_mqm8700_r0/__init__.py | 1 - .../python/x86_64_mlnx_msn2010_r0/__init__.py | 1 - .../python/x86_64_mlnx_msn2100_r0/__init__.py | 1 - .../x86_64_mlnx_msn2000b_r0/__init__.py | 1 - .../python/x86_64_mlnx_msn2410_r0/__init__.py | 17 ++++------------- .../x86_64_mlnx_msn2410b_r0/__init__.py | 1 - .../python/x86_64_mlnx_msn2700_r0/__init__.py | 19 +++++-------------- .../x86_64_mlnx_msn2700b_r0/__init__.py | 1 - .../python/x86_64_mlnx_msn2740_r0/__init__.py | 1 - .../x86_64_mlnx_msn2740b_r0/__init__.py | 1 - .../python/x86_64_mlnx_msn3700_r0/__init__.py | 1 - 11 files changed, 9 insertions(+), 36 deletions(-) diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-mqm8700/platform-config/r0/src/python/x86_64_mlnx_mqm8700_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-mqm8700/platform-config/r0/src/python/x86_64_mlnx_mqm8700_r0/__init__.py index 99fc6c29..22484d03 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-mqm8700/platform-config/r0/src/python/x86_64_mlnx_mqm8700_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-mqm8700/platform-config/r0/src/python/x86_64_mlnx_mqm8700_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_mqm8700_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/platform-config/r0/src/python/x86_64_mlnx_msn2010_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/platform-config/r0/src/python/x86_64_mlnx_msn2010_r0/__init__.py index e5a57671..ab41fa6f 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/platform-config/r0/src/python/x86_64_mlnx_msn2010_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/platform-config/r0/src/python/x86_64_mlnx_msn2010_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2010_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/platform-config/r0/src/python/x86_64_mlnx_msn2100_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/platform-config/r0/src/python/x86_64_mlnx_msn2100_r0/__init__.py index f7e82a25..697bb111 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/platform-config/r0/src/python/x86_64_mlnx_msn2100_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/platform-config/r0/src/python/x86_64_mlnx_msn2100_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2100_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100b/platform-config/r0/src/python/x86_64_mlnx_msn2000b_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100b/platform-config/r0/src/python/x86_64_mlnx_msn2000b_r0/__init__.py index 16824352..1af71303 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100b/platform-config/r0/src/python/x86_64_mlnx_msn2000b_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100b/platform-config/r0/src/python/x86_64_mlnx_msn2000b_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2100b_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/platform-config/r0/src/python/x86_64_mlnx_msn2410_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/platform-config/r0/src/python/x86_64_mlnx_msn2410_r0/__init__.py index c7ae969b..1e0d3c9d 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/platform-config/r0/src/python/x86_64_mlnx_msn2410_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/platform-config/r0/src/python/x86_64_mlnx_msn2410_r0/__init__.py @@ -1,6 +1,5 @@ from onl.platform.base import * from onl.platform.mellanox import * -import os class OnlPlatform_x86_64_mlnx_msn2410_r0(OnlPlatformMellanox, OnlPlatformPortConfig_32x100): @@ -8,18 +7,10 @@ class OnlPlatform_x86_64_mlnx_msn2410_r0(OnlPlatformMellanox, MODEL="SN2410" SYS_OBJECT_ID=".2410.1" - def hw_management_start(self): - for tool in [ '/etc/mlnx/mlnx-hw-management', '/usr/bin/hw-management.sh' ]: - if os.path.exists(tool): - print "Starting Mellanox HW Management..." - os.system("%s start" % tool) - return True - return False - def baseconfig(self): - - if not self.hw_management_start(): - print "Mellanox HW Management Package Missing." - + # load modules + import os + # necessary if there are issues with the install + # os.system("/usr/bin/apt-get install") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410b/platform-config/r0/src/python/x86_64_mlnx_msn2410b_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410b/platform-config/r0/src/python/x86_64_mlnx_msn2410b_r0/__init__.py index 80772119..424ae978 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410b/platform-config/r0/src/python/x86_64_mlnx_msn2410b_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410b/platform-config/r0/src/python/x86_64_mlnx_msn2410b_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2410b_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/platform-config/r0/src/python/x86_64_mlnx_msn2700_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/platform-config/r0/src/python/x86_64_mlnx_msn2700_r0/__init__.py index ce8d026c..a7e82de4 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/platform-config/r0/src/python/x86_64_mlnx_msn2700_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/platform-config/r0/src/python/x86_64_mlnx_msn2700_r0/__init__.py @@ -1,25 +1,16 @@ from onl.platform.base import * from onl.platform.mellanox import * -import os class OnlPlatform_x86_64_mlnx_msn2700_r0(OnlPlatformMellanox, - OnlPlatformPortConfig_48x25_8x100): + OnlPlatformPortConfig_32x100): PLATFORM='x86-64-mlnx-msn2700-r0' MODEL="SN2700" SYS_OBJECT_ID=".2700.1" - def hw_management_start(self): - for tool in [ '/etc/mlnx/mlnx-hw-management', '/usr/bin/hw-management.sh' ]: - if os.path.exists(tool): - print "Starting Mellanox HW Management..." - os.system("%s start" % tool) - return True - return False - def baseconfig(self): - - if not self.hw_management_start(): - print "Mellanox HW Management Package Missing." - + # load modules + import os + # necessary if there are issues with the install + # os.system("/usr/bin/apt-get install") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700b/platform-config/r0/src/python/x86_64_mlnx_msn2700b_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700b/platform-config/r0/src/python/x86_64_mlnx_msn2700b_r0/__init__.py index 9072382a..576e75c8 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700b/platform-config/r0/src/python/x86_64_mlnx_msn2700b_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700b/platform-config/r0/src/python/x86_64_mlnx_msn2700b_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2700b_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/platform-config/r0/src/python/x86_64_mlnx_msn2740_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/platform-config/r0/src/python/x86_64_mlnx_msn2740_r0/__init__.py index 5e2bc914..0ff4a05f 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/platform-config/r0/src/python/x86_64_mlnx_msn2740_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/platform-config/r0/src/python/x86_64_mlnx_msn2740_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2740_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740b/platform-config/r0/src/python/x86_64_mlnx_msn2740b_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740b/platform-config/r0/src/python/x86_64_mlnx_msn2740b_r0/__init__.py index d7480e04..01c57401 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740b/platform-config/r0/src/python/x86_64_mlnx_msn2740b_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740b/platform-config/r0/src/python/x86_64_mlnx_msn2740b_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn2740b_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn3700/platform-config/r0/src/python/x86_64_mlnx_msn3700_r0/__init__.py b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn3700/platform-config/r0/src/python/x86_64_mlnx_msn3700_r0/__init__.py index 897dd13a..095cc55f 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn3700/platform-config/r0/src/python/x86_64_mlnx_msn3700_r0/__init__.py +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn3700/platform-config/r0/src/python/x86_64_mlnx_msn3700_r0/__init__.py @@ -12,6 +12,5 @@ class OnlPlatform_x86_64_mlnx_msn3700_r0(OnlPlatformMellanox, import os # necessary if there are issues with the install # os.system("/usr/bin/apt-get install") - os.system("/etc/mlnx/mlnx-hw-management start") self.syseeprom_export(); return True