Remove nokia folder-s

platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/chassis.py

@@ -18,7 +18,6 @@
     from sonic_platform.thermal import Thermal
     from sonic_platform.component import Component
     from sonic_py_common import logger
-    from sonic_py_common.general import getstatusoutput_noshell
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -28,6 +27,11 @@
 except ImportError as e:
     smbus_present = 0
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 MAX_SELECT_DELAY = 3600
 COPPER_PORT_START = 1
 COPPER_PORT_END = 48
@@ -205,7 +209,7 @@ def get_revision(self):
             string: Revision value of chassis
         """
         if smbus_present == 0:  # called from host
-            cmdstatus, value = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0x0'])
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x0')
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
@@ -327,7 +331,7 @@ def set_status_led(self, color):
 
         # Write sys led
         if smbus_present == 0:  # called from host (e.g. 'show system-health')
-            cmdstatus, value = getstatusoutput_noshell(['sudo', 'i2cset', '-y', '0', '0x41', '0x7', value])
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cset -y 0 0x41 0x7 %d' % value)
             if cmdstatus:
                 sonic_logger.log_warning("  System LED set %s failed" % value)
                 return False
@@ -349,7 +353,7 @@ def get_status_led(self):
         """
         # Read sys led
         if smbus_present == 0:  # called from host
-            cmdstatus, value = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0x7'])
+            cmdstatus, value = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x7')
             value = int(value, 16)
         else:
             bus = smbus.SMBus(0)

platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/component.py

@@ -9,10 +9,10 @@
 
 try:
     import os
+    import sys
     import subprocess
     import ntpath
     from sonic_platform_base.component_base import ComponentBase
-    from sonic_py_common.general import getstatusoutput_noshell
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -22,6 +22,11 @@
 except ImportError as e:
     smbus_present = 0
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 
 class Component(ComponentBase):
     """Nokia platform-specific Component class"""
@@ -30,20 +35,29 @@ class Component(ComponentBase):
         ["System-CPLD", "Used for managing SFPs, LEDs, PSUs and FANs "],
         ["U-Boot", "Performs initialization during booting"],
     ]
-    CPLD_UPDATE_COMMAND1 = ['cp', '/usr/sbin/vme', '/tmp']
-    CPLD_UPDATE_COMMAND2 = ['cp', '', '/tmp']
-    CPLD_UPDATE_COMMAND3 = ['cd', '/tmp']
-    CPLD_UPDATE_COMMAND4 = ['./vme', '']
+    CPLD_UPDATE_COMMAND = 'cp /usr/sbin/vme /tmp; cp {} /tmp; cd /tmp; ./vme {};'
 
     def __init__(self, component_index):
         self.index = component_index
         self.name = self.CHASSIS_COMPONENTS[self.index][0]
         self.description = self.CHASSIS_COMPONENTS[self.index][1]
 
+    def _get_command_result(self, cmdline):
+        try:
+            proc = subprocess.Popen(cmdline.split(), stdout=subprocess.PIPE,
+                                    stderr=subprocess.STDOUT)
+            stdout = proc.communicate()[0]
+            proc.wait()
+            result = stdout.rstrip('\n')
+        except OSError:
+            result = None
+
+        return result
+
     def _get_cpld_version(self, cpld_number):
 
         if smbus_present == 0:
-            cmdstatus, cpld_version = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0x2'])
+            cmdstatus, cpld_version = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x2')
         else:
             bus = smbus.SMBus(0)
             DEVICE_ADDRESS = 0x41
@@ -130,15 +144,7 @@ def get_firmware_version(self):
             return self._get_cpld_version(self.index)
 
         if self.index == 1:
-            cmd1 = ['grep', '--null-data', 'U-Boot', '/dev/mtd0ro']
-            cmd2 = ['head', '-1']
-            cmd3 = ['cut', '-d', ' ', '-f2-4']
-            with subprocess.Popen(cmd1, universal_newlines=True, stdout=subprocess.PIPE) as p1:
-                with subprocess.Popen(cmd2, universal_newlines=True, stdin=p1.stdout, stdout=subprocess.PIPE) as p2:
-                    with subprocess.Popen(cmd3, universal_newlines=True, stdin=p2.stdout, stdout=subprocess.PIPE) as p3:
-                        uboot_version = p3.communicate()[0].rstrip('\n')
-                        p1.wait()
-                        p2.wait()
+            cmdstatus, uboot_version = cmd.getstatusoutput('grep --null-data U-Boot /dev/mtd0ro|head -1 | cut -d" " -f2-4')
             return uboot_version
 
     def install_firmware(self, image_path):
@@ -159,16 +165,12 @@ def install_firmware(self, image_path):
             print("ERROR: the cpld image {} doesn't exist ".format(image_path))
             return False
 
-        self.CPLD_UPDATE_COMMAND2[1] = image_path
-        self.CPLD_UPDATE_COMMAND4[1] = image_name
+        cmdline = self.CPLD_UPDATE_COMMAND.format(image_path, image_name)
 
         success_flag = False
-
-        try:   
-            subprocess.check_call(self.CPLD_UPDATE_COMMAND1, stderr=subprocess.STDOUT)
-            subprocess.check_call(self.CPLD_UPDATE_COMMAND2, stderr=subprocess.STDOUT)
-            subprocess.check_call(self.CPLD_UPDATE_COMMAND3, stderr=subprocess.STDOUT)
-            subprocess.check_call(self.CPLD_UPDATE_COMMAND4, stderr=subprocess.STDOUT)
+
+        try:
+            subprocess.check_call(cmdline, stderr=subprocess.STDOUT, shell=True)
             success_flag = True
         except subprocess.CalledProcessError as e:
             print("ERROR: Failed to upgrade CPLD: rc={}".format(e.returncode))

platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/psu.py

@@ -8,13 +8,18 @@
 
 try:
     import os
+    import sys
     from sonic_platform_base.psu_base import PsuBase
     from sonic_py_common import logger
     from sonic_platform.eeprom import Eeprom
-    from sonic_py_common.general import getstatusoutput_noshell
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 smbus_present = 1
 try:
     import smbus
@@ -81,7 +86,7 @@ def get_presence(self):
         """
 
         if smbus_present == 0:  # if called from psuutil outside of pmon
-            cmdstatus, psustatus = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0xa'])
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
         else:
             bus = smbus.SMBus(0)
@@ -145,7 +150,7 @@ def get_status(self):
         """
 
         if smbus_present == 0:
-            cmdstatus, psustatus = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0xa'])
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
             sonic_logger.log_warning("PMON psu-smbus - presence = 0 ")
         else:
@@ -174,7 +179,7 @@ def get_voltage(self):
             e.g. 12.1
         """
         if smbus_present == 0:
-            cmdstatus, psustatus = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0xa'])
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
         else:
             bus = smbus.SMBus(0)
@@ -221,7 +226,7 @@ def get_powergood_status(self):
         """
 
         if smbus_present == 0:
-            cmdstatus, psustatus = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0xa'])
+            cmdstatus, psustatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0xa')
             psustatus = int(psustatus, 16)
         else:
             bus = smbus.SMBus(0)

platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp.py

@@ -3,18 +3,23 @@
 #
 #############################################################################
 
-import subprocess
+import os
+import sys
 
 try:
     from sonic_platform_base.sfp_base import SfpBase
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
     from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
     from sonic_platform_base.sonic_sfp.sfputilhelper import SfpUtilHelper
     from sonic_py_common import logger
-    from sonic_py_common.general import getstatusoutput_noshell
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 smbus_present = 1
 
 try:
@@ -113,7 +118,7 @@ class Sfp(SfpBase):
     # Paths
     PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
     PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
-    HOST_CHK_CMD = ["docker"]
+    HOST_CHK_CMD = "docker > /dev/null 2>&1"
 
     PLATFORM = "armhf-nokia_ixs7215_52x-r0"
     HWSKU = "Nokia-7215"
@@ -181,7 +186,7 @@ def __convert_string_to_num(self, value_str):
             return 'N/A'
 
     def __is_host(self):
-        return subprocess.run(self.HOST_CHK_CMD).returncode == 0
+        return os.system(self.HOST_CHK_CMD) == 0
 
     def __get_path_to_port_config_file(self):
         platform_path = "/".join([self.PLATFORM_ROOT_PATH, self.PLATFORM])
@@ -806,7 +811,7 @@ def tx_disable(self, tx_disable):
             return False
 
         if smbus_present == 0:  # if called from sfputil outside of pmon
-            cmdstatus, register = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0x5'])
+            cmdstatus, register = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x5')
             if cmdstatus:
                 sonic_logger.log_warning("sfp cmdstatus i2c get failed %s" % register )
                 return False
@@ -819,13 +824,13 @@ def tx_disable(self, tx_disable):
 
         pos = [1, 2, 4, 8]
         mask = pos[self.index-SFP_PORT_START]
-        if tx_disable is True:
+        if tx_disable == True:
             setbits = register | mask
         else:
             setbits = register & ~mask
 
         if smbus_present == 0:  # if called from sfputil outside of pmon
-            cmdstatus, output = getstatusoutput_noshell(['sudo', 'i2cset', '-y', '-m', '0x0f', '0', '0x41', '0x5', str(setbits)])
+            cmdstatus, output = cmd.getstatusoutput('sudo i2cset -y -m 0x0f 0 0x41 0x5 %d' % setbits)
             if cmdstatus:
                 sonic_logger.log_warning("sfp cmdstatus i2c write failed %s" % output )
                 return False
@@ -907,7 +912,7 @@ def get_presence(self):
             return False
 
         if smbus_present == 0:  # if called from sfputil outside of pmon
-            cmdstatus, sfpstatus = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0x3'])
+            cmdstatus, sfpstatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x3')
             sfpstatus = int(sfpstatus, 16)
         else:
             bus = smbus.SMBus(0)

platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/sfp_event.py

@@ -1,9 +1,9 @@
 '''
 listen for the SFP change event and return to chassis.
 '''
+import sys
 import time
 from sonic_py_common import logger
-from sonic_py_common.general import getstatusoutput_noshell
 
 smbus_present = 1
 
@@ -12,6 +12,11 @@
 except ImportError as e:
     smbus_present = 0
 
+if sys.version_info[0] < 3:
+    import commands as cmd
+else:
+    import subprocess as cmd
+
 # system level event/error
 EVENT_ON_ALL_SFP = '-1'
 SYSTEM_NOT_READY = 'system_not_ready'
@@ -46,7 +51,7 @@ def deinitialize(self):
     def _get_transceiver_status(self):
         if smbus_present == 0:
             sonic_logger.log_info("  PMON - smbus ERROR - DEBUG sfp_event   ")
-            cmdstatus, sfpstatus = getstatusoutput_noshell(['sudo', 'i2cget', '-y', '0', '0x41', '0x3'])
+            cmdstatus, sfpstatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x3')
             sfpstatus = int(sfpstatus, 16)
         else:
             bus = smbus.SMBus(0)