pyghmi 1.5.75__tar.gz → 1.5.76__tar.gz

{pyghmi-1.5.75 → pyghmi-1.5.76}/ChangeLog

@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+1.5.76
+------
+
+* Handle redfish modeling of some IB adapters
+* Add XCC3 specific health check
+* General fixup for sensor handling
+* Suspend use of token for remote media attach
+
 1.5.75
 ------
 

{pyghmi-1.5.75 → pyghmi-1.5.76}/PKG-INFO

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

{pyghmi-1.5.75 → pyghmi-1.5.76}/pyghmi/redfish/command.py

@@ -68,6 +68,7 @@ _healthmap = {
     'Unknown': const.Health.Warning,
     'Warning': const.Health.Warning,
     'OK': const.Health.Ok,
+    None: const.Health.Ok,
 }
 
 
@@ -123,7 +124,7 @@ class SensorReading(object):
             self.states = [healthinfo.get('Status', {}).get('Health',
                                                             'Unknown')]
             self.health = _healthmap[healthinfo['Status']['Health']]
-            if healthinfo['Status']['Health'].lower() == 'ok':
+            if self.health == const.Health.Ok:
                 self.states = []
         self.value = value
         self.state_ids = None
@@ -692,7 +693,9 @@ class Command(object):
     def _mapchassissensors(self, chassis):
         chassisurl = chassis['@odata.id']
         chassisinfo = self._do_web_request(chassisurl)
-        sensors = chassisinfo.get('Sensors', {}).get('@odata.id', '')
+        sensors = None
+        if self.oem.usegenericsensors:
+            sensors = chassisinfo.get('Sensors', {}).get('@odata.id', '')
         if sensors:
             sensorinf = self._do_web_request(sensors)
             for sensor in sensorinf.get('Members', []):
@@ -1379,9 +1382,18 @@ class Command(object):
         if vmcoll:
             vmlist = self._do_web_request(vmcoll)
             vmurls = [x['@odata.id'] for x in vmlist.get('Members', [])]
+        suspendedxauth = False
+        if 'X-Auth-Token' in self.wc.stdheaders:
+            suspendedxauth = True
+            del self.wc.stdheaders['X-Auth-Token']
+            self.wc.set_basic_credentials(self.username, self.password)
         try:
             self.oem.attach_remote_media(url, username, password, vmurls)
         except exc.BypassGenericBehavior:
+            if suspendedxauth:
+                self.wc.stdheaders['X-Auth-Token'] = self.xauthtoken
+                if 'Authorization' in self.wc.stdheaders:
+                    del self.wc.stdheaders['Authorization']
             return
         for vmurl in vmurls:
             vminfo = self._do_web_request(vmurl, cache=False)
@@ -1403,6 +1415,10 @@ class Command(object):
                     else:
                         raise
             break
+        if suspendedxauth:
+                self.wc.stdheaders['X-Auth-Token'] = self.xauthtoken
+                if 'Authorization' in self.wc.stdheaders:
+                    del self.wc.stdheaders['Authorization']
 
     def detach_remote_media(self):
         try:

{pyghmi-1.5.75 → pyghmi-1.5.76}/pyghmi/redfish/oem/generic.py

@@ -184,6 +184,7 @@ class AttrDependencyHandler(object):
 
 class OEMHandler(object):
     hostnic = None
+    usegenericsensors = True
 
     def __init__(self, sysinfo, sysurl, webclient, cache, gpool=None):
         self._gpool = gpool
@@ -787,17 +788,29 @@ class OEMHandler(object):
                     if 'Name' not in nadinfo:
                         continue
                     nicname = nadinfo['Name']
+                    if nicname == 'NetworkAdapter':
+                        nicname = nadinfo.get('Model', nicname)
                     yieldinf = {}
                     macidx = 1
                     if 'Ports' in nadinfo:
                         for portinfo in self._get_expanded_data(
                                 nadinfo['Ports']['@odata.id']).get('Members', []):
-                            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
+                            ethinfo = portinfo.get('Ethernet', {})
+                            if ethinfo:
+                                macs = [x for x in ethinfo.get('AssociatedMACAddresses', [])]
+                                for mac in macs:
+                                    label = 'MAC Address {}'.format(macidx)
+                                    yieldinf[label] = _normalize_mac(mac)
+                                    macidx += 1
+                                    foundmacs = True
+                            ibinfo = portinfo.get('InfiniBand', {})
+                            if ibinfo:
+                                macs = [x for x in ibinfo.get('AssociatedPortGUIDs', [])]
+                                for mac in macs:
+                                    label = 'Port GUID {}'.format(macidx)
+                                    yieldinf[label] = mac
+                                    macidx += 1
+                                    foundmacs = True
                             macinfobyadpname[nicname] = yieldinf
                     else:
                         for ctrlr in nadinfo.get('Controllers', []):

{pyghmi-1.5.75 → pyghmi-1.5.76}/pyghmi/redfish/oem/lenovo/xcc.py

@@ -119,6 +119,7 @@ def str_to_size(sizestr):
 
 
 class OEMHandler(generic.OEMHandler):
+    usegenericsensors = False
     logouturl = '/api/providers/logout'
     bmcname = 'XCC'
     ADP_URL = '/api/dataset/imm_adapters?params=pci_GetAdapters'

{pyghmi-1.5.75 → pyghmi-1.5.76}/pyghmi/redfish/oem/lenovo/xcc3.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 import copy
 import json
+import pyghmi.constants as pygconst
 import pyghmi.redfish.oem.generic as generic
 import pyghmi.exceptions as pygexc
 import pyghmi.util.webclient as webclient
@@ -20,6 +21,22 @@ import zipfile
 import time
 import os.path
 
+
+class SensorReading(object):
+    def __init__(self, healthinfo, sensor=None, value=None, units=None,
+                 unavailable=False):
+        if sensor:
+            self.name = sensor['name']
+        else:
+            self.name = healthinfo['name']
+            self.health = healthinfo['health']
+            self.states = healthinfo['states']
+            self.state_ids = healthinfo.get('state_ids', None)
+        self.value = value
+        self.imprecision = None
+        self.units = units
+        self.unavailable = unavailable
+
 class OEMHandler(generic.OEMHandler):
 
     def supports_expand(self, url):
@@ -64,6 +81,42 @@ class OEMHandler(generic.OEMHandler):
         powerinfo = fishclient._do_web_request('/redfish/v1/Chassis/1/Sensors/power_Sys_Power')
         return powerinfo['Reading']
 
+    def get_health(self, fishclient, verbose=True):
+        rsp = self._do_web_request('/api/providers/imm_active_events')
+        summary = {'badreadings': [], 'health': pygconst.Health.Ok}
+        fallbackdata = []
+        hmap = {
+            0 : pygconst.Health.Ok,
+            3: pygconst.Health.Critical,
+            2: pygconst.Health.Warning,
+        }
+        infoevents = False
+        existingevts = set([])
+        for item in rsp.get('items', ()):
+            # while usually the ipmi interrogation shall explain things,
+            # just in case there is a gap, make sure at least the
+            # health field is accurately updated
+            itemseverity = hmap.get(item.get('Severity', 2),
+                                    pygconst.Health.Critical)
+            if itemseverity == pygconst.Health.Ok:
+                infoevents = True
+                continue
+            if (summary['health'] < itemseverity):
+                summary['health'] = itemseverity
+            evtsrc = item.get('Oem', {}).get('Lenovo', {}).get('Source', '')
+            currevt = '{}:{}'.format(evtsrc, item['Message'])
+            if currevt in existingevts:
+                continue
+            existingevts.add(currevt)
+            fallbackdata.append(SensorReading({
+                'name': evtsrc,
+                'states': [item['Message']],
+                'health': itemseverity,
+                'type': evtsrc,
+            }, ''))
+        summary['badreadings'] = fallbackdata
+        return summary
+
     def _get_cpu_temps(self, fishclient):
         cputemps = []
         for reading in super()._get_cpu_temps(fishclient):

{pyghmi-1.5.75 → pyghmi-1.5.76}/pyghmi.egg-info/PKG-INFO

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

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

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

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

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