pyghmi 1.5.58__py3-none-any.whl → 1.5.60__py3-none-any.whl

pyghmi/ipmi/oem/lenovo/handler.py

@@ -1202,7 +1202,7 @@ class OEMHandler(generic.OEMHandler):
         if self.has_xcc:
             return self.immhandler.get_bmc_configuration()
         if self.is_fpc:
-            return self.smmhandler.get_bmc_configuration()
+            return self.smmhandler.get_bmc_configuration(self._fpc_variant)
         if self.has_tsma:
             return self.tsmahandler.get_bmc_configuration()
         return super(OEMHandler, self).get_bmc_configuration()

pyghmi/ipmi/oem/lenovo/imm.py

@@ -1489,12 +1489,23 @@ class XCCClient(IMMClient):
     def _create_array(self, pool):
         params = self._parse_array_spec(pool)
         cid = params['controller'].split(',')[0]
+        cslotno = params['controller'].split(',')[1]
         url = '/api/function/raid_conf?params=raidlink_GetDefaultVolProp'
         args = (url, cid, 0, params['drives'])
         props = self.wc.grab_json_response(','.join([str(x) for x in args]))
+        usesctrlslot = False
         if not props:  # newer firmware requires raidlevel too
             args = (url, cid, params['raidlevel'], 0, params['drives'])
             props = self.wc.grab_json_response(','.join([str(x) for x in args]))
+        elif 'return' in props and props['return'] == 22:
+            # Jan 2023 XCC FW - without controller slot number
+            args = (url, cid, params['raidlevel'], 0, params['drives'])
+            props = self.wc.grab_json_response(','.join([str(x) for x in args]))
+            if 'return' in props and props['return'] == 22:
+                usesctrlslot = True
+                # Jan 2023 XCC FW - with controller slot number
+                args = (url, cid, params['raidlevel'], 0, params['drives'], cslotno)
+                props = self.wc.grab_json_response(','.join([str(x) for x in args]))
         props = props['items'][0]
         volumes = pool.volumes
         remainingcap = params['capacity']
@@ -1565,14 +1576,14 @@ class XCCClient(IMMClient):
         parms = {'raidlink_AddNewVolWithNaAsync': arglist}
         rsp = self.wc.grab_json_response(url, parms)
         if rsp['return'] == 14:  # newer firmware
-            if 'supported_cpwb' in props: # Whitley
+            if 'supported_cpwb' in props and not usesctrlslot: # no ctrl_type
                 arglist = '{0},{1},{2},{3},{4},{5},{6},'.format(
                     cnum, params['raidlevel'], params['spans'],
                     params['perspan'], 0, params['drives'], params['hotspares'])
                 arglist += ''.join(vols)
                 parms = {'raidlink_AddNewVolWithNaAsync': arglist}
                 rsp = self.wc.grab_json_response(url, parms)
-            else: # Purley
+            else: # with ctrl_type
                 if cid[2] == 2:
                     cnum = cid[1]
                 arglist = '{0},{1},{2},{3},{4},{5},'.format(

pyghmi/ipmi/oem/lenovo/nextscale.py

@@ -415,7 +415,7 @@ class SMMClient(object):
         5: 'Boosted',
     }
 
-    def get_bmc_configuration(self):
+    def get_bmc_configuration(self, variant):
         settings = {}
         wc = self.wc
         wc.request(
@@ -453,7 +453,10 @@ class SMMClient(object):
         powercfg = self.ipmicmd.xraw_command(0x32, 0xa2)
         powercfg = bytearray(powercfg['data'])
         if len(powercfg) == 5:
-            powercfg = powercfg[1:]
+            if variant and variant >> 5:
+                powercfg = powercfg[-2:]
+            else:
+                powercfg = powercfg[1:]
         val = powercfg[0]
         if val == 2:
             val = 'N+N'
@@ -700,6 +703,8 @@ class SMMClient(object):
                 if None in powercfg:
                     currcfg = self.ipmicmd.xraw_command(0x32, 0xa2)
                     currcfg = bytearray(currcfg['data'])
+                    if variant and variant >> 5 and len(currcfg) == 5:
+                        currcfg = currcfg[-2:]
                     if powercfg[0] is None:
                         powercfg[0] = currcfg[0]
                     if powercfg[1] is None:

pyghmi/redfish/oem/generic.py

@@ -185,9 +185,9 @@ class OEMHandler(object):
                     return {'bootdev': reqbootdev}
                 except Exception:
                     del payload['BootSourceOverrideMode']
-        thetag = fishclient.sysinfo.get('@odata.etag', None)
+        #thetag = fishclient.sysinfo.get('@odata.etag', None)
         fishclient._do_web_request(fishclient.sysurl, payload, method='PATCH',
-                                   etag=thetag)
+                                   etag='*') # thetag)
         return {'bootdev': reqbootdev}
 
     def _get_cache(self, url):

pyghmi/redfish/oem/lenovo/xcc.py

@@ -811,12 +811,23 @@ class OEMHandler(generic.OEMHandler):
     def _create_array(self, pool):
         params = self._parse_array_spec(pool)
         cid = params['controller'].split(',')[0]
+        cslotno = params['controller'].split(',')[1]
         url = '/api/function/raid_conf?params=raidlink_GetDefaultVolProp'
         args = (url, cid, 0, params['drives'])
         props = self.wc.grab_json_response(','.join([str(x) for x in args]))
-        if not props:  # newer firmwarerequires raidlevel too
+        usesctrlslot = False
+        if not props:  # newer firmware requires raidlevel too
             args = (url, cid, params['raidlevel'], 0, params['drives'])
             props = self.wc.grab_json_response(','.join([str(x) for x in args]))
+        elif 'return' in props and props['return'] == 22:
+            # Jan 2023 XCC FW - without controller slot number
+            args = (url, cid, params['raidlevel'], 0, params['drives'])
+            props = self.wc.grab_json_response(','.join([str(x) for x in args]))
+            if 'return' in props and props['return'] == 22:
+                usesctrlslot = True
+                # Jan 2023 XCC FW - with controller slot number
+                args = (url, cid, params['raidlevel'], 0, params['drives'], cslotno)
+                props = self.wc.grab_json_response(','.join([str(x) for x in args]))
         props = props['items'][0]
         volumes = pool.volumes
         remainingcap = params['capacity']
@@ -888,14 +899,14 @@ class OEMHandler(generic.OEMHandler):
         parms = {'raidlink_AddNewVolWithNaAsync': arglist}
         rsp = self.wc.grab_json_response(url, parms)
         if rsp['return'] == 14:  # newer firmware
-            if 'supported_cpwb' in props: # Whitley
+            if 'supported_cpwb' in props and not usesctrlslot: # no ctrl_type
                 arglist = '{0},{1},{2},{3},{4},{5},{6},'.format(
                     cnum, params['raidlevel'], params['spans'],
                     params['perspan'], 0, params['drives'], params['hotspares'])
                 arglist += ''.join(vols)
                 parms = {'raidlink_AddNewVolWithNaAsync': arglist}
                 rsp = self.wc.grab_json_response(url, parms)
-            else: # Purley
+            else: # with ctrl_type
                 if cid[2] == 2:
                     cnum = cid[1]
                 arglist = '{0},{1},{2},{3},{4},{5},'.format(

{pyghmi-1.5.58.dist-info → pyghmi-1.5.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyghmi
-Version: 1.5.58
+Version: 1.5.60
 Summary: Python General Hardware Management Initiative (IPMI and others)
 Home-page: http://github.com/openstack/pyghmi/
 Author: Jarrod Johnson

{pyghmi-1.5.58.dist-info → pyghmi-1.5.60.dist-info}/RECORD

@@ -26,10 +26,10 @@ pyghmi/ipmi/oem/lenovo/dimm.py,sha256=L8k1aBgtvxqyubDBNKdDkz80pDE8Sck1eMLcMz1GhF
 pyghmi/ipmi/oem/lenovo/drive.py,sha256=MmVgaosEwJXcwi1kKYGnY-dbrx4Zp55941qWMvprUMA,2055
 pyghmi/ipmi/oem/lenovo/energy.py,sha256=1AhpCFBXvlHtDIU8gGYPX6Wd-AjCzSTRxhgusgeXpmE,4980
 pyghmi/ipmi/oem/lenovo/firmware.py,sha256=KS9uUBjFUzvdMw_e-kpr5sYIvFUaeg0yqyo69T94IVc,3747
-pyghmi/ipmi/oem/lenovo/handler.py,sha256=WWU9RWzjZohffPDJqDYDQ_Ly5Iy6-UEwA6-9DKU4D04,56362
-pyghmi/ipmi/oem/lenovo/imm.py,sha256=RNGaCxUoA0_D5kpfAQmRD7_KvMaU8F1IF4iG4BYvCjY,108574
+pyghmi/ipmi/oem/lenovo/handler.py,sha256=ALXoa0kLEdgA5_9UmOEuluR-jIHcZHRGNwW3lfWv2ss,56379
+pyghmi/ipmi/oem/lenovo/imm.py,sha256=ZN5S4s8MXF9pb5-fgjIa2XTHfEYmlaF2i8R4OcsgSe0,109294
 pyghmi/ipmi/oem/lenovo/inventory.py,sha256=FLJJinw-ibdHtf3KmrTzhWXbQrpxq3TSycVf96Hg7cw,5911
-pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=qPQlvsNNvb1Id-ZWl5b0ifwqAwSlGRb6IeD30iJzP_g,42810
+pyghmi/ipmi/oem/lenovo/nextscale.py,sha256=c5eX8fCQdvgZ6_f7k3GYxcJMAc2I0Je6d8M3o_tOSJQ,43041
 pyghmi/ipmi/oem/lenovo/pci.py,sha256=S7p-5Q2qu2YhlffN-LEmIvjfXim6OlfYL7Q6r6VZqJ4,2020
 pyghmi/ipmi/oem/lenovo/psu.py,sha256=ISgGe7MdLd1Z7MiRcgJ0gyC92m-4CDNmhMs-H0T3GVY,3098
 pyghmi/ipmi/oem/lenovo/raid_controller.py,sha256=hr9W17FwgpG9B544eebkEH88gOlU6M4gIapZq7WOPsw,2335
@@ -45,7 +45,7 @@ pyghmi/ipmi/private/util.py,sha256=ayYodiSydlrrt0_pQppoRB1T6n-KNOiHZSfAlCMcpG0,3
 pyghmi/redfish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/command.py,sha256=Eyrjv19rTITztUlZvUZvYovr9sNE4EmmMOFnAlwxarg,57541
 pyghmi/redfish/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/generic.py,sha256=Mdvw6NSMMmRglnAAIK3xTroTTQSNAhRMYmK7C9CnlSo,31323
+pyghmi/redfish/oem/generic.py,sha256=V9Jh_H0weFU0KqClTos_monqspV33PJPYFvO4dQ6jIk,31331
 pyghmi/redfish/oem/lookup.py,sha256=pfJW5xSkUY61OirMeYy0b1SbjBFz6IDfN5ZOYog_Yq4,1530
 pyghmi/redfish/oem/dell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/dell/idrac.py,sha256=pNnmqdV1sOP3ABw0xq0wF1QEO2L8onT7Osc_-sDO8EU,2146
@@ -53,7 +53,7 @@ pyghmi/redfish/oem/dell/main.py,sha256=g8773SShUpbYxXB9zVx2pD5z1xP04wB_sXAxcAs6_
 pyghmi/redfish/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/lenovo/main.py,sha256=eaCoePPXAw78BjKj9Ht7cqiXVGlj26Effy5_ybCnVDY,1622
 pyghmi/redfish/oem/lenovo/tsma.py,sha256=puSj0fO5Dt5VpDoEMVTRY95CP9q18eXcAqq7TDK350E,34633
-pyghmi/redfish/oem/lenovo/xcc.py,sha256=09-QI-iTcYWOjiqoCUF_JH8v1vW6vuH4vCienKF21Ik,75508
+pyghmi/redfish/oem/lenovo/xcc.py,sha256=yEfdv91bvbcuulmlCAltQ2WhO8CnH-jfzWgISnTikS0,76229
 pyghmi/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/tests/unit/base.py,sha256=xWImA7zPRgfrEe2xAdRZ6w_dLwExGRBJ5CBybssUQGg,744
@@ -62,11 +62,11 @@ pyghmi/tests/unit/ipmi/test_sdr.py,sha256=vb3iLY0cnHJ2K_m4xgYUjEcbPd_ZYhYx-uBowB
 pyghmi/util/__init__.py,sha256=GZLBWJiun2Plb_VE9dDSh4_PQMCha3gA7QLUqx3oSYI,25
 pyghmi/util/parse.py,sha256=6VlyBCEcE8gy8PJWmEDdtCyWATaKwPaTswCdioPCWOE,2120
 pyghmi/util/webclient.py,sha256=i3ZVQEO68Bq4EqkmN8jysXPGQjTvDzVl2-hZxq4zBWQ,14150
-pyghmi-1.5.58.dist-info/AUTHORS,sha256=Y5fQrIX2SnPK6llV0RjxLtWUQk4PCaAnsGHXU74foik,2007
-pyghmi-1.5.58.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.5.58.dist-info/METADATA,sha256=RVWUhtN--9bAl12euX3hqzrHBTqPyRO_g1gON-2vnd4,1119
-pyghmi-1.5.58.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-pyghmi-1.5.58.dist-info/entry_points.txt,sha256=WkbeJkEZzG9MOILxkaEPSEQ109YP9euntH9kcxbysuk,169
-pyghmi-1.5.58.dist-info/pbr.json,sha256=vlgsyAtUx3OK0xo4qAz99c8SDczSr5a5OPQ0vjXRuas,46
-pyghmi-1.5.58.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.5.58.dist-info/RECORD,,
+pyghmi-1.5.60.dist-info/AUTHORS,sha256=Y5fQrIX2SnPK6llV0RjxLtWUQk4PCaAnsGHXU74foik,2007
+pyghmi-1.5.60.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.5.60.dist-info/METADATA,sha256=DOxNUHbD68zv-_6XBJHC5XFGaArAXWBUIkgESALHggs,1119
+pyghmi-1.5.60.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+pyghmi-1.5.60.dist-info/entry_points.txt,sha256=WkbeJkEZzG9MOILxkaEPSEQ109YP9euntH9kcxbysuk,169
+pyghmi-1.5.60.dist-info/pbr.json,sha256=TWeoCrKqtAI3uE3HiYRdHkejnC6F4JIglclQVsn2d2k,46
+pyghmi-1.5.60.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.5.60.dist-info/RECORD,,

pyghmi-1.5.60.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "bcfbd8f", "is_release": true}

pyghmi-1.5.58.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "14652e8", "is_release": true}