added descrete speed control for supermicro X10 and X11

Author: natankeddem

hush/hardware/factory.py

@@ -62,10 +62,14 @@ async def driver(
                     cls.drivers[host][group]["instance"] = ilo.iLO4(host, fans=storage.host(host)["ilo4"].get(group, []))
                 elif name == "Supermicro X9":
                     cls.drivers[host][group]["instance"] = supermicro.X9(host)
-                elif name == "Supermicro X10":
+                elif name == "Supermicro X10 All":
                     cls.drivers[host][group]["instance"] = supermicro.X10(host)
-                elif name == "Supermicro X11":
+                elif name == "Supermicro X10 Discrete":
+                    cls.drivers[host][group]["instance"] = supermicro.X10(host, speed_zones=storage.host(host)["supermicro"].get(group, []))
+                elif name == "Supermicro X11 All":
                     cls.drivers[host][group]["instance"] = supermicro.X11(host)
+                elif name == "Supermicro X11 Discrete":
+                    cls.drivers[host][group]["instance"] = supermicro.X11(host, speed_zones=storage.host(host)["supermicro"].get(group, []))
                 elif name == "Cisco M3":
                     cls.drivers[host][group]["instance"] = cisco.M3(host)
                 elif name == "Cisco M4":

hush/hardware/supermicro.py

@@ -15,11 +15,12 @@ class FanMode(IntEnum):
         OPTIMAL = 2
         HEAVYIO = 4
 
-    def __init__(self, host: str) -> None:
+    def __init__(self, host: str, speed_zones=["0x10", "0x11"]) -> None:
         super().__init__(host)
         self.get_oob_credentials()
         self._fan_mode: Optional[X9.FanMode] = None
         self.fru: Optional[dict] = None
+        self.speed_zones = speed_zones
 
     async def close(self):
         await self.set_fan_mode(self.FanMode.STANDARD)
@@ -59,8 +60,8 @@ async def set_speed(self, speed):
         await self.set_fan_mode(self.FanMode.FULL)
         if speed != self._speed:
             pwm = hex(int(speed / (100 / 255)))
-            await self.ipmi.execute(f"raw 0x30 0x91 0x5A 0x03 0x10 {pwm}")
-            await self.ipmi.execute(f"raw 0x30 0x91 0x5A 0x03 0x11 {pwm}")
+            for zone in self.speed_zones:
+                await self.ipmi.execute(f"raw 0x30 0x91 0x5A 0x03 {zone} {pwm}")
             self._speed = speed
 
     async def board_part_number(self) -> str:
@@ -76,16 +77,24 @@ async def board_part_number(self) -> str:
 
 
 class X10(X9):
+    def __init__(self, host, speed_zones=None):
+        super().__init__(host, speed_zones)
+
+    async def get_speed_zones(self):
+        board_part_number = await self.board_part_number()
+        if self.speed_zones:
+            return self.speed_zones
+        else:
+            if "X10DRG" in board_part_number:
+                return ["00", "01", "02", "03"]
+            else:
+                return ["00", "01"]
+
     async def set_speed(self, speed):
         await self.set_fan_mode(self.FanMode.FULL)
         if speed != self._speed:
             pwm = hex(int(speed / (100 / 255)))
-            board_part_number = await self.board_part_number()
-            if "X10DRG" in board_part_number:
-                zones = ["00", "01", "02", "03"]
-            else:
-                zones = ["00", "01"]
-            for zone in zones:
+            for zone in await self.get_speed_zones():
                 await self.ipmi.execute(f"raw 0x30 0x70 0x66 0x01 0x{zone} {pwm}")
             self._speed = speed
 

hush/storage.py

@@ -26,6 +26,12 @@
     if "drive" in hosts[h]:
         if hosts[h]["drive"] == "SMART":
             hosts[h]["drive"] = "SMART All"
+    if "speed" in hosts[h]:
+        if hosts[h]["speed"] == "Supermicro X10":
+            hosts[h]["speed"] = "Supermicro X10 All"
+    if "speed" in hosts[h]:
+        if hosts[h]["speed"] == "Supermicro X11":
+            hosts[h]["speed"] = "Supermicro X11 All"
     if "ilo4" not in hosts[h]:
         hosts[h]["ilo4"] = {}
     if "smart" not in hosts[h]:
@@ -34,6 +40,8 @@
         hosts[h]["chassis"] = "None"
     if "shared" not in hosts[h]:
         hosts[h]["shared"] = {}
+    if "supermicro" not in hosts[h]:
+        hosts[h]["supermicro"] = {}
 
 
 def host(name: str) -> dict:

hush/tabs/configure.py

@@ -39,8 +39,10 @@
     "HP iLO 4 All",
     "HP iLO 4 Discrete",
     "Supermicro X9",
-    "Supermicro X10",
-    "Supermicro X11",
+    "Supermicro X10 All",
+    "Supermicro X10 Discrete",
+    "Supermicro X11 All",
+    "Supermicro X11 Discrete",
     "Cisco M3",
     "Cisco M4",
     "Cisco M5",
@@ -64,6 +66,7 @@ def _build(self):
         self._ilo4 = {}
         self._smart = {}
         self._shared = {}
+        self._supermicro = {}
         self._add_selections()
 
     def _add_selections(self):
@@ -90,6 +93,8 @@ def _add_selections(self):
             self._ilo4["speed"].visible = False
             self._shared["speed"] = el.WRow()
             self._shared["speed"].visible = False
+            self._supermicro["speed"] = el.WRow()
+            self._supermicro["speed"].visible = False
             with el.WRow():
                 self._select["cpu"] = ui.select(
                     cpu_sensor_names,
@@ -168,6 +173,7 @@ async def _store_select(self, group, value):
         await self._build_ilo4_ctrl(group)
         await self._build_smart_ctrl()
         await self._build_shared_ctrl(group)
+        await self._build_supermicro_ctrl(group)
         await Factory.close(self.host, group)
         self._control_rebuild()
 
@@ -243,6 +249,29 @@ async def _build_shared_ctrl(self, group):
             if group in self._ilo4:
                 self._shared[group].visible = False
 
+    async def _build_supermicro_ctrl(self, group):
+        if self._select[group].value == "Supermicro X10 Discrete" or self._select[group].value == "Supermicro X11 Discrete":
+            self._skeleton[group].visible = True
+            self._supermicro[group].bind_visibility_from(self._skeleton[group], value=False)
+            labels = {"speed": "Supermicro Fan Zones"}
+            self._supermicro[group].clear()
+            with self._supermicro[group]:
+                if group == "speed":
+                    options = ["00", "01", "02", "03"]
+                else:
+                    options = []
+                ui.select(
+                    options,
+                    label=labels[group],
+                    value=storage.host(self.host)["supermicro"].get(group, []),
+                    on_change=lambda e: self._store_select_supermicro(group, e.value),
+                    multiple=True,
+                ).classes("col")
+            self._skeleton[group].visible = False
+        else:
+            if group in self._supermicro:
+                self._supermicro[group].visible = False
+
     async def _update_ctrls(self):
         groups = ["speed", "cpu", "pci", "drive", "gpu", "chassis"]
         for group in groups:
@@ -252,12 +281,11 @@ async def _update_ctrls(self):
             await self._build_shared_ctrl(group)
         groups = ["speed", "cpu", "pci"]
         for group in groups:
-            if self._select[group].value == "HP iLO 4 Discrete":
+            if "Discrete" in self._select[group].value:
                 self._skeleton[group].visible = True
         for group in groups:
             await self._build_ilo4_ctrl(group)
-        if self._select["drive"].value == "SMART Discrete":
-            self._skeleton["drive"].visible = True
+            await self._build_supermicro_ctrl(group)
         await self._build_smart_ctrl()
 
     async def _store_select_ilo4(self, group, value):
@@ -272,6 +300,10 @@ async def _store_select_shared(self, group, value):
         storage.host(self.host)["shared"][group] = value
         await Factory.close(self.host, group)
 
+    async def _store_select_supermicro(self, group, value):
+        storage.host(self.host)["supermicro"][group] = value
+        await Factory.close(self.host, group)
+
     async def _test(self, group):
         device = None
         status = None