pyghmi 1.6.2__tar.gz → 1.6.3__tar.gz

{pyghmi-1.6.2 → pyghmi-1.6.3}/ChangeLog

@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+1.6.3
+-----
+
+* Fixes to XCC3 module
+* Randomize boundary
+* Increase buffer size
+
 1.6.2
 -----
 

{pyghmi-1.6.2 → pyghmi-1.6.3}/PKG-INFO

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

{pyghmi-1.6.2 → pyghmi-1.6.3}/pyghmi/ipmi/private/session.py

@@ -375,6 +375,10 @@ class Session(object):
                 tmpsocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         else:
             tmpsocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        try:
+            tmpsocket.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 16777216)
+        except Exception:
+            pass
         if server is None:
             # Rather than wait until send() to bind, bind now so that we have
             # a port number allocated no matter what

{pyghmi-1.6.2 → pyghmi-1.6.3}/pyghmi/redfish/oem/lenovo/xcc3.py

@@ -64,7 +64,11 @@ class SensorReading(object):
 
 class OEMHandler(generic.OEMHandler):
 
-    datacache = {}
+    def __init__(self, sysinfo, sysurl, webclient, cache, gpool=None):
+        super(OEMHandler, self).__init__(sysinfo, sysurl, webclient, cache,
+                                         gpool)
+        self.datacache = {}
+
 
     def supports_expand(self, url):
         return True
@@ -115,8 +119,8 @@ class OEMHandler(generic.OEMHandler):
             #     raise pygexc.TemporaryError(
             #         'Cannot read extended inventory during firmware update')
             if self.webclient:
-                adapterdata = self._do_bulk_requests([i['@odata.id'] for i in self.webclient.grab_json_response(
-                        '/redfish/v1/Chassis/1')['Links']['PCIeDevices']])
+                adapterdata = list(self._do_bulk_requests([i['@odata.id'] for i in self.webclient.grab_json_response(
+                        '/redfish/v1/Chassis/1')['Links']['PCIeDevices']]))
                 if adapterdata:
                     self.datacache['lenovo_cached_adapters'] = (
                         adapterdata, util._monotonic_time())
@@ -164,8 +168,21 @@ class OEMHandler(generic.OEMHandler):
                 # Could be identified also through Oem->Lenovo->FunctionClass
                 if fundata['Members'][0]['DeviceClass'] == 'NetworkController':
                     ports_data = self._get_expanded_data('{0}/Ports'.format(adata['@odata.id'].replace('PCIeDevices','NetworkAdapters')))
+                    macidx = 1
                     for port in ports_data['Members']:
-                        bdata['MAC Address {0}'.format(port['Id'])] = port['Ethernet']['AssociatedMACAddresses'][0].lower()
+                        if port.get('Ethernet', None):
+                            macs = [x for x in port['Ethernet'].get('AssociatedMACAddresses', [])]
+                            for mac in macs:
+                                label = 'MAC Address {}'.format(macidx)
+                                bdata[label] = generic._normalize_mac(mac)
+                                macidx += 1
+                        ibinfo = port.get('InfiniBand', {})
+                        if ibinfo:
+                            macs = [x for x in ibinfo.get('AssociatedPortGUIDs', [])]
+                            for mac in macs:
+                                label = 'Port GUID {}'.format(macidx)
+                                bdata[label] = mac
+                                macidx += 1
                 hwmap[aname] = bdata
             self.datacache['lenovo_cached_hwmap'] = (hwmap,
                                                      util._monotonic_time())
@@ -924,11 +941,15 @@ class OEMHandler(generic.OEMHandler):
             src, dst = currval.split(',')
             mappings.append('{}:{}'.format(src,dst))
         settings['usb_forwarded_ports'] = {'value': ','.join(mappings)}
+        cfgin = self._get_lnv_bmcstgs(self)[0]
+        for stgname in cfgin:
+            settings[f'{stgname}'] = cfgin[stgname]
         return settings
 
     def set_bmc_configuration(self, changeset):
         acctattribs = {}
         usbsettings = {}
+        bmchangeset = {}
         for key in changeset:
             if isinstance(changeset[key], str):
                 changeset[key] = {'value': changeset[key]}
@@ -963,14 +984,15 @@ class OEMHandler(generic.OEMHandler):
                     'usb_forwarded_ports'):
                 usbsettings[key] = currval
             else:
-                raise pygexc.InvalidParameterValue(
-                    '{0} not a known setting'.format(key))
+                bmchangeset[key.replace('bmc.', '')] = changeset[key]
         if acctattribs:
             self._do_web_request(
                 '/redfish/v1/AccountService', acctattribs, method='PATCH')
             self._do_web_request('/redfish/v1/AccountService', cache=False)
         if usbsettings:
             self.apply_usb_configuration(usbsettings)
+        if bmchangeset:
+            self._set_xcc3_settings(bmchangeset, self)
 
     def apply_usb_configuration(self, usbsettings):
         bmcattribs = {}

{pyghmi-1.6.2 → pyghmi-1.6.3}/pyghmi/util/webclient.py

@@ -96,7 +96,7 @@ class FileDownloader(threading.Thread):
             self.exc = e
 
 
-def get_upload_form(filename, data, formname, otherfields):
+def get_upload_form(filename, data, formname, otherfields, boundary=BND):
     ffilename = filename.split('/')[-1]
     if not formname:
         formname = ffilename
@@ -114,16 +114,16 @@ def get_upload_form(filename, data, formname, otherfields):
             if isinstance(tfield, dict):
                 tfield = json.dumps(tfield)
                 xtra = '\r\nContent-Type: application/json'
-            form += (b'--' + BND
+            form += (b'--' + boundary
                      + '\r\nContent-Disposition: form-data; '
                        'name="{0}"{1}\r\n\r\n{2}\r\n'.format(
                            ofield, xtra, tfield).encode('utf-8'))
-        form += (b'--' + BND
+        form += (b'--' + boundary
                 + '\r\nContent-Disposition: form-data; '
                   'name="{0}"; filename="{1}"\r\n'.format(
                       formname, ffilename).encode('utf-8'))
         form += b'Content-Type: application/octet-stream\r\n\r\n' + data
-        form += b'\r\n--' + BND + b'--\r\n'
+        form += b'\r\n--' + boundary + b'--\r\n'
         uploadforms[filename] = form
         return form
 
@@ -332,13 +332,14 @@ 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))
-            ulhdrs['Content-Type'] = b'multipart/form-data; boundary=' + BND
+                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])
         else:

{pyghmi-1.6.2 → pyghmi-1.6.3}/pyghmi.egg-info/PKG-INFO

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

pyghmi-1.6.3/pyghmi.egg-info/pbr.json

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

pyghmi-1.6.2/pyghmi.egg-info/pbr.json

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