[Celestica/sonic_platform]: Fixed failed test cases in Haliburton pla…

…tform testing (#8815) * [device/celestica-e1031]: fix apis follow lastest spec * [device/celestica-e1031]: fix lgtm (#261)
sonic-net · Oct 8, 2021 · 57df98f · 57df98f
1 parent 040d5f3
commit 57df98f
Show file tree

Hide file tree

Showing 6 changed files with 478 additions and 111 deletions.
diff --git a/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hwsku.json b/device/celestica/x86_64-cel_e1031-r0/Celestica-E1031-T48S4/hwsku.json
@@ -0,0 +1,224 @@
+{
+ "interfaces": {
+ "Ethernet0": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet1": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet2": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet3": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet4": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet5": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet6": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet7": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet8": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet9": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet10": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet11": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet12": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet13": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet14": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet15": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet16": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet17": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet18": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet19": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet20": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet21": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet22": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet23": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet24": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet25": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet26": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet27": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet28": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet29": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet30": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet31": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet32": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet33": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet34": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet35": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet36": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet37": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet38": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet39": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet40": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet41": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet42": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet43": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet44": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet45": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet46": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet47": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet48": {
+ "default_brkout_mode": "1x10G",
+ "port_type": "SFP+"
+ },
+ "Ethernet49": {
+ "default_brkout_mode": "1x10G",
+ "port_type": "SFP+"
+ },
+ "Ethernet50": {
+ "default_brkout_mode": "1x10G",
+ "port_type": "SFP+"
+ },
+ "Ethernet51": {
+ "default_brkout_mode": "1x10G",
+ "port_type": "SFP+"
+ },
+ "Ethernet52": {
+ "default_brkout_mode": "1x1G",
+ "port_type": "RJ45"
+ },
+ "Ethernet53": {
+ "default_brkout_mode": "1x21G",
+ "port_type": "RJ45"
+ },
+ "Ethernet54": {
+ "default_brkout_mode": "1x21G",
+ "port_type": "RJ45"
+ }
+ } 
+}
diff --git a/device/celestica/x86_64-cel_e1031-r0/platform.json b/device/celestica/x86_64-cel_e1031-r0/platform.json
@@ -91,9 +91,6 @@
  }
  ],
  "sfps": [
- {
- "name": "Ethernet54"
- },
  {
  "name": "Ethernet0"
  },
@@ -255,6 +252,9 @@
  },
  {
  "name": "Ethernet53"
+ },
+ {
+ "name": "Ethernet54"
  }
  ]
  },

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py
@@ -236,17 +236,10 @@ def get_sfp(self, index):
  Returns:
  An object dervied from SfpBase representing the specified sfp
  """
- sfp = None
  if not self.sfp_module_initialized:
  self.__initialize_sfp()
 
- try:
- # The index will start from 1
- sfp = self._sfp_list[index-1]
- except IndexError:
- print("SFP index {} out of range (1-{})\n".format(
- index, len(self._sfp_list)))
- return sfp
+ return super(Chassis, self).get_sfp(index - 1)
 
  ##############################################################
  ################## ThermalManager methods ####################

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan.py
@@ -145,7 +145,7 @@ def get_target_speed(self):
  0 : when PWM mode is use
  pwm : when pwm mode is not use
  """
- target = NULL_VAL
+ target = 0
  if not self.is_psu_fan:
  chip = self.emc2305_chip_mapping[self.fan_index]
  device = chip['device']

diff --git a/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py b/device/celestica/x86_64-cel_e1031-r0/sonic_platform/fan_drawer.py
@@ -14,6 +14,7 @@
  raise ImportError(str(e) + "- required module not found")
 
 NUM_FAN = 1
+MAX_FAN_WATT = 10.0
 
 
 class FanDrawer(FanDrawerBase):
@@ -47,6 +48,15 @@ def get_status_led(self, color=None):
  """
  return self._fan_list[0].get_status_led()
 
+ 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 MAX_FAN_WATT
+
  ##############################################################
  ###################### Device methods ########################
  ##############################################################