pyghmi 1.6.3__py3-none-any.whl → 1.6.4__py3-none-any.whl

pyghmi/redfish/command.py

@@ -415,8 +415,11 @@ class Command(object):
             Operator, and ReadOnly
         """
         accinfo = self._account_url_info_by_id(uid)
-        if not accinfo:
-            raise Exception("Unable to find indicated uid")
+        if accinfo:
+            method = 'PATCH'
+        else:
+            accinfo = (self._accountserviceurl + '/Accounts', {})
+            method = 'POST'
         if privilege_level.startswith('custom.'):
             privilege_level = privilege_level.replace('custom.', '')
         for role in self._validroles:
@@ -429,7 +432,7 @@ class Command(object):
             "Password": password,
             "RoleId": privilege_level,
         }
-        self._do_web_request(accinfo[0], userinfo, method='PATCH', etag=etag)
+        self._do_web_request(accinfo[0], userinfo, method=method, etag=etag)
         return True
 
     def get_screenshot(self, outfile):

pyghmi/redfish/oem/generic.py

@@ -21,6 +21,7 @@ import re
 from datetime import datetime
 from datetime import timedelta
 from dateutil import tz
+import socket
 import time
 
 import pyghmi.constants as const
@@ -1065,22 +1066,7 @@ class OEMHandler(object):
 
     def update_firmware(self, filename, data=None, progress=None, bank=None, otherfields=()):
         # disable cache to make sure we trigger the token renewal logic if needed
-        usd = self._do_web_request('/redfish/v1/UpdateService', cache=False)
-        upurl = usd.get('MultipartHttpPushUri', None)
-        ismultipart = True
-        if not upurl:
-            ismultipart = False
-            if usd.get('HttpPushUriTargetsBusy', False):
-                raise exc.TemporaryError('Cannot run multtiple updates to '
-                                            'same target concurrently')
-            try:
-                upurl = usd['HttpPushUri']
-            except KeyError:
-                raise exc.UnsupportedFunctionality('Redfish firmware update only supported for implementations with push update support')
-            if 'HttpPushUriTargetsBusy' in usd:
-                self._do_web_request(
-                    '/redfish/v1/UpdateService',
-                    {'HttpPushUriTargetsBusy': True}, method='PATCH')
+        usd, upurl, ismultipart = self.retrieve_firmware_upload_url()
         try:
             uploadthread = webclient.FileUploader(
                 self.webclient, upurl, filename, data, formwrap=ismultipart,
@@ -1105,8 +1091,19 @@ class OEMHandler(object):
                 except Exception:
                     raise Exception(uploadthread.rsp)
                 raise Exception(errmsg)
+            return self.continue_update(uploadthread, progress)
+        finally:
+            if 'HttpPushUriTargetsBusy' in usd:
+                self._do_web_request(
+                    '/redfish/v1/UpdateService',
+                    {'HttpPushUriTargetsBusy': False}, method='PATCH')
+
+    def continue_update(self, uploadthread, progress):
             rsp = json.loads(uploadthread.rsp)
             monitorurl = rsp['@odata.id']
+            return self.monitor_update_progress(monitorurl, progress)
+    
+    def monitor_update_progress(self, monitorurl, progress):
             complete = False
             phase = "apply"
             statetype = 'TaskState'
@@ -1151,11 +1148,26 @@ class OEMHandler(object):
             if not retry:
                 raise Exception('Falied to monitor update progress due to excessive timeouts')
             return 'pending'
-        finally:
+
+
+    def retrieve_firmware_upload_url(self):
+        usd = self._do_web_request('/redfish/v1/UpdateService', cache=False)
+        upurl = usd.get('MultipartHttpPushUri', None)
+        ismultipart = True
+        if not upurl:
+            ismultipart = False
+            if usd.get('HttpPushUriTargetsBusy', False):
+                raise exc.TemporaryError('Cannot run multtiple updates to '
+                                            'same target concurrently')
+            try:
+                upurl = usd['HttpPushUri']
+            except KeyError:
+                raise exc.UnsupportedFunctionality('Redfish firmware update only supported for implementations with push update support')
             if 'HttpPushUriTargetsBusy' in usd:
-                self._do_web_request(
-                    '/redfish/v1/UpdateService',
-                    {'HttpPushUriTargetsBusy': False}, method='PATCH')
+                self._do_web_request('/redfish/v1/UpdateService',
+                    {'HttpPushUriTargetsBusy': True}, method='PATCH')
+                    
+        return usd,upurl,ismultipart
 
 
     def _do_bulk_requests(self, urls, cache=True):
@@ -1191,17 +1203,21 @@ class OEMHandler(object):
             wc.stdheaders['X-Auth-Token'] = self.xauthtoken
             self.webclient.stdheaders['X-Auth-Token'] = self.xauthtoken
 
-    def _do_web_request(self, url, payload=None, method=None, cache=True):
+    def _do_web_request(self, url, payload=None, method=None, cache=True, etag=None):
         res = None
         if cache and payload is None and method is None:
             res = self._get_cache(url)
         if res:
             return res
         wc = self.webclient.dupe()
+        if etag:
+            wc.stdheaders['If-Match'] = etag
         res = wc.grab_json_response_with_status(url, payload, method=method)
         if res[1] == 401 and 'X-Auth-Token' in self.webclient.stdheaders:
             wc.set_basic_credentials(self.username, self.password)
             self._get_session_token(wc)
+            if etag:
+                wc.stdheaders['If-Match'] = etag
             res = wc.grab_json_response_with_status(url, payload,
                                                     method=method)
         if res[1] < 200 or res[1] >= 300:

pyghmi/redfish/oem/lenovo/smm3.py

@@ -19,6 +19,7 @@ import pyghmi.constants as pygconst
 import pyghmi.util.webclient as webclient
 import pyghmi.exceptions as exc
 import time
+import socket
 
 healthlookup = {
     'ok': pygconst.Health.Ok,
@@ -78,6 +79,37 @@ class OEMHandler(generic.OEMHandler):
     def get_system_configuration(self, hideadvanced=True, fishclient=None):
         return {}
 
+    def retrieve_firmware_upload_url(self):
+        # SMMv3 needs to do the non-multipart upload
+        usd = self._do_web_request('/redfish/v1/UpdateService', cache=False)
+        if usd.get('HttpPushUriTargetsBusy', False):
+                raise exc.TemporaryError('Cannot run multtiple updates to '
+                                            'same target concurrently')
+        try:
+            upurl = usd['HttpPushUri']
+        except KeyError:
+            raise exc.UnsupportedFunctionality('Redfish firmware update only supported for implementations with push update support')
+        if 'HttpPushUriTargetsBusy' in usd:
+            self._do_web_request(
+                '/redfish/v1/UpdateService',
+                {'HttpPushUriTargetsBusy': True}, method='PATCH')
+        return usd,upurl,False
+
+    def continue_update(self, uploadthread, progress):
+        # SMMv3 does not provide a response, must hardcode the continuation
+        # /redfish/v1/UpdateService/FirmwareInventory/fwuimage
+        rsp = self._do_web_request('/redfish/v1/UpdateService/FirmwareInventory/fwuimage')
+        for ri in rsp.get('RelatedItem', []):
+            targ = ri.get('@odata.id', None)
+        parms = {'Oem': {'Lenovo': {'SecureRollBack': False}}}
+        rsp = self._do_web_request('/redfish/v1/UpdateService', parms, method='PATCH')
+        targspec = {'target': targ}
+        rsp = self._do_web_request('/redfish/v1/UpdateService/Actions/UpdateService.StartUpdate', targspec)
+        monitorurl = rsp.get('@odata.id', None)
+        return self.monitor_update_progress(monitorurl, progress)
+        
+
+
     def get_diagnostic_data(self, savefile, progress=None, autosuffix=False):
         tsk = self._do_web_request(
             '/redfish/v1/Managers/bmc/LogServices/Dump/Actions/LogService.CollectDiagnosticData',

pyghmi/redfish/oem/lenovo/xcc3.py

@@ -950,8 +950,10 @@ class OEMHandler(generic.OEMHandler):
         acctattribs = {}
         usbsettings = {}
         bmchangeset = {}
+        rawchangeset = {}
         for key in changeset:
             if isinstance(changeset[key], str):
+                rawchangeset[key] = changeset[key]
                 changeset[key] = {'value': changeset[key]}
             currval = changeset[key].get('value', None)
             if key == 'password_complexity':
@@ -967,7 +969,10 @@ class OEMHandler(generic.OEMHandler):
                     elif currval and 'enabled'.startswith(currval):
                         currval = 'True'
             else:
-                currval = int(currval)
+                try:
+                    currval = int(currval)
+                except ValueError:
+                    pass
             if key.lower() in self.oemacctmap:
                 if 'Oem' not in acctattribs:
                     acctattribs['Oem'] = {'Lenovo': {}}
@@ -984,7 +989,7 @@ class OEMHandler(generic.OEMHandler):
                     'usb_forwarded_ports'):
                 usbsettings[key] = currval
             else:
-                bmchangeset[key.replace('bmc.', '')] = changeset[key]
+                bmchangeset[key.replace('bmc.', '')] = rawchangeset[key]
         if acctattribs:
             self._do_web_request(
                 '/redfish/v1/AccountService', acctattribs, method='PATCH')

pyghmi/util/webclient.py

@@ -24,6 +24,7 @@ import json
 import socket
 import ssl
 import threading
+import os
 
 import six
 
@@ -97,6 +98,8 @@ class FileDownloader(threading.Thread):
 
 
 def get_upload_form(filename, data, formname, otherfields, boundary=BND):
+    if not boundary:
+        boundary = base64.b64encode(os.urandom(54))[:70]
     ffilename = filename.split('/')[-1]
     if not formname:
         formname = ffilename
@@ -124,8 +127,8 @@ def get_upload_form(filename, data, formname, otherfields, boundary=BND):
                       formname, ffilename).encode('utf-8'))
         form += b'Content-Type: application/octet-stream\r\n\r\n' + data
         form += b'\r\n--' + boundary + b'--\r\n'
-        uploadforms[filename] = form
-        return form
+        uploadforms[filename] = form, boundary
+        return uploadforms[filename]
 
 
 class SecureHTTPConnection(httplib.HTTPConnection, object):
@@ -142,6 +145,7 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
         self.broken = False
         self.thehost = host
         self.theport = port
+        self._upbuffer = None
         try:
             httplib.HTTPConnection.__init__(self, host, port, strict=strict,
                                             **kwargs)
@@ -332,16 +336,16 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
                      the file.
         :return:
         """
-        boundary = base64.b64encode(os.urandom(54))[:70]
         if data is None:
             data = open(filename, 'rb')
         ulhdrs = self.stdheaders.copy()
         if formwrap:
-            self._upbuffer = io.BytesIO(get_upload_form(
-                filename, data, formname, otherfields, boundary))
-            ulhdrs['Content-Type'] = b'multipart/form-data; boundary=' + boundary
-            ulhdrs['Content-Length'] = len(uploadforms[filename])
-            self.ulsize = len(uploadforms[filename])
+            guf = get_upload_form(
+                filename, data, formname, otherfields, boundary=None)
+            self._upbuffer = io.BytesIO(guf[0])
+            ulhdrs['Content-Type'] = b'multipart/form-data; boundary=' + guf[1]
+            ulhdrs['Content-Length'] = len(uploadforms[filename][0])
+            self.ulsize = len(uploadforms[filename][0])
         else:
             canseek = True
             try:
@@ -384,6 +388,8 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
         return body
 
     def get_upload_progress(self):
+        if self._upbuffer is None:
+            return 0.0
         return float(self._upbuffer.tell()) / float(self.ulsize)
 
     def request(self, method, url, body=None, headers=None, referer=None):

{pyghmi-1.6.3.dist-info → pyghmi-1.6.4.dist-info}/METADATA

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

{pyghmi-1.6.3.dist-info → pyghmi-1.6.4.dist-info}/RECORD

@@ -43,19 +43,19 @@ pyghmi/ipmi/private/simplesession.py,sha256=cNGaoT0uWIKDut6gUG9kAOX_b_qTzdB26R6I
 pyghmi/ipmi/private/spd.py,sha256=oEPSXm19X2eNXDiyW_6fVjBFqhuuMAtBI9quRJgclH4,27094
 pyghmi/ipmi/private/util.py,sha256=ayYodiSydlrrt0_pQppoRB1T6n-KNOiHZSfAlCMcpG0,3847
 pyghmi/redfish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/command.py,sha256=0mLgsynfiyfi_i4wtL3ZqPR6CeeHajj-azqTW7EUE3I,61278
+pyghmi/redfish/command.py,sha256=_HLICBri_ON1GqSqqPNWoNKnGz7YBrqHo_l6tjGRiDc,61350
 pyghmi/redfish/oem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyghmi/redfish/oem/generic.py,sha256=OvkQV3-p6aoY-oeVNSpfChpAuh1iDOV8OXdWuz7tW9Q,56747
+pyghmi/redfish/oem/generic.py,sha256=fX6ADqGURX9cQr-Q8cyncQtxLM1oz5CMv57IQ8ijxoY,57313
 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
 pyghmi/redfish/oem/dell/main.py,sha256=g8773SShUpbYxXB9zVx2pD5z1xP04wB_sXAxcAs6_xY,793
 pyghmi/redfish/oem/lenovo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyghmi/redfish/oem/lenovo/main.py,sha256=bnx8LuC_C4_OluNR8JSHIxtSlM4_jdBb4cUzJM6mazE,2597
-pyghmi/redfish/oem/lenovo/smm3.py,sha256=W3PKHpFNj5Ujql-neWTH3UgYGDZXQlBvC1aRX97GV8A,5982
+pyghmi/redfish/oem/lenovo/smm3.py,sha256=QHasf5QofFuYqtHPeqcwCEJUbd0PV5_C6u-Y8FVdqCk,7598
 pyghmi/redfish/oem/lenovo/tsma.py,sha256=6GELCuriumARj_kv7fgqtUpo9ekiWHpQcM9v_mnGILI,34645
 pyghmi/redfish/oem/lenovo/xcc.py,sha256=78ksNj2-0jquj61lmAZldy3DdcR5KndqbLQ2Y4ZSFOM,84234
-pyghmi/redfish/oem/lenovo/xcc3.py,sha256=Uu6VjvUNZgNkAW5slEGckFR55htALbrxvVUjkIy-1g8,55678
+pyghmi/redfish/oem/lenovo/xcc3.py,sha256=8LxWzqXCkNmQ9PT-bu2ZSvgziTar3u1J37x8IRBshx8,55843
 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
@@ -63,12 +63,12 @@ pyghmi/tests/unit/ipmi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 pyghmi/tests/unit/ipmi/test_sdr.py,sha256=vb3iLY0cnHJ2K_m4xgYUjEcbPd_ZYhYx-uBowByplXw,824
 pyghmi/util/__init__.py,sha256=GZLBWJiun2Plb_VE9dDSh4_PQMCha3gA7QLUqx3oSYI,25
 pyghmi/util/parse.py,sha256=6VlyBCEcE8gy8PJWmEDdtCyWATaKwPaTswCdioPCWOE,2120
-pyghmi/util/webclient.py,sha256=Sw-XQI0udlD22pdCMOBPvv42KMtLV4a3noYY9v_Muzw,15472
-pyghmi-1.6.3.dist-info/AUTHORS,sha256=yv4aQom_PII-SNqbeeKrfH-spcG85PRPsZ71Iqjl_fU,2083
-pyghmi-1.6.3.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pyghmi-1.6.3.dist-info/METADATA,sha256=nYZYXWlA0oLwsa438e0NOFvPrd_XMrR7-ZURkEK7D3E,1136
-pyghmi-1.6.3.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-pyghmi-1.6.3.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
-pyghmi-1.6.3.dist-info/pbr.json,sha256=vB_8gvy6-F0qrwot79vigX7I5YKQFLwLkZqGWdkJErA,46
-pyghmi-1.6.3.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
-pyghmi-1.6.3.dist-info/RECORD,,
+pyghmi/util/webclient.py,sha256=i1rJ7NBlPQFTRv7kgzbTaOHsWuPeXcMAjRXm_i8CI0A,15652
+pyghmi-1.6.4.dist-info/AUTHORS,sha256=yv4aQom_PII-SNqbeeKrfH-spcG85PRPsZ71Iqjl_fU,2083
+pyghmi-1.6.4.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pyghmi-1.6.4.dist-info/METADATA,sha256=iunjBkI12heq3smej-gMbCPO3KdWK4Y60I6yuxqmwd0,1136
+pyghmi-1.6.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+pyghmi-1.6.4.dist-info/entry_points.txt,sha256=-OpJliDzATxmuPXK0VR3Ma-Yk_i4ZhfIIB-12A26dSI,168
+pyghmi-1.6.4.dist-info/pbr.json,sha256=G84aunNCSzzeuUMkVxkxXAfI8E9qATe2tf_kPWkiFWs,46
+pyghmi-1.6.4.dist-info/top_level.txt,sha256=aDtt6S9eVu6-tNdaUs4Pz9PbdUd69bziZZMhNvk9Ulc,7
+pyghmi-1.6.4.dist-info/RECORD,,

pyghmi-1.6.4.dist-info/pbr.json

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

pyghmi-1.6.3.dist-info/pbr.json

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