pyghmi 1.5.69__tar.gz → 1.5.71__tar.gz

{pyghmi-1.5.69 → pyghmi-1.5.71}/ChangeLog

@@ -1,6 +1,26 @@
 CHANGES
 =======
 
+1.5.71
+------
+
+* Wire up redfish for getting extended BMC settings
+* Add generic redfish license handling
+* Extend MAC collection in redfish
+* Normalize UUID format
+* Add multipart update support to redfish updates
+* Add BMC reset to redfish implementation
+* Fix the extended bmc configuration
+* Exposed advanced, extended BMC configuration
+* Restore UEFI configuration to IMM systems
+
+1.5.70
+------
+
+* Update for modern Debian/Ubuntu build
+* Add FAPM meters for better quality power data
+* Remove unused test-requirements
+
 1.5.69
 ------
 

{pyghmi-1.5.69 → pyghmi-1.5.71}/PKG-INFO

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

{pyghmi-1.5.69 → pyghmi-1.5.71}/builddeb

@@ -4,7 +4,7 @@ mkdir -p /tmp/pyghmi
 cp -a * .git /tmp/pyghmi
 cd /tmp/pyghmi
 export PYEXEC=python3
-export DSCARGS="--with-python2=True --with-python3=True"
+export DSCARGS="--with-python2=False --with-python3=True"
 if grep wheezy /etc/os-release; then
     # also it's old, use python2 instead of python3
     export PYEXEC=python

{pyghmi-1.5.69 → pyghmi-1.5.71}/makesetup

@@ -3,7 +3,7 @@ cd `dirname $0`
 VERSION=`git describe|cut -d- -f 1`
 NUMCOMMITS=`git describe|cut -d- -f 2`
 if [ "$NUMCOMMITS" != "$VERSION"  ]; then
-    VERSION=$VERSION.dev$NUMCOMMITS.g`git describe|cut -d- -f 3`
+    VERSION=$VERSION.dev$NUMCOMMITS+g`git describe|cut -d- -f 3`
 fi
 echo $VERSION > VERSION
 sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/ipmi/command.py

@@ -849,9 +849,9 @@ class Command(object):
         else:
             raise Exception("Unrecognized data format " + repr(fetchdata))
 
-    def get_extended_bmc_configuration(self):
+    def get_extended_bmc_configuration(self, hideadvanced=True):
         self.oem_init()
-        return self._oem.get_extended_bmc_configuration()
+        return self._oem.get_extended_bmc_configuration(hideadvanced=hideadvanced)
 
     def get_bmc_configuration(self):
         self.oem_init()

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/ipmi/oem/lenovo/config.py

@@ -272,7 +272,9 @@ class LenovoFirmwareConfig(object):
             cfgfilename = "config"
         options = {}
         data = None
-        if self.connection:
+        if not hasattr(self.xc, 'grab_redfish_response_with_status'):
+            rsp = ({}, 500)
+        elif self.connection:
             rsp = ({}, 200)
         else:
             rsp = self.xc.grab_redfish_response_with_status(

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/ipmi/oem/lenovo/energy.py

@@ -32,8 +32,8 @@ class EnergyManager(object):
         try:
             rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 2, 0, 0, 0])
             if len(rsp['data']) >= 8:
-                self.supportedmeters = ('DC Energy',)  # 'GPU Power',
-                                        # 'Node Power', 'Total Power')
+                self.supportedmeters = ('DC Energy', 'GPU Power',
+                                        'Node Power', 'Total Power')
                 self._mypowermeters = ('node power', 'total power', 'gpu power', 'riser 1 power', 'riser 2 power')
                 self._usefapm = True
                 return
@@ -67,9 +67,22 @@ class EnergyManager(object):
 
     def get_sensor(self, name, ipmicmd):
         if name.lower() not in self._mypowermeters:
-            raise pygexc.UnsupportedFunctionality('Unrecogcized sensor')
-        rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 8, 0, 0, 0])
-        npow, gpupow, r1pow, r2pow = struct.unpack('<HHHH', rsp['data'][6:10])
+            raise pygexc.UnsupportedFunctionality('Unrecognized sensor: {}'.format(name))
+        tries = 3
+        rsp = None
+        while tries:
+            tries -= 1
+            try:
+                rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x32, data=[4, 8, 0, 0, 0])
+                break
+            except pygexc.IpmiException as ie:
+                if tries and ie.ipmicode == 0xc3:
+                    ipmicmd.ipmi_session.pause(0.1)
+                    continue
+                raise
+        if rsp is None:
+            raise pygexc.UnsupportedFunctionality('Unrecognized sensor: {}'.format(name))
+        npow, gpupow, r1pow, r2pow = struct.unpack('<HHHH', rsp['data'][6:14])
         if name.lower().startswith('node'):
             return npow, 'W'
         elif name.lower().startswith('gpu'):

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/ipmi/oem/lenovo/handler.py

@@ -1194,9 +1194,9 @@ class OEMHandler(generic.OEMHandler):
             return {'height': self._fpc_variant & 0xf, 'slot': 0}
         return super(OEMHandler, self).get_description()
 
-    def get_extended_bmc_configuration(self):
+    def get_extended_bmc_configuration(self, hideadvanced=True):
         if self.has_xcc:
-            return self.immhandler.get_extended_bmc_configuration()
+            return self.immhandler.get_extended_bmc_configuration(hideadvanced=hideadvanced)
         return super(OEMHandler, self).get_extended_bmc_configuration()
 
     def get_bmc_configuration(self):

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/ipmi/oem/lenovo/imm.py

@@ -978,8 +978,8 @@ class XCCClient(IMMClient):
                 return {}
         return {'height': int(dsc['u-height']), 'slot': int(dsc['slot'])}
 
-    def get_extended_bmc_configuration(self):
-        immsettings = self.get_system_configuration(fetchimm=True)
+    def get_extended_bmc_configuration(self, hideadvanced=True):
+        immsettings = self.get_system_configuration(fetchimm=True, hideadvanced=hideadvanced)
         for setting in list(immsettings):
             if not setting.startswith('IMM.'):
                 del immsettings[setting]

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/redfish/command.py

@@ -789,6 +789,9 @@ class Command(object):
     def get_health(self, verbose=True):
         return self.oem.get_health(self, verbose)
 
+    def get_extended_bmc_configuration(self, hideadvanced=True):
+        return self.oem.get_extended_bmc_configuration(self, hideadvanced=hideadvanced)
+
     def get_bmc_configuration(self):
         """Get miscellaneous BMC configuration
 
@@ -823,8 +826,16 @@ class Command(object):
         In many cases, this may render remote network access impracticle or
         impossible."
         """
+        bmcinfo = self._do_web_request(self._bmcurl)
+        rc = bmcinfo.get('Actions', {}).get('#Manager.ResetToDefaults', {})
+        actinf = rc.get('ResetType@Redfish.AllowableValues', [])
+        if 'ResetAll' in actinf:
+            acturl = actinf.get('target', None)
+            if acturl:
+                self._do_web_request(acturl, {'ResetType': 'ResetAll'})
+                return
         raise exc.UnsupportedFunctionality(
-            'Clear BMC configuration not supported in redfish yet')
+            'Clear BMC configuration not supported on this platform')
 
     def get_system_configuration(self, hideadvanced=True):
         return self.oem.get_system_configuration(hideadvanced, self)
@@ -1413,20 +1424,20 @@ class Command(object):
         return self.oem.get_diagnostic_data(savefile, progress, autosuffix)
 
     def get_licenses(self):
-        return self.oem.get_licenses()
+        return self.oem.get_licenses(self)
 
     def delete_license(self, name):
-        return self.oem.delete_license(name)
+        return self.oem.delete_license(name, self)
 
     def save_licenses(self, directory):
         if os.path.exists(directory) and not os.path.isdir(directory):
             raise exc.InvalidParameterValue(
                 'Not allowed to overwrite existing file: {0}'.format(
                     directory))
-        return self.oem.save_licenses(directory)
+        return self.oem.save_licenses(directory, self)
 
     def apply_license(self, filename, progress=None, data=None):
-        return self.oem.apply_license(filename, progress, data)
+        return self.oem.apply_license(filename, self, progress, data)
 
 
 if __name__ == '__main__':

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/redfish/oem/generic.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import base64
 from fnmatch import fnmatch
 import json
 import os
@@ -43,6 +44,11 @@ class SensorReading(object):
         self.units = units
         self.unavailable = unavailable
 
+def _normalize_mac(mac):
+    if ':' not in mac:
+        mac = ':'.join((mac[:2], mac[2:4], mac[4:6], mac[6:8], mac[8:10], mac[10:12]))
+    return mac.lower()
+
 _healthmap = {
     'Critical': const.Health.Critical,
     'Unknown': const.Health.Warning,
@@ -533,6 +539,12 @@ class OEMHandler(object):
                 'Model': self._varsysinfo.get(
                     'SKU', self._varsysinfo.get('PartNumber', '')),
             }
+            if sysinfo['UUID'] and '-' not in sysinfo['UUID']:
+                sysinfo['UUID'] = '-'.join((
+                    sysinfo['UUID'][:8], sysinfo['UUID'][8:12],
+                    sysinfo['UUID'][12:16], sysinfo['UUID'][16:20],
+                    sysinfo['UUID'][20:]))
+            sysinfo['UUID'] = sysinfo['UUID'].lower()
             return sysinfo
         else:
             for invpair in self.get_inventory():
@@ -548,6 +560,12 @@ class OEMHandler(object):
             'Model': self._varsysinfo.get(
                 'SKU', self._varsysinfo.get('PartNumber', '')),
         }
+        if sysinfo['UUID'] and '-' not in sysinfo['UUID']:
+            sysinfo['UUID'] = '-'.join((
+                sysinfo['UUID'][:8], sysinfo['UUID'][8:12],
+                sysinfo['UUID'][12:16], sysinfo['UUID'][16:20],
+                sysinfo['UUID'][20:]))
+        sysinfo['UUID'] = sysinfo['UUID'].lower()
         yield ('System', sysinfo)
         self._hwnamemap = {}
         cpumemurls = []
@@ -599,22 +617,39 @@ class OEMHandler(object):
             yield (dname, ddata)
 
     def _get_adp_inventory(self, onlyname=False, withids=False, urls=None):
+        foundmacs = False
+        macinfobyadpname = {}
+        if 'NetworkInterfaces' in self._varsysinfo:
+            nifurls = self._do_web_request(self._varsysinfo['NetworkInterfaces']['@odata.id'])
+            nifurls = nifurls.get('Members', [])
+            nifurls = [x['@odata.id'] for x in nifurls]
+            for nifurl in nifurls:
+                nifinfo = self._do_web_request(nifurl)
+
+                nadurl = nifinfo.get('Links', {}).get('NetworkAdapter', {}).get("@odata.id")
+                if nadurl:
+                    nadinfo = self._do_web_request(nadurl)
+                    if 'Name' not in nadinfo:
+                        continue
+                    nicname = nadinfo['Name']
+                    yieldinf = {}
+                    macidx = 1
+                    for ctrlr in nadinfo.get('Controllers', []):
+                        porturls = [x['@odata.id'] for x in ctrlr.get(
+                            'Links', {}).get('Ports', [])]
+                        for porturl in porturls:
+                            portinfo = self._do_web_request(porturl)
+                            macs = [x for x in portinfo.get(
+                                'Ethernet', {}).get(
+                                    'AssociatedMACAddresses', [])]
+                            for mac in macs:
+                                label = 'MAC Address {}'.format(macidx)
+                                yieldinf[label] = _normalize_mac(mac)
+                                macidx += 1
+                                foundmacs = True
+                    macinfobyadpname[nicname] = yieldinf
         if not urls:
             urls = self._get_adp_urls()
-            if not urls:
-                # No PCIe device inventory, but *maybe* ethernet inventory...
-                aidx = 1
-                for nicinfo in self._get_eth_urls():
-                    nicinfo = self._do_web_request(nicinfo)
-                    nicname = nicinfo.get('Name', None)
-                    nicinfo = nicinfo.get('MACAddress', None)
-                    if not nicname:
-                        nicname = 'NIC'
-                    if nicinfo:
-                        yield (nicname,
-                               {'MAC Address {0}'.format(aidx): nicinfo})
-                        aidx += 1
-                return
         for inf in self._do_bulk_requests(urls):
             adpinfo, url = inf
             aname = adpinfo.get('Name', 'Unknown')
@@ -636,6 +671,8 @@ class OEMHandler(object):
                 yieldinf = {'Id': adpinfo.get('Id', aname)}
             else:
                 yieldinf = {}
+            if aname in macinfobyadpname:
+                yieldinf.update(macinfobyadpname[aname])
             funurls = [x['@odata.id'] for x in functions]
             for fun in self._do_bulk_requests(funurls):
                 funinfo, url = fun
@@ -648,14 +685,42 @@ class OEMHandler(object):
                 yieldinf['PCI Subsystem Vendor ID'] = funinfo[
                     'SubsystemVendorId'].replace('0x', '')
                 yieldinf['Type'] = funinfo['DeviceClass']
-                for nicinfo in funinfo.get('Links', {}).get(
-                        'EthernetInterfaces', []):
-                    nicinfo = self._do_web_request(nicinfo['@odata.id'])
-                    macaddr = nicinfo.get('MACAddress', None)
-                    if macaddr:
-                        yieldinf['MAC Address {0}'.format(nicidx)] = macaddr
-                        nicidx += 1
+                if aname not in macinfobyadpname:
+                    for nicinfo in funinfo.get('Links', {}).get(
+                            'EthernetInterfaces', []):
+                        nicinfo = self._do_web_request(nicinfo['@odata.id'])
+                        macaddr = nicinfo.get('MACAddress', None)
+                        if macaddr:
+                            macaddr = _normalize_mac(macaddr)
+                            foundmacs = True
+                            yieldinf['MAC Address {0}'.format(nicidx)] = macaddr
+                            nicidx += 1
+            if aname in macinfobyadpname:
+                del macinfobyadpname[aname]
             yield aname, yieldinf
+        if macinfobyadpname:
+            for adp in macinfobyadpname:
+                yield adp, macinfobyadpname[adp]
+        if not foundmacs:
+          # No PCIe device inventory, but *maybe* ethernet inventory...
+            idxsbyname = {}
+            for nicinfo in self._get_eth_urls():
+                nicinfo = self._do_web_request(nicinfo)
+                nicname = nicinfo.get('Name', None)
+                nicinfo = nicinfo.get('MACAddress', nicinfo.get('PermanentAddress', None))
+                if nicinfo and ':' not in nicinfo:
+                    nicinfo = ':'.join((
+                        nicinfo[:2], nicinfo[2:4], nicinfo[4:6], nicinfo[6:8],
+                        nicinfo[8:10], nicinfo[10:12]))
+                if not nicname:
+                    nicname = 'NIC'
+                if nicinfo:
+                    if nicname not in idxsbyname:
+                        idxsbyname[nicname] = 0
+                    idxsbyname[nicname] += 1
+                    nicinfo = nicinfo.lower()
+                    yield (nicname,
+                            {'MAC Address {}'.format(idxsbyname[nicname]): nicinfo})
 
     def _get_eth_urls(self):
         ethurls = self._varsysinfo.get('EthernetInterfaces', {})
@@ -780,20 +845,24 @@ class OEMHandler(object):
 
     def update_firmware(self, filename, data=None, progress=None, bank=None):
         usd = self._do_web_request('/redfish/v1/UpdateService')
-        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')
+        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')
         try:
             uploadthread = webclient.FileUploader(
-                self.webclient, upurl, filename, data, formwrap=False,
+                self.webclient, upurl, filename, data, formwrap=ismultipart,
                 excepterror=False)
             uploadthread.start()
             wc = self.webclient
@@ -823,6 +892,7 @@ class OEMHandler(object):
             # sometimes we get an empty pgress when transitioning from the apply phase to
             # the validating phase; add a retry here so we don't exit the loop in this case
             retry = 3
+            pct = 0.0
             while not complete and retry > 0:
                 pgress = self._do_web_request(monitorurl, cache=False)
                 if not pgress:
@@ -837,7 +907,10 @@ class OEMHandler(object):
                              'Suspended'):
                     raise Exception(
                         json.dumps(json.dumps(pgress['Messages'])))
-                pct = float(pgress['PercentComplete'])
+                if 'PercentComplete' in pgress:
+                    pct = float(pgress['PercentComplete'])
+                else:
+                    print(repr(pgress))
                 complete = state == 'Completed'
                 progress({'phase': phase, 'progress': pct})
                 if complete:
@@ -910,17 +983,62 @@ class OEMHandler(object):
         raise exc.UnsupportedFunctionality(
             'Retrieving diagnostic data is not implemented for this platform')
 
-    def get_licenses(self):
-        raise exc.UnsupportedFunctionality()
+    def _get_license_collection_url(self, fishclient):
+        overview = fishclient._do_web_request('/redfish/v1/')
+        licsrv = overview.get('LicenseService', {}).get('@odata.id', None)
+        if not licsrv:
+            raise exc.UnsupportedFunctionality()
+        lcs = fishclient._do_web_request(licsrv)
+        licenses = lcs.get('Licenses', {}).get('@odata.id',None)
+        if not licenses:
+            raise exc.UnsupportedFunctionality()
+        return licenses
 
-    def delete_license(self, name):
+    def get_extended_bmc_configuration(self, fishclient, hideadvanced=True):
         raise exc.UnsupportedFunctionality()
 
-    def save_licenses(self, directory):
-        raise exc.UnsupportedFunctionality()
+    def _get_licenses(self, fishclient):
+        licenses = self._get_license_collection_url(fishclient)
+        collection = fishclient._do_web_request(licenses)
+        alllic = [x['@odata.id'] for x in collection.get('Members', [])]
+        for license in alllic:
+            licdet = fishclient._do_web_request(license)
+            state = licdet.get('Status', {}).get('State')
+            if state != 'Enabled':
+                continue
+            yield licdet
 
-    def apply_license(self, filename, progress=None, data=None):
-        raise exc.UnsupportedFunctionality()
+    def get_licenses(self, fishclient):
+        for licdet in self._get_licenses(fishclient):
+            name = licdet['Name']
+            yield {'name': name, 'state': 'Active'}
+
+    def delete_license(self, name, fishclient):
+        for licdet in self._get_licenses(fishclient):
+            lname = licdet['Name']
+            if name == lname:
+                fishclient._do_web_request(licdet['@odata.id'], method='DELETE')
+
+    def save_licenses(self, directory, fishclient):
+        for licdet in self._get_licenses(fishclient):
+            dload = licdet.get('DownloadURI', None)
+            if dload:
+                filename = os.path.basename(dload)
+                savefile = os.path.join(directory, filename)
+                fd = webclient.FileDownloader(fishclient.wc, dload, savefile)
+                fd.start()
+                while fd.isAlive():
+                    fd.join(1)
+                yield savefile
+
+    def apply_license(self, filename, fishclient, progress=None, data=None):
+        licenses = self._get_license_collection_url(fishclient)
+        if data is None:
+            data = open(filename, 'rb')
+        licdata = data.read()
+        lic64 = base64.b64encode(licdata).decode()
+        licinfo = {"LicenseString": lic64}
+        fishclient._do_web_request(licenses, licinfo)
 
     def get_user_expiration(self, uid):
         return None

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi/redfish/oem/lenovo/xcc.py

@@ -149,6 +149,13 @@ class OEMHandler(generic.OEMHandler):
         self.fwc = None
         self.fwo = None
 
+    def get_extended_bmc_configuration(self, fishclient, hideadvanced=True):
+        immsettings = self.get_system_configuration(fetchimm=True, hideadvanced=hideadvanced)
+        for setting in list(immsettings):
+            if not setting.startswith('IMM.'):
+                del immsettings[setting]
+        return immsettings
+
     def get_system_configuration(self, hideadvanced=True, fishclient=None,
                                  fetchimm=False):
         if not self.fwc:
@@ -1553,7 +1560,7 @@ class OEMHandler(generic.OEMHandler):
             progress({'phase': 'complete'})
         return savefile
 
-    def get_licenses(self):
+    def get_licenses(self, fishclient):
         licdata = self.wc.grab_json_response('/api/providers/imm_fod')
         for lic in licdata.get('items', [{}])[0].get('keys', []):
             if lic['status'] == 0:
@@ -1564,7 +1571,7 @@ class OEMHandler(generic.OEMHandler):
                     'state': 'Missing required license'
                 }
 
-    def delete_license(self, name):
+    def delete_license(self, name, fishclient):
         licdata = self.wc.grab_json_response('/api/providers/imm_fod')
         for lic in licdata.get('items', [{}])[0].get('keys', []):
             if lic.get('feature', None) == name:
@@ -1577,7 +1584,7 @@ class OEMHandler(generic.OEMHandler):
                 )
                 break
 
-    def save_licenses(self, directory):
+    def save_licenses(self, directory, fishclient):
         licdata = self.wc.grab_json_response('/api/providers/imm_fod')
         for lic in licdata.get('items', [{}])[0].get('keys', []):
             licid = ','.join((str(lic['type']), str(lic['id'])))
@@ -1594,7 +1601,7 @@ class OEMHandler(generic.OEMHandler):
                     self._refresh_token()
                 yield savefile
 
-    def apply_license(self, filename, progress=None, data=None):
+    def apply_license(self, filename, fishclient, progress=None, data=None):
         license_errors = {
             310: "License is for a different model of system",
             311: "License is for a different system serial number",
@@ -1618,7 +1625,7 @@ class OEMHandler(generic.OEMHandler):
             if rsp.get('return', 0) in license_errors:
                 raise pygexc.InvalidParameterValue(
                     license_errors[rsp['return']])
-        return self.get_licenses()
+        return self.get_licenses(fishclient)
 
     def user_delete(self, uid):
         userinfo = self.wc.grab_json_response('/api/dataset/imm_users')

{pyghmi-1.5.69 → pyghmi-1.5.71}/pyghmi.egg-info/PKG-INFO

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

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

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

{pyghmi-1.5.69 → pyghmi-1.5.71}/setup.cfg

@@ -1,11 +1,11 @@
 [metadata]
 name = pyghmi
 summary = Python General Hardware Management Initiative (IPMI and others)
-description-file = 
+description_file = 
 	README
 author = Jarrod Johnson
-author-email = jjohnson2@lenovo.com
-home-page = http://github.com/openstack/pyghmi/
+author_email = jjohnson2@lenovo.com
+home_page = http://github.com/openstack/pyghmi/
 classifier = 
 	Intended Audience :: Information Technology
 	Intended Audience :: System Administrators

{pyghmi-1.5.69 → pyghmi-1.5.71}/setup.py.tmpl

@@ -21,6 +21,7 @@ setuptools.setup(
     name='pyghmi',
     version='#VERSION#',
     description='Python General Hardware Management Initiative (IPMI, redfish, etc)',
+    long_description='Python General Hardware Management Initiative (IPMI, redfish, etc)',
     author='Jarrod Johnson',
     author_email='jjohnson2@lenovo.com',
     packages=['pyghmi', 'pyghmi.util', 'pyghmi.ipmi', 'pyghmi.cmd',

{pyghmi-1.5.69 → pyghmi-1.5.71}/test-requirements.txt

@@ -1,9 +1,4 @@
-
 coverage!=4.4,>=4.0 # Apache-2.0
-fixtures>=3.0.0
-python-subunit>=1.0.0
 stestr>=2.0.0,!=2.3.0,!=3.0.0  # Apache-2.0
-testscenarios>=0.4
-testtools>=2.2.0
 oslotest>=3.2.0,<4;python_version<'3.6'  # Apache-2.0
 oslotest>=3.2.0;python_version>='3.6'  # Apache-2.0

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

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