visualize version numbers according to format x.x.x

https://gitlab.icelab.lenovo.com/pygcon/pyghmi/commit/2ea6994c95f15c5495024e6cda273600dc6b9399 Implement a way to get BIOS number versions in ThinkServers Currently the BIOS version for thinkservers is displaying a string with numbers and letters. This patch changes this situation, allowing to visualize version numbers according to format x.x.x 23.

https://gitlab.icelab.lenovo.com/pygcon/pyghmi/commit/55d158335daf023233c1be5f7581ea95d5c3a392 Fix Bug 50355 - PIT LXCA - Unable to manage Kent successfully (edit)

Change-Id: I074acd578b95bdbe1b0458f50b53294b5d91b76c

pyghmi/ipmi/oem/lenovo/firmware.py

@@ -34,13 +34,23 @@ firmware_fields = (
     inventory.EntryField("DIAG", "16s"))
 
 
-def parse_firmware_info(raw):
+def parse_firmware_info(raw, bios_versions=None):
     bytes_read, data = inventory.parse_inventory_category_entry(
         raw, firmware_fields)
     del data['Revision']
     for key in data:
         yield key, {'version': data[key]}
 
+    if bios_versions is not None:
+        yield ("Bios_bundle_ver",
+               {'version': bios_versions['new_img_version']})
+        yield ("Bios_current_ver",
+               {'version': bios_versions['cur_img_version']})
+
+
+def parse_bios_number(raw):
+    return inventory.parse_bios_number_entry(raw)
+
 
 def get_categories():
     return {
@@ -52,5 +62,15 @@ def get_categories():
                 "command": 0x59,
                 "data": (0x00, 0xc7, 0x00, 0x00)
             }
+        },
+        "bios_version": {
+            "idstr": "Bios Version",
+            "parser": parse_bios_number,
+            "command": {
+                "netfn": 0x32,
+                "command": 0xE8,
+                "data": (0x01, 0x01, 0x02)
+            }
+
         }
     }

pyghmi/ipmi/oem/lenovo/handler.py

@@ -656,7 +656,17 @@ class OEMHandler(generic.OEMHandler):
         if self.has_tsm:
             command = firmware.get_categories()["firmware"]
             rsp = self.ipmicmd.xraw_command(**command["command"])
-            return command["parser"](rsp["data"])
+            # the newest Lenovo ThinkServer versions are returning Bios version
+            # numbers through another command
+            bios_versions = None
+            if self.has_tsm:
+                bios_command = firmware.get_categories()["bios_version"]
+                bios_rsp = self.ipmicmd.xraw_command(**bios_command["command"])
+                bios_versions = bios_command["parser"](bios_rsp["data"])
+
+            # pass bios versions to firmware parser
+            return command["parser"](rsp["data"], bios_versions)
+
         elif self.has_imm:
             return self.immhandler.get_firmware_inventory(bmcver, components)
         elif self.is_fpc:

pyghmi/ipmi/oem/lenovo/inventory.py

@@ -142,3 +142,33 @@ def parse_inventory_category_entry(raw, fields):
     if discard:
         obj = None
     return bytes_read, obj
+
+
+def parse_bios_number_entry(raw):
+    """Parses the Bios number given a raw data.
+
+    :param raw: the raw data to the entry.
+
+    :returns: dict -- structure with read current and newest versions
+    """
+    new_major_version = struct.unpack_from("1B", raw, 25)[0]
+    new_minor_version = struct.unpack_from("1B", raw, 26)[0]
+    new_aux = struct.unpack_from("I", raw, 27)[0]
+
+    cur_major_version = struct.unpack_from("1B", raw, 31)[0]
+    cur_minor_version = struct.unpack_from("1B", raw, 32)[0]
+    cur_aux = struct.unpack_from("I", raw, 33)[0]
+
+    new_image_version = "%s.%s.%s" % (
+        str(new_major_version),
+        str(new_minor_version),
+        str(new_aux))
+    cur_image_version = "%s.%s.%s" % (
+        str(cur_major_version),
+        str(cur_minor_version),
+        str(cur_aux))
+
+    return {
+        'new_img_version': new_image_version,
+        'cur_img_version': cur_image_version
+    }