[device][platform] Modify for test_component.py, test_fan_drawer.py, and test_psu.py of testbed

Author: roberthong-qct

device/quanta/x86_64-quanta_ix7_rglbmc-r0/platform.json

@@ -28,7 +28,7 @@
                 "name": "MB_CPLD_IO_2"
             },
             {
-                "name": "MB_CPLD_LED_2"
+                "name": "MB_CPLD_LED_1"
             },
             {
                 "name": "MB_CPLD_LED_2"
@@ -308,7 +308,7 @@
         ],
         "psus": [
             {
-                "name": "PSU 1",
+                "name": "PSU1",
                 "status_led": {
                     "controllable": false
                 },
@@ -325,7 +325,7 @@
                 ]
             },
             {
-                "name": "PSU 2",
+                "name": "PSU2",
                 "status_led": {
                     "controllable": false
                 },

platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_hwmon_ipmi.c

@@ -28,7 +28,7 @@
 #define __TO_R_EXP(bacc)  (int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
 #define __TO_B_EXP(bacc)  (int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
 
-#define SENSOR_ATTR_MAX         19
+#define SENSOR_ATTR_MAX         20
 #define SENSOR_ATTR_NAME_LENGTH	20
 
 #define SENSOR_GET_CAP_LABEL  0x001
@@ -55,6 +55,7 @@
 #define SENSOR_GET_CAP_MFRID    0x10000
 #define SENSOR_GET_CAP_VIN_TYPE	0x20000
 #define SENSOR_GET_CAP_POUT_MAX	0x40000
+#define SENSOR_GET_CAP_HW_REV   0x80000
 
 #define SDR_SENSOR_TYPE_TEMP  0x01
 #define SDR_SENSOR_TYPE_VOLT  0x02
@@ -1013,6 +1014,7 @@ void ipmi_sdr_set_sensor_factor(uint8_t idx,
           g_sensor_data[idx].capability |= SENSOR_GET_CAP_PSU_PRESENT;
           g_sensor_data[idx].capability |= SENSOR_GET_CAP_VIN_TYPE;
           g_sensor_data[idx].capability |= SENSOR_GET_CAP_POUT_MAX;
+		  g_sensor_data[idx].capability |= SENSOR_GET_CAP_HW_REV;		  
         }
         sprintf(g_sensor_data[idx].attrinfo.attr_type_str, "power");
       }
@@ -1424,6 +1426,13 @@ static ssize_t show_model(struct device *dev, struct device_attribute *devattr,
   return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9a, buf);
 }
 
+static ssize_t show_hw_rev(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+  struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+  return ipmi_get_psu_info(attr->index + DEBUGUSE_SHIFT, 0x9b, buf);
+}
+
 static ssize_t show_sn(struct device *dev, struct device_attribute *devattr,
                        char *buf)
 {
@@ -1559,7 +1568,7 @@ static ssize_t(*const attr_show_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
   , show_model, show_sn, show_pwm
   , show_controlmode, show_direction, show_fanpresent
   , show_psupresent, show_mfrid, show_vin_type
-  , show_pout_max
+  , show_pout_max, show_hw_rev
 };
 
 static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
@@ -1571,7 +1580,7 @@ static ssize_t(*const attr_store_func_ptr[SENSOR_ATTR_MAX])(struct device *dev,
   , NULL, NULL, store_pwm
   , store_controlmode, NULL, NULL
   , NULL, NULL, NULL
-  , NULL
+  , NULL, NULL
 };
 
 static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
@@ -1582,7 +1591,7 @@ static const char *const sensor_attrnames[SENSOR_ATTR_MAX] =
   , "%s%d_model", "%s%d_sn", "%s%d_pwm"
   , "%s%d_controlmode", "%s%d_direction", "%s%d_present"
   , "%s%d_present", "%s%d_mfrid", "%s%d_vin_type"
-  , "%s%d_pout_max"
+  , "%s%d_pout_max", "%s%d_hw_rev"
 };
 
 static int32_t create_sensor_attrs(int32_t attr_no)

platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/component.py

@@ -27,9 +27,94 @@ def __init__(self):
     def get_name(self):
         return self.name
 
+    def get_model(self):
+        """
+        Retrieves the part number of the component
+        Returns:
+            string: Part number of component
+        """
+        return 'N/A'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the component
+        Returns:
+            string: Serial number of component
+        """
+        return 'N/A'
+
+    def get_presence(self):
+        """
+        Retrieves the presence of the component
+        Returns:
+            bool: True if  present, False if not
+        """
+        return True
+
+    def get_status(self):
+        """
+        Retrieves the operational status of the component
+        Returns:
+            bool: True if component is operating properly, False if not
+        """
+        return True
+
+    def get_position_in_parent(self):
+        """
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return -1
+
+    def is_replaceable(self):
+        """
+        Indicate whether component is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return False
+
     def get_description(self):
         return self.description
 
+    def get_available_firmware_version(self, image_path):
+        """
+        Retrieves the available firmware version of the component
+        Note: the firmware version will be read from image
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A string containing the available firmware version of the component
+        """
+        return "N/A"
+
+    def get_firmware_update_notification(self, image_path):
+        """
+        Retrieves a notification on what should be done in order to complete
+        the component firmware update
+        Args:
+            image_path: A string, path to firmware image
+        Returns:
+            A string containing the component firmware update notification if required.
+            By default 'None' value will be used, which indicates that no actions are required
+        """
+        return "None"
+
+    def update_firmware(self, image_path):
+        """
+        Updates firmware of the component
+        This API performs firmware update: it assumes firmware installation and loading in a single call.
+        In case platform component requires some extra steps (apart from calling Low Level Utility)
+        to load the installed firmware (e.g, reboot, power cycle, etc.) - this will be done automatically by API
+        Args:
+            image_path: A string, path to firmware image
+        Raises:
+            RuntimeError: update failed
+        """
+        return False
+
     def install_firmware(self, image_path):
         """
         Installs firmware to the component

platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/fan_drawer.py

@@ -38,6 +38,22 @@ def get_presence(self):
         """
         return self._fan_list[0].get_presence()
 
+    def get_model(self):
+        """
+        Retrieves the part number of the component
+        Returns:
+            string: Part number of component
+        """
+        return 'N/A'
+
+    def get_serial(self):
+        """
+        Retrieves the serial number of the component
+        Returns:
+            string: Serial number of component
+        """
+        return 'N/A'
+
     def get_status(self):
         """
         Retrieves the operational status of the device
@@ -88,4 +104,13 @@ def get_status_led(self):
             else:
                 return self.STATUS_LED_COLOR_RED
         else:
-            return self.STATUS_LED_COLOR_OFF
+            return self.STATUS_LED_COLOR_OFF
+
+    def get_maximum_consumed_power(self):
+        """
+        Retrives the maximum power drawn by Fan Drawer
+        Returns:
+            A float, with value of the maximum consumable power of the
+            component.
+        """
+        return 0.0

platform/broadcom/sonic-platform-modules-quanta/ix7-32x/sonic_platform/psu.py

@@ -46,20 +46,29 @@ def __init__(self, index):
             1:46,
             2:56,
         }
+        self.psu_temp_index_mapping = {
+            1:43,
+            2:53,
+        }
         self.index                = index
         self.psu_presence_attr    = "power{}_present".format(self.psu_index_mapping[self.index])
         self.psu_status_attr      = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
         self.psu_power_in_attr    = "power{}_input".format(self.psu_powerin_index_mapping[self.index])
         self.psu_power_out_attr   = "power{}_input".format(self.psu_index_mapping[self.index])
         self.psu_voltage_out_attr = "in{}_input".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_vout_high_th_attr= "in{}_ncrit".format(self.psu_voltageout_index_mapping[self.index])
+        self.psu_vout_low_th_attr = "in{}_lncrit".format(self.psu_voltageout_index_mapping[self.index])
         self.psu_current_out_attr = "curr{}_input".format(self.psu_currentout_index_mapping[self.index])
-        self.psu_voltage_in_attr = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
-        self.psu_current_in_attr = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
+        self.psu_voltage_in_attr  = "in{}_input".format(self.psu_voltagein_index_mapping[self.index])
+        self.psu_current_in_attr  = "curr{}_input".format(self.psu_currentin_index_mapping[self.index])
         self.psu_serial_attr      = "power{}_sn".format(self.psu_index_mapping[self.index])
         self.psu_model_attr       = "power{}_model".format(self.psu_index_mapping[self.index])
         self.psu_mfr_id_attr      = "power{}_mfrid".format(self.psu_index_mapping[self.index])
         self.psu_capacity_attr    = "power{}_pout_max".format(self.psu_index_mapping[self.index])
         self.psu_type_attr        = "power{}_vin_type".format(self.psu_index_mapping[self.index])
+        self.psu_revision_attr    = "power{}_hw_rev".format(self.psu_index_mapping[self.index])
+        self.psu_temp_attr        = "temp{}_input".format(self.psu_temp_index_mapping[self.index])
+        self.psu_temp_high_th_attr= "temp{}_ncrit".format(self.psu_temp_index_mapping[self.index])
 
     def __get_attr_value(self, attr_path):
 
@@ -154,6 +163,29 @@ def get_serial(self):
 
         return serial
 
+    def get_revision(self):
+        """
+        Retrives thehardware revision of the device
+        Returns:
+            String: revision value of device
+        """
+        revision = "N/A"
+        attr_path = HWMON_DIR+self.psu_revision_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            revision = attr_rv
+
+        return revision
+
+    def is_replaceable(self):
+        """
+        Indicate whether this PSU is replaceable.
+        Returns:
+            bool: True if it is replaceable.
+        """
+        return True
+
     def get_status(self):
         """
         Retrieves the operational status of the device
@@ -194,6 +226,34 @@ def get_voltage(self):
 
         return voltage_out
 
+    def get_voltage_low_threshold(self):
+        """
+        Returns PSU low threshold in Volts
+        """
+        vout_low_th = 0.0
+        attr_path = HWMON_DIR+self.psu_vout_low_th_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            vout_low_th = float(attr_rv) / 1000
+
+        return vout_low_th
+
+    def get_voltage_high_threshold(self):
+        """
+        Returns PSU high threshold in Volts
+        """
+        vout_high_th = 0.0
+        attr_path = HWMON_DIR+self.psu_vout_high_th_attr
+
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            attr_rv, dummy = attr_rv.split('.', 1)
+            vout_high_th = float(attr_rv) / 1000
+
+        return vout_high_th
+
     def get_current(self):
         """
         Retrieves present electric current supplied by PSU
@@ -259,7 +319,7 @@ def get_power(self):
         attr_rv = self.__get_attr_value(attr_path)
         if (attr_rv != 'ERR'):
             attr_rv, dummy = attr_rv.split('.', 1)
-            power_out = float(attr_rv) / 1000
+            power_out = float(attr_rv) / 1000.0
 
         return power_out
 
@@ -300,21 +360,58 @@ def get_type(self):
 
         return type
 
-    def get_capacity(self):
+    def get_position_in_parent(self):
         """
-        Gets the capacity (maximum output power) of the PSU in watts
+        Retrieves 1-based relative physical position in parent device.
+        Returns:
+            integer: The 1-based relative physical position in parent
+            device or -1 if cannot determine the position
+        """
+        return self.index
 
+    def get_maximum_supplied_power(self):
+        """
+        Retrieves the maximum supplied power by PSU
         Returns:
-            An integer, the capacity of PSU
+            A float number, the maximum power output in Watts.
+            e.g. 1200.1
         """
-        capacity = 0
+        capacity = 0.0
         attr_path = HWMON_DIR+self.psu_capacity_attr
         attr_rv = self.__get_attr_value(attr_path)
         if (attr_rv != 'ERR'):
             try:
-                capacity = int(attr_rv)
+                capacity = float(attr_rv)
             except ValueError:
-                capacity = 0
+                capacity = 0.0
 
         return capacity
 
+    def get_temperature(self):
+        """
+        Retrieves current temperature reading from PSU
+        Returns:
+            A float number of current temperature in Celsius up to nearest thousandth
+            of one degree Celsius, e.g. 30.125
+        """
+
+        tout = 0.0
+        attr_path = HWMON_DIR+self.psu_temp_attr
+        attr_rv = self.__get_attr_value(attr_path)
+        if (attr_rv != 'ERR'):
+            tout = float(attr_rv)/1000.0
+
+        # tout is in milli degree celcius
+        return tout
+
+    def get_temperature_high_threshold(self):
+        """
+        Returns the high temperature threshold for PSU in Celsius
+        """
+        attr_path = HWMON_DIR+self.psu_temp_high_th_attr
+        attr_rv = self.__get_attr_value(attr_path)
+
+        if (attr_rv != 'ERR'):
+            return float(attr_rv) / 1000
+        else:
+            return None