pyghmi 1.5.69__tar.gz → 1.5.70__tar.gz

{pyghmi-1.5.69 → pyghmi-1.5.70}/ChangeLog

@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+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.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyghmi
-Version: 1.5.69
+Version: 1.5.70
 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.70}/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.70}/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.70}/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.70}/pyghmi.egg-info/PKG-INFO

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

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

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

{pyghmi-1.5.69 → pyghmi-1.5.70}/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.70}/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.70}/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}