diff -pruN 2.12.0-1/AUTHORS 2.12.2-0ubuntu1/AUTHORS --- 2.12.0-1/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/AUTHORS 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1,30 @@ +Anshul Jain +Anton Antonov +Antony Messerli +Anusha Ramineni +Aparna +AparnaVikraman +Debayan Ray +Dirk Mueller +Dmitry Tantsur +Ilya Etingof +Jim Mankovich +Mark Goddard +Nisha Agarwal +Nisha Agarwal +Pratyusha +Ramakrishnan G +Riccardo Pittau +Shivanand Tendulker +Shivanand Tendulker +ankit +hpproliant +kesper +kesper +mallikarjuna.kolagatla +melissaml +mvpnitesh +paresh-sao +root +vmud213 +wangqi diff -pruN 2.12.0-1/ChangeLog 2.12.2-0ubuntu1/ChangeLog --- 2.12.0-1/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/ChangeLog 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1,450 @@ +CHANGES +======= + +2.12.2 +------ + +* Update for sushy 4.0.0 + +2.12.1 +------ + +* Fix the test cases for latest sushy + +2.12.0 +------ + +* Add support to exclude finger prints of certs +* Adding changes for HTTPS Cert + +2.11.0 +------ + +* Adds changes for security\_dasboard clean\_step +* Adds more gpu capabilities +* Support to clear certificates when no certificates + +2.10.0 +------ + +* Follow-up patch for proliantutils docs +* [Redfish] Enhance removing TLS certificates +* Adds documentation for proliantutils +* Add security dashboard attributes +* Adds support for one button secure erase + +2.9.5 +----- + +* [Redfish] Provides APIs to add/remove TLS certificate +* Redfish: Adds APIs to support boot from http url +* Adds steps 'apply\_configuration' and 'flash\_firmware\_sum' +* Enable check import order +* Adds py3 to tox environment +* Bump hacking to 3.0.0 + +2.9.4 +----- + +* Updates mimimum version of sushy in requirements + +2.9.3 +----- + +* Decode output of fru print +* The \_op method has changed in sushy 3.10 +* Strip whitespace from cookie in firmware update + +2.9.2 +----- + +* Fixes caching of ilo instances to use admin credentials +* Fixes testcases that are broken due to change in sushy + +2.9.1 +----- + +* Follow-up patch for UEFI iSCSI boot nic adapter fix +* Fixed problem with UEFI iSCSI boot for adapters +* Enable session based authentication used by sushy +* Fixes the storage capabilities +* Cache the IloClient object creation +* Updated README file + +2.9.0 +----- + +* Adds support to get disk types +* Removes filter on the bios settings +* OOB disk-erase for ilo5 based Proliant Servers +* iLO firmware update fails with 'update\_firmware\_sum' +* Remove checked in copy of the ChangeLog +* Changing warning to debug +* Switch to the new tox constraints file usage and location +* Use six.moves for reloading a module +* Add unit tests for python 3.6/3.7 +* Remove checked in version of AUTHORS +* Finish conversion to stestr +* Add a .gitreview file to point to the gerrit instance + +2.8.4 +----- + +* Updates ChangeLog for proliantutils release 2.8.4 +* Adding changes for tox failure + +2.8.3 +----- + +* Adding fix for nic\_capacity calculation +* jsonschema3.0.1: Uncap jsonschema +* Jsonschema 3.0.1: Binds the raid schema to draft-04 + +2.8.2 +----- + +* Updates ChangeLog for proliantutils release 2.8.2 +* Adding changes to support sushy virtual media + +2.8.1 +----- + +* Updates ChangeLog for proliantutils release 2.8.1 +* Revert "Add NIC inspection for Gen9" + +2.8.0 +----- + +* Updates ChangeLog for proliantutils release 2.8.0 +* Added support for IPv6 network +* Inband disk erase support for SSD disk drives +* Add NIC inspection for Gen9 +* Use Sushy caching decorators +* Adds changes in hpssa validator to support '10','50,'60' raid level + +2.7.0 +----- + +* Change impending version to 2.7.0 (and not 2.6.1) +* Update ChangeLog for proliantutils release 2.6.1 +* Adds API to get the results of the BIOS settings +* Follow-up for commit 0e9f3d1b4620b0ad9ff6370132ba5a8d5f3cc21e +* Validates the BIOS settings before applying +* Redfish: Adds 'read\_raid\_configuration' API to get current raid config +* Fix ssacli output parsing. New untitest for the fixed issue added +* Redfish: Adds \`create\_raid\_configuration\` API to create raid + +2.6.0 +----- + +* Update ChangeLog for proliantutils release 2.6.0 +* iLO Redfish: Adds support to manage BIOS settings +* Redfish: Adds 'delete\_raid\_configuration' API to clear raid +* iLO RIS: Add support to manage BIOS settings +* Add support for retrieving system POST state +* Add support for NMI(Non Maskable Interrupt) +* Exclude pysnmp\_mibs from search path + +2.5.2 +----- + +* Updated ChangeLog for proliantutils release 2.5.2 +* Make case-insensitive search for Blade server model string +* Using assertIsNone() instead of assertEqual(None) +* Fixes session issue for Gen10 servers +* Minor fix in test case + +2.5.1 +----- + +* Updated ChangeLog for proliantutils release 2.5.1 Also updated the AUTHORS file +* Remove the disk erase timeout +* Fixes secure\_boot capability + +2.5.0 +----- + +* Updated ChangeLog for proliantutils 2.5.0 release +* Retain "mac" argument for backward compatibility +* Changes to support Sushy 1.3.0 +* Redfish: Adding the ability to get and set iSCSI initiator +* Redfish: Adding the ability to set and unset iSCSI boot info +* Redfish: Changed 'update\_persistent\_boot' to set 'UefiTarget' boot device. Also removed 'mac' from 'set\_one\_time\_boot' +* Remove 'mac' argument for [un]set\_iscsi\_boot\_info() +* Changed '\_update\_persistent\_boot' to set 'UefiTarget' boot device also removed 'mac' from 'set\_one\_time\_boot' +* Add support to set iSCSI initiator information +* Retry power on operation for Blade servers +* Updates 'set\_one\_time\_boot' to accept MAC address +* Add support to get iscsi initiator information + +2.4.1 +----- + +* Updated ChangeLog for proliantutils 2.4.1 release +* Redfish: Adds HPEConnector to proliantutils +* Add firmware update support using SUM +* Redfish: fix for model number string for Gen9 and above + +2.4.0 +----- + +* Updated ChangeLog for proliantutils 2.4.0 release +* Redfish: followup patch for properties +* Allow local\_gb to be 0 +* Renaming clean step 'update\_firmware' to 'update\_firmware\_sum' +* Redfish: Adds drive\_rotational\_\_rpm attribute to server capabilities +* Redfish: Adds logical\_raid\_level\_ attributes to server capabilities +* Redfish: Add has\_nvme\_ssd to server capabilities +* Redfish: Add has\_rotational attribute to server capabilities +* Redfish: Add has\_ssd attribute to proliantutils +* Redfish: Follow up patch for storage related resources +* Redfish: Add local\_gb attribute to get\_essential\_properties +* Change server capability 'raid\_support' to 'hardware\_supports\_raid' +* Redfish: Adds memory attributes to server capabilities +* Redfish: Adds SimpleStorage URI for local\_gb discovery +* Redfish: Add the Storage and its related URIs for local\_gb discovery +* Add client tests for redfish calls +* Redfish: Adds capability to get hardware raid support +* Redfish: Adds SmartStorage and its related URIs for local\_gb discovery +* Support to get hardware raid support +* Discover Storage details +* Redfish: Add 'iscsi\_boot' capability +* Discover iscsi\_boot attribute +* Redfish: Adds test case for 'get\_supported\_boot\_mode' +* Redfish: Adds get\_essential\_properties() +* Redfish: Adds macs discovery +* Redfish: Adds support for boot mode capabilities +* Add supported boot modes to server capabilities +* Add test cases parity for RIS init +* Add cpu virtualisation capability +* Redfish: [Fix] Set pending boot mode json payload +* Remove sushy manager hack + +2.3.1 +----- + +* Updated ChangeLog for proliantutils 2.3.1 release +* Redfish: Adds secure\_boot to server capabilities +* Redfish: Add trusted\_boot capability +* Redfish: Add the nic\_capacity attributes +* Redfish: Adds server capabilities +* Redfish: Add secure boot API support +* Add 'sriov\_enabled' capability +* Redfish: Adds 'reset\_bios\_to\_default' API +* Redfish: Add the get\_server\_capabilities() and pci\_gpu\_device attribute +* Redfish: Adds 'reset\_ilo\_credential' for redfish systems +* Redfish: Follow-up patch for update persistent device +* Redfish: Add 'refresh' method for HPEManager +* Redfish: Adding the ability to set boot mode and devices +* Restructing redfish resource test files +* Redfish: Adding the ability to get persistent boot device +* Redfish: Adds 'update\_firmware' API support through redfish +* Redfish: Add support for Virtual Media Operations +* Redfish: Adds 'activate\_license' for redfish systems +* Redfish: Adding the ability to get current boot mode +* Redfish: Adding the ability to get pending boot mode +* Replace assertTrue(isinstance()) with assertIsInstance() +* Using assertIsNone() instead of assertEqual(None) +* Redfish: Adds manager support for redfish API's + +2.3.0 +----- + +* Change Logs for proliantutils 2.3.0 release +* Redfish: Adding the ability to get one time boot +* Support to perform erase on all the disks(volumes and drives) +* Redfish: Add system push power button operations +* Add HPE extensions support to redfish connection lib +* Redfish: Add system power operations +* Aligning redfish calls to new framework +* Support to return logs for hpsum firmware update +* Set 'trusted\_boot' capability only when TPM chip is present +* Instrumenting redfish into proliantutils' client +* Adding capability to check NVDIMM\_N availability +* Add support to get cpu virtualization capability +* Initial redfish commit +* Stop hosting coverage results in htmlcov dir +* Separate out rest infra from ris +* Refactor ris-rest infrastructure +* Add upper-constraints to testenv setup + +2.2.1 +----- + +* Updated ChangeLog for proliantutils 2.2.1 release +* Updating requirements.txt based on ironic +* [Fix gate] Update pbr requirement +* Add HPSUM firmware update support + +2.2.0 +----- + +* Change Log as part of proliantutils 2.2.0 release +* Add trusted\_boot to server capabilities +* snmp inspection for disk size +* Add \`erase\_devices\` into \`get\_clean\_step\` method +* Update hpssacli to ssacli +* Adds 'UefiTarget' as a boot option +* Add Sanitize disk erase support using SSA +* Support to disable iscsi boot option in iLO +* Change to disable target DHCP in iLO +* Add py35 to tox environments + +2.1.11 +------ + +* Change log added for 2.1.11 release +* Fix Inspection failure in Gen7 +* Adds support in hpssa for SDD interface 'Solid State SATA' +* Fix log message for exception in Gen7 +* Raise exception when HPSSA controller not available +* Add hpssa support only in raid mode +* RIBCL calls fails with 'requests' library version 2.11.0 + +2.1.10 +------ + +* Change log added for 2.1.10 release +* Modify error message of InvalidInputException in hpssa +* Adds constructor for InvalidInputError +* Fix 'raid\_config' validation error message +* Fix to accommodate very quick firmware update + +2.1.9 +----- + +* Change log added for 2.1.9 release +* Sort values of raid\_config for 'share\_physical\_disks' +* Fix the logic for fetching the gpu device count + +2.1.8 +----- + +* Passing 'process\_input' to the running hpssacli process +* Add RIS support for power operations +* Adds support in hpssa for SDD interface 'Solid State SAS' +* Add proper error message for extraction failure +* Modify minimum disk for RAID 0 in hpssa +* Add \`.flash\` extn to supported raw firmware files +* Adds test coverage in tox.ini +* Switch tox unit test command to use ostestr + +2.1.7 +----- + +* Added changelog to account for nic\_capacity changes +* Add support to get NIC info for any version + +2.1.6 +----- + +* Added changelog and authors +* Changes to NIC info retrieving logic +* Support for iLO based firmware update +* Reduce logical disk size returned by 1 + +2.1.5 +----- + +* Add logging for RIS and RIBCL modules +* HPSSA: Support 'MAX' as size\_gb for logical disks +* Fix slow test test\_wait\_for\_ilo\_after\_reset\_ribcl\_ok +* Fix ribcl to return correct number of processors +* Make proliantutils return 1 size less than actual disk size +* Providing logging infrastructure in proliantutils + +2.1.4 +----- + +* Fixes tox Warning issue +* Fix to allow Secure Boot API calls only in UEFI boot mode + +2.1.3 +----- + +* Update documentation +* IPA: Update proliant hardware manager +* Add RIS support for updating boot device + +2.1.2 +----- + +* RIS: Check if virtual media is attached before ejecting + +2.1.1 +----- + +* Check if virtual media is attached before ejecting +* Change dict() to {} +* Adding RIS support for virtual media interfaces +* Add support for certificate based authentication +* Add iSCSI boot support in RIS +* Activate iLO license +* Fix gate failures +* parsing storage data fails in some scenarios +* test cases for get\_nic\_capacity and ipmi.py +* Python 3 compatibility +* Missing argument in set\_http\_boot\_url +* update\_persistent\_boot to 'NETWORK' fails on Gen9 + +2.1.0 +----- + +* ILO: Add nic\_capacity to capabilities +* Bug Fixes + +2.0.2 +----- + +* Adding functionality required by ilo-inspection +* RIS:Add get\_pending\_boot\_mode +* Fallback to RIBCL +* Refactor code in RIS +* Fix exceptions +* ILO: (PART-1) Test cases for RIS Operations +* ILO:Check if iLO is up after reset\_ilo +* ILO: Add unit tests for ris.RISOperations.\_rest\_op +* ILO: Support for configuring httpboot through RIS +* ILO: Add empty unit test files for ris +* ILO: Add support for GET\_EMBEDDED\_HEALTH +* HPSSA: Add support for sharing physical disks +* HPSSA: create and get should return physical disks info +* HPSSA: Handle all storage units +* HPSSA: Add support for nested RAID levels +* Support CDROM in get/set persistent boot methods +* HPSSA: Add disk allocator +* HPSSA: RAID creation should return current config +* ILO: Update get\_persistent\_boot for UEFI +* HPSSA: Move test outputs to a single file +* HPSSA: Fix the disk sorting issue on create +* Add Proliant Hardware Manager for IPA +* Update ris module to be consistent with operations + +2.0.1 +----- + +* Add hpssa module to proliantutils +* Add cleaning operations + +2.0.0 +----- + +* Fix broken backward compatibility +* Fix boot mode exceptions for Gen 7 servers +* Initial Support to RIS +* Add hacking and fix pep8 issues +* Fix pep8 errors in ribcl and its test module +* Add tox for proliantutils module +* Fix update\_persistent\_boot for Gen9 servers +* Backout changes from 18bbcad +* Add system health methods to ribcl module +* Remove unused variable +* Fix minor space issues in ribcl module +* Add update\_persistent\_boot to ribcl module +* Add boot mode commands to ribcl module +* Add support for pbr +* Add documentation to ribcl module +* HPSSA: Add functional tests for create +* HPSSA: Fixes for issue found during functional testing +* Submit ribcl ilo module +* Initial commit diff -pruN 2.12.0-1/debian/changelog 2.12.2-0ubuntu1/debian/changelog --- 2.12.0-1/debian/changelog 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/changelog 2022-01-12 19:57:38.000000000 +0000 @@ -1,35 +1,35 @@ -python-proliantutils (2.12.0-1) unstable; urgency=medium +python-proliantutils (2.12.2-0ubuntu1) jammy; urgency=medium - [ Thomas Goirand ] - * Uploading to unstable. - * Add Fix_the_test_cases_for_latest_sushy.patch (Closes: #997545). + * New upstream release for OpenStack Yoga. + * d/control: Align (Build-)Depends with upstream. + * d/control: Bump debhelper compat to 13. + * d/rules: Switch to pybuild. - [ Kevin Allioli ] - * New upstream release. - * Added myself in copyright and uploaders. - - -- Thomas Goirand Fri, 12 Nov 2021 14:02:48 +0100 + -- Corey Bryant Wed, 12 Jan 2022 14:57:38 -0500 -python-proliantutils (2.11.0-1) experimental; urgency=medium +python-proliantutils (2.12.0-0ubuntu1) impish; urgency=medium - * New upstream release. + * New upstream release for OpenStack Xena. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Mon, 08 Mar 2021 12:54:01 +0100 + -- Corey Bryant Tue, 07 Sep 2021 15:37:39 -0400 -python-proliantutils (2.10.0-2) unstable; urgency=medium +python-proliantutils (2.11.0-0ubuntu1) hirsute; urgency=medium - * Uploading to unstable. - * Add a debian/salsa-ci.yml. - * Fixed watch file to use the git mode and the new upstream URL. + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. + * New upstream release for OpenStack Wallaby. - -- Thomas Goirand Wed, 14 Oct 2020 12:48:43 +0200 + -- Corey Bryant Wed, 17 Mar 2021 11:27:18 -0400 -python-proliantutils (2.10.0-1) experimental; urgency=medium +python-proliantutils (2.10.0-0ubuntu1) groovy; urgency=medium + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + * d/watch: Get tarball from pypi.debian.net. * New upstream release. - * Fixed (build-)depends for this release. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Wed, 09 Sep 2020 09:18:39 +0200 + -- Corey Bryant Thu, 01 Oct 2020 16:34:23 -0400 python-proliantutils (2.9.4-1) unstable; urgency=medium diff -pruN 2.12.0-1/debian/control 2.12.2-0ubuntu1/debian/control --- 2.12.0-1/debian/control 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/control 2022-01-12 19:57:38.000000000 +0000 @@ -1,42 +1,44 @@ Source: python-proliantutils Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Michal Arbet , - Kevin Allioli , Build-Depends: - debhelper-compat (= 10), + debhelper-compat (= 13), dh-python, openstack-pkg-tools, python3-all, - python3-pbr, + python3-pbr (>= 2.0.0), python3-setuptools, python3-sphinx, Build-Depends-Indep: python3-coverage, python3-ddt, - python3-jsonschema, + python3-hacking, + python3-jsonschema (>= 2.6.0), python3-mock, python3-openssl (>= 19.1.0), python3-os-testr, - python3-oslo.concurrency, - python3-oslo.serialization, - python3-oslo.utils, - python3-pysnmp4, - python3-requests, - python3-retrying, - python3-six, + python3-oslo.concurrency (>= 3.8.0), + python3-oslo.serialization (>= 1.10.0), + python3-oslo.utils (>= 3.20.0), + python3-pysnmp4 (>= 4.2.3), + python3-requests (>= 2.10.0), + python3-retrying (>= 1.2.3), + python3-six (>= 1.9.0), + python3-stestr, python3-subunit, python3-sushy (>= 3.11.0), - python3-testtools, + python3-testtools (>= 1.4.0), python3-xmltodict, subunit, testrepository, Standards-Version: 4.1.3 -Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-proliantutils -Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-proliantutils.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-proliantutils +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-proliantutils Homepage: https://opendev.org/x/proliantutils Package: python-proliantutils-doc @@ -55,16 +57,16 @@ Description: client lib interfacing vari Package: python3-proliantutils Architecture: all Depends: - python3-jsonschema, - python3-oslo.concurrency, - python3-oslo.serialization, - python3-oslo.utils, - python3-pbr, - python3-pysnmp4, - python3-requests, - python3-retrying, + python3-jsonschema (>= 2.6.0), python3-openssl (>= 19.1.0), - python3-six, + python3-oslo.concurrency (>= 3.8.0), + python3-oslo.serialization (>= 1.10.0), + python3-oslo.utils (>= 3.20.0), + python3-pbr (>= 2.0.0), + python3-pysnmp4 (>= 4.2.3), + python3-requests (>= 2.10.0), + python3-retrying (>= 1.2.3), + python3-six (>= 1.9.0), python3-sushy (>= 3.11.0), ${misc:Depends}, ${python3:Depends}, diff -pruN 2.12.0-1/debian/copyright 2.12.2-0ubuntu1/debian/copyright --- 2.12.0-1/debian/copyright 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/copyright 2022-01-12 19:57:38.000000000 +0000 @@ -6,7 +6,6 @@ Files: * Copyright: (c) 2012-2016, Hewlett Packard (c) 2012, NTT DOCOMO, INC. (c) 2014, IBM - (C) 2021, Kevin Allioli License: Apache-2 Files: debian/* diff -pruN 2.12.0-1/debian/gbp.conf 2.12.2-0ubuntu1/debian/gbp.conf --- 2.12.0-1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/gbp.conf 2022-01-12 19:57:38.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 2.12.0-1/debian/patches/Fix_the_test_cases_for_latest_sushy.patch 2.12.2-0ubuntu1/debian/patches/Fix_the_test_cases_for_latest_sushy.patch --- 2.12.0-1/debian/patches/Fix_the_test_cases_for_latest_sushy.patch 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/patches/Fix_the_test_cases_for_latest_sushy.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,450 +0,0 @@ -Description: Fix the test cases for latest sushy - This patch fixes the test cases which are dependent on - changes in sushy library version 3.12.0. -From: Nisha Agarwal -Date: Mon, 8 Nov 2021 03:58:50 -0800 -Closes-Bug: 1950421 -Change-Id: I485010c613b0e8d5d4c9bcb96959730bae42dc88 -Bug-Debian: https://bugs.debian.org/997545 - -diff --git a/proliantutils/tests/redfish/resources/manager/test_security_params.py b/proliantutils/tests/redfish/resources/manager/test_security_params.py -index c279c5a9..68c86df0 100644 ---- a/proliantutils/tests/redfish/resources/manager/test_security_params.py -+++ b/proliantutils/tests/redfish/resources/manager/test_security_params.py -@@ -36,7 +36,8 @@ class SecurityParamsTestCase(testtools.TestCase): - path = ("/redfish/v1/Mangers/1/SecurityService/" - "SecurityDashboard/SecurityParams") - self.sec_param = security_params.SecurityParams( -- self.conn, path, '1.0.2', None) -+ self.conn, path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sec_param._parse_attributes(self.json_doc) -@@ -67,7 +68,7 @@ class SecurityParamsCollectionTestCase(testtools.TestCase): - self.conn, - ('/redfish/v1/Managers/1/SecurityService/' - 'SecurityDashboard/SecurityParams'), -- redfish_version='1.0.2') -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sec_params_col._parse_attributes(self.json_doc) -@@ -89,7 +90,8 @@ class SecurityParamsCollectionTestCase(testtools.TestCase): - self.sec_params_col._conn, - ('/redfish/v1/Managers/1/SecurityService/SecurityDashboard/' - 'SecurityParams/1'), -- self.sec_params_col.redfish_version, None) -+ redfish_version=self.sec_params_col.redfish_version, -+ registries=None, root=self.sec_params_col.root) - - @mock.patch.object(security_params, 'SecurityParams', autospec=True) - def test_get_members(self, mock_eth): -@@ -99,9 +101,11 @@ class SecurityParamsCollectionTestCase(testtools.TestCase): - path2 = ('/redfish/v1/Managers/1/SecurityService/SecurityDashboard/' - 'SecurityParams/1') - calls = [mock.call(self.sec_params_col._conn, path, -- self.sec_params_col.redfish_version, None), -+ redfish_version=self.sec_params_col.redfish_version, -+ registries=None, root=self.sec_params_col.root), - mock.call(self.sec_params_col._conn, path2, -- self.sec_params_col.redfish_version, None)] -+ redfish_version=self.sec_params_col.redfish_version, -+ registries=None, root=self.sec_params_col.root)] - mock_eth.assert_has_calls(calls) - self.assertIsInstance(members, list) - self.assertEqual(2, len(members)) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py b/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py -index 348875b2..362a66fd 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py -@@ -34,7 +34,8 @@ class HPEArrayControllerTestCase(testtools.TestCase): - - path = ("/redfish/v1/Systems/1/SmartStorage/ArrayControllers") - self.sys_stor = array_controller.HPEArrayController( -- self.conn, path, '1.0.2', None) -+ self.conn, path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor._parse_attributes(self.json_doc) -@@ -91,7 +92,7 @@ class HPEArrayControllerCollectionTestCase(testtools.TestCase): - self.conn.get.return_value.json.return_value = self.json_doc - self.sys_stor_col = array_controller.HPEArrayControllerCollection( - self.conn, '/redfish/v1/Systems/1/SmartStorage/ArrayControllers', -- '1.0.2', None) -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor_col._parse_attributes(self.json_doc) -@@ -108,7 +109,8 @@ class HPEArrayControllerCollectionTestCase(testtools.TestCase): - mock_eth.assert_called_once_with( - self.sys_stor_col._conn, - '/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0', -- self.sys_stor_col.redfish_version, None) -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root) - - @mock.patch.object(array_controller, 'HPEArrayController', autospec=True) - def test_get_members(self, mock_eth): -@@ -116,7 +118,8 @@ class HPEArrayControllerCollectionTestCase(testtools.TestCase): - path = ("/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0") - calls = [ - mock.call(self.sys_stor_col._conn, path, -- self.sys_stor_col.redfish_version, None), -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root), - ] - mock_eth.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_drive.py b/proliantutils/tests/redfish/resources/system/storage/test_drive.py -index 06c526a7..2f708d41 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_drive.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_drive.py -@@ -35,7 +35,8 @@ class DriveTestCase(testtools.TestCase): - drive_path = ("/redfish/v1/Systems/437XR1138R2/Storage/1/" - "Drives/35D38F11ACEF7BD3") - self.sys_drive = drive.Drive( -- self.conn, drive_path, redfish_version='1.0.2') -+ self.conn, drive_path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_drive._parse_attributes(self.json_doc['drive1']) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py b/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py -index 2ae5a38b..bdc7ade0 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py -@@ -34,7 +34,7 @@ class HPELogicalDriveTestCase(testtools.TestCase): - path = ("/redfish/v1/Systems/1/SmartStorage/" - "ArrayControllers/0/LogicalDrives") - self.sys_stor = logical_drive.HPELogicalDrive( -- self.conn, path, '1.0.2', None) -+ self.conn, path, '1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor._parse_attributes(self.json_doc) -@@ -53,7 +53,7 @@ class HPELogicalDriveCollectionTestCase(testtools.TestCase): - self.sys_stor_col = logical_drive.HPELogicalDriveCollection( - self.conn, ('/redfish/v1/Systems/1/SmartStorage/' - 'ArrayControllers/0/LogicalDrives'), -- redfish_version='1.0.2') -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor_col._parse_attributes(self.json_doc) -@@ -75,7 +75,8 @@ class HPELogicalDriveCollectionTestCase(testtools.TestCase): - self.sys_stor_col._conn, - ('/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0/' - 'LogicalDrives/1'), -- self.sys_stor_col.redfish_version, None) -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root) - - @mock.patch.object(logical_drive, 'HPELogicalDrive', autospec=True) - def test_get_members(self, mock_eth): -@@ -86,9 +87,11 @@ class HPELogicalDriveCollectionTestCase(testtools.TestCase): - "0/LogicalDrives/2") - calls = [ - mock.call(self.sys_stor_col._conn, path1, -- self.sys_stor_col.redfish_version, None), -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root), - mock.call(self.sys_stor_col._conn, path2, -- self.sys_stor_col.redfish_version, None), -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root), - ] - mock_eth.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py b/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py -index a96956a2..ce42a738 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py -@@ -35,7 +35,8 @@ class HPEPhysicalDriveTestCase(testtools.TestCase): - path = ("/redfish/v1/Systems/1/SmartStorage/" - "ArrayControllers/0/DiskDrives") - self.sys_stor = physical_drive.HPEPhysicalDrive( -- self.conn, path, '1.0.2', None) -+ self.conn, path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor._parse_attributes(self.json_doc['drive1']) -@@ -56,7 +57,7 @@ class HPEPhysicalDriveCollectionTestCase(testtools.TestCase): - self.sys_stor_col = physical_drive.HPEPhysicalDriveCollection( - self.conn, ('/redfish/v1/Systems/1/SmartStorage/' - 'ArrayControllers/0/DiskDrives'), -- redfish_version='1.0.2') -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor_col._parse_attributes(self.json_doc) -@@ -78,7 +79,8 @@ class HPEPhysicalDriveCollectionTestCase(testtools.TestCase): - self.sys_stor_col._conn, - ('/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0/' - 'DiskDrives/3'), -- self.sys_stor_col.redfish_version, None) -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root) - - @mock.patch.object(physical_drive, 'HPEPhysicalDrive', autospec=True) - def test_get_members(self, mock_eth): -@@ -89,9 +91,11 @@ class HPEPhysicalDriveCollectionTestCase(testtools.TestCase): - "0/DiskDrives/4") - calls = [ - mock.call(self.sys_stor_col._conn, path, -- self.sys_stor_col.redfish_version, None), -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root), - mock.call(self.sys_stor_col._conn, path2, -- self.sys_stor_col.redfish_version, None), -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root), - ] - mock_eth.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py b/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py -index 193356f1..3967b209 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py -@@ -33,7 +33,8 @@ class SimpleStorageTestCase(testtools.TestCase): - - simple_path = ("/redfish/v1/Systems/437XR1138R2/SimpleStorage/1") - self.sys_simple = simple_storage.SimpleStorage( -- self.conn, simple_path, '1.0.2', None) -+ self.conn, simple_path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_simple._parse_attributes(self.json_doc) -@@ -65,7 +66,7 @@ class SimpleStorageCollectionTestCase(testtools.TestCase): - self.conn.get.return_value.json.return_value = self.json_doc - self.sys_simple_col = simple_storage.SimpleStorageCollection( - self.conn, '/redfish/v1/Systems/437XR1138R2/SimpleStorage', -- '1.0.2', None) -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_simple_col._parse_attributes(self.json_doc) -@@ -82,7 +83,8 @@ class SimpleStorageCollectionTestCase(testtools.TestCase): - mock_simple.assert_called_once_with( - self.sys_simple_col._conn, - '/redfish/v1/Systems/437XR1138R2/SimpleStorage/1', -- self.sys_simple_col.redfish_version, None) -+ redfish_version=self.sys_simple_col.redfish_version, -+ registries=None, root=self.sys_simple_col.root) - - @mock.patch.object(simple_storage, 'SimpleStorage', autospec=True) - def test_get_members(self, mock_simple): -@@ -90,7 +92,8 @@ class SimpleStorageCollectionTestCase(testtools.TestCase): - simple_path = ("/redfish/v1/Systems/437XR1138R2/SimpleStorage/1") - calls = [ - mock.call(self.sys_simple_col._conn, simple_path, -- self.sys_simple_col.redfish_version, None), -+ redfish_version=self.sys_simple_col.redfish_version, -+ registries=None, root=self.sys_simple_col.root), - ] - mock_simple.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py b/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py -index 3234aa51..f43c33ee 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py -@@ -34,7 +34,7 @@ class HPESmartStorageTestCase(testtools.TestCase): - - path = ("/redfish/v1/Systems/1/SmartStorage") - self.sys_stor = smart_storage.HPESmartStorage( -- self.conn, path, '1.0.2', None) -+ self.conn, path, '1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor._parse_attributes(self.json_doc) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_storage.py b/proliantutils/tests/redfish/resources/system/storage/test_storage.py -index 1aeac97f..6f4573a2 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_storage.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_storage.py -@@ -32,7 +32,8 @@ class StorageTestCase(testtools.TestCase): - - path = ("/redfish/v1/Systems/437XR1138R2/Storage/1") - self.sys_stor = storage.Storage( -- self.conn, path, redfish_version='1.0.2') -+ self.conn, path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor._parse_attributes(self.json_doc) -@@ -154,7 +155,7 @@ class StorageCollectionTestCase(testtools.TestCase): - self.conn.get.return_value.json.return_value = self.json_doc - self.sys_stor_col = storage.StorageCollection( - self.conn, '/redfish/v1/Systems/437XR1138R2/Storage', -- redfish_version='1.0.2') -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_stor_col._parse_attributes(self.json_doc) -@@ -171,7 +172,8 @@ class StorageCollectionTestCase(testtools.TestCase): - mock_eth.assert_called_once_with( - self.sys_stor_col._conn, - ('/redfish/v1/Systems/437XR1138R2/Storage/1'), -- self.sys_stor_col.redfish_version, None) -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root) - - @mock.patch.object(storage, 'Storage', autospec=True) - def test_get_members(self, mock_eth): -@@ -179,7 +181,8 @@ class StorageCollectionTestCase(testtools.TestCase): - path = ("/redfish/v1/Systems/437XR1138R2/Storage/1") - calls = [ - mock.call(self.sys_stor_col._conn, path, -- self.sys_stor_col.redfish_version, None), -+ redfish_version=self.sys_stor_col.redfish_version, -+ registries=None, root=self.sys_stor_col.root), - ] - mock_eth.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/storage/test_volume.py b/proliantutils/tests/redfish/resources/system/storage/test_volume.py -index f508866b..d5ad3103 100644 ---- a/proliantutils/tests/redfish/resources/system/storage/test_volume.py -+++ b/proliantutils/tests/redfish/resources/system/storage/test_volume.py -@@ -32,7 +32,8 @@ class VolumeTestCase(testtools.TestCase): - - vol_path = ("/redfish/v1/Systems/437XR1138R2/Storage/1/Volumes/1") - self.sys_vol = volume.Volume( -- self.conn, vol_path, '1.0.2', None) -+ self.conn, vol_path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_vol._parse_attributes(self.json_doc) -@@ -52,7 +53,7 @@ class VolumeCollectionTestCase(testtools.TestCase): - self.conn.get.return_value.json.return_value = self.json_doc - self.sys_vol_col = volume.VolumeCollection( - self.conn, '/redfish/v1/Systems/437XR1138R2/Storage/1/Volumes', -- '1.0.2', None) -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_vol_col._parse_attributes(self.json_doc) -@@ -69,7 +70,8 @@ class VolumeCollectionTestCase(testtools.TestCase): - mock_vol.assert_called_once_with( - self.sys_vol_col._conn, - ('/redfish/v1/Systems/437XR1138R2/Volumes/1'), -- self.sys_vol_col.redfish_version, None) -+ redfish_version=self.sys_vol_col.redfish_version, -+ registries=None, root=self.sys_vol_col.root) - - @mock.patch.object(volume, 'Volume', autospec=True) - def test_get_members(self, mock_vol): -@@ -77,7 +79,8 @@ class VolumeCollectionTestCase(testtools.TestCase): - vol_path = ("/redfish/v1/Systems/437XR1138R2/Storage/1/Volumes/1") - calls = [ - mock.call(self.sys_vol_col._conn, vol_path, -- self.sys_vol_col.redfish_version, None), -+ redfish_version=self.sys_vol_col.redfish_version, -+ registries=None, root=self.sys_vol_col.root), - ] - mock_vol.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py b/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py -index 9f931981..10c9fb3c 100644 ---- a/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py -+++ b/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py -@@ -36,7 +36,8 @@ class EthernetInterfaceTestCase(testtools.TestCase): - eth_path = ("/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/" - "12446A3B0411") - self.sys_eth = ethernet_interface.EthernetInterface( -- self.conn, eth_path, '1.0.2', None) -+ self.conn, eth_path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_eth._parse_attributes(self.json_doc['default']) -@@ -64,7 +65,7 @@ class EthernetInterfaceCollectionTestCase(testtools.TestCase): - self.conn.get.return_value.json.return_value = self.json_doc - self.sys_eth_col = ethernet_interface.EthernetInterfaceCollection( - self.conn, '/redfish/v1/Systems/437XR1138R2/EthernetInterfaces', -- '1.0.2', None) -+ '1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_eth_col._parse_attributes(self.json_doc) -@@ -84,7 +85,8 @@ class EthernetInterfaceCollectionTestCase(testtools.TestCase): - self.sys_eth_col._conn, - ('/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/' - '12446A3B0411'), -- self.sys_eth_col.redfish_version, None) -+ redfish_version=self.sys_eth_col.redfish_version, registries=None, -+ root=self.sys_eth_col.root) - - @mock.patch.object(ethernet_interface, 'EthernetInterface', autospec=True) - def test_get_members(self, mock_eth): -@@ -93,7 +95,9 @@ class EthernetInterfaceCollectionTestCase(testtools.TestCase): - "12446A3B0411") - calls = [ - mock.call(self.sys_eth_col._conn, eth_path, -- self.sys_eth_col.redfish_version, None), -+ redfish_version=self.sys_eth_col.redfish_version, -+ registries=None, -+ root=self.sys_eth_col.root), - ] - mock_eth.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/proliantutils/tests/redfish/resources/system/test_pci_device.py b/proliantutils/tests/redfish/resources/system/test_pci_device.py -index 7369c244..21f2b43d 100644 ---- a/proliantutils/tests/redfish/resources/system/test_pci_device.py -+++ b/proliantutils/tests/redfish/resources/system/test_pci_device.py -@@ -33,7 +33,8 @@ class PCIDeviceTestCase(testtools.TestCase): - - pci_path = "/redfish/v1/Systems/1/PCIDevices/1" - self.sys_pci = pci_device.PCIDevice( -- self.conn, pci_path, '1.0.2', None) -+ self.conn, pci_path, redfish_version='1.0.2', -+ registries=None, root=None) - - def test__parse_attributes(self): - self.sys_pci._parse_attributes(self.json_doc) -@@ -53,7 +54,7 @@ class PCIDeviceCollectionTestCase(testtools.TestCase): - self.conn.get.return_value.json.return_value = self.json_doc - self.sys_pci_col = pci_device.PCIDeviceCollection( - self.conn, '/redfish/v1/Systems/1/PCIDevices', -- redfish_version='1.0.2') -+ redfish_version='1.0.2', registries=None, root=None) - - def test__parse_attributes(self): - self.sys_pci_col._parse_attributes(self.json_doc) -@@ -70,7 +71,8 @@ class PCIDeviceCollectionTestCase(testtools.TestCase): - mock_pci.assert_called_once_with( - self.sys_pci_col._conn, - ('/redfish/v1/Systems/1/PCIDevices/1'), -- self.sys_pci_col.redfish_version, None) -+ redfish_version=self.sys_pci_col.redfish_version, -+ registries=None, root=self.sys_pci_col.root) - - @mock.patch.object(pci_device, 'PCIDevice', autospec=True) - def test_get_members(self, mock_pci): -@@ -79,9 +81,11 @@ class PCIDeviceCollectionTestCase(testtools.TestCase): - "/redfish/v1/Systems/1/PCIDevices/6"] - calls = [ - mock.call(self.sys_pci_col._conn, path_list[0], -- self.sys_pci_col.redfish_version, None), -+ redfish_version=self.sys_pci_col.redfish_version, -+ registries=None, root=self.sys_pci_col.root), - mock.call(self.sys_pci_col._conn, path_list[1], -- self.sys_pci_col.redfish_version, None) -+ redfish_version=self.sys_pci_col.redfish_version, -+ registries=None, root=self.sys_pci_col.root) - ] - mock_pci.assert_has_calls(calls) - self.assertIsInstance(members, list) -diff --git a/requirements.txt b/requirements.txt -index a9bdc1d6..e47b028b 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -9,5 +9,5 @@ retrying!=1.3.0,>=1.2.3 # Apache-2.0 - pysnmp>=4.2.3,<5.0.0 # BSD - - # Redfish communication uses the Sushy library --sushy>=3.1.0 -+sushy>=3.11.0 - pyOpenSSL>=19.1.0 diff -pruN 2.12.0-1/debian/patches/series 2.12.2-0ubuntu1/debian/patches/series --- 2.12.0-1/debian/patches/series 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Fix_the_test_cases_for_latest_sushy.patch diff -pruN 2.12.0-1/debian/rules 2.12.2-0ubuntu1/debian/rules --- 2.12.0-1/debian/rules 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/rules 2022-01-12 19:57:38.000000000 +0000 @@ -3,11 +3,13 @@ UPSTREAM_GIT := https://opendev.org/x/proliantutils include /usr/share/openstack-pkg-tools/pkgos.make +export PYBUILD_NAME=proliantutils + %: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + dh $@ --buildsystem=pybuild --with python3,sphinxdoc override_dh_clean: - dh_clean -O--buildsystem=python_distutils + dh_clean -O--buildsystem=pybuild rm -rf build .testrepository override_dh_auto_clean: @@ -28,4 +30,4 @@ endif override_dh_sphinxdoc: PYTHON=python3 python3 -m sphinx -b html doc/source debian/python-proliantutils-doc/usr/share/doc/python-proliantutils-doc/html - dh_sphinxdoc -O--buildsystem=python_distutils + dh_sphinxdoc -O--buildsystem=pybuild diff -pruN 2.12.0-1/debian/salsa-ci.yml 2.12.2-0ubuntu1/debian/salsa-ci.yml --- 2.12.0-1/debian/salsa-ci.yml 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 2.12.0-1/debian/watch 2.12.2-0ubuntu1/debian/watch --- 2.12.0-1/debian/watch 2021-11-12 13:02:48.000000000 +0000 +++ 2.12.2-0ubuntu1/debian/watch 2022-01-12 19:57:38.000000000 +0000 @@ -1,3 +1,4 @@ version=3 -opts="mode=git" https://opendev.org/x/proliantutils \ -refs/tags/v([\d\.]+) debian uupdate +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/proliantutils/proliantutils-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) + diff -pruN 2.12.0-1/.gitignore 2.12.2-0ubuntu1/.gitignore --- 2.12.0-1/.gitignore 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -.eggs - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -bin/ -build/ -develop-eggs/ -dist/ -eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -cover/ -.coverage* -!.coveragerc -htmlcov/ -.tox/ -.coverage -.cache -nosetests.xml -coverage.xml -.testrepository/ -.stestr - -# Translations -*.mo - -# Mr Developer -.mr.developer.cfg -.project -.pydevproject - -# Rope -.ropeproject - -# Django stuff: -*.log -*.pot - -# Sphinx documentation -docs/_build/ - -# PBR autogenerated -AUTHORS -ChangeLog diff -pruN 2.12.0-1/.gitreview 2.12.2-0ubuntu1/.gitreview --- 2.12.0-1/.gitreview 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/.gitreview 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -[gerrit] -host=review.opendev.org -port=29418 -project=x/proliantutils.git diff -pruN 2.12.0-1/PKG-INFO 2.12.2-0ubuntu1/PKG-INFO --- 2.12.0-1/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/PKG-INFO 2021-12-01 12:18:55.709110700 +0000 @@ -0,0 +1,65 @@ +Metadata-Version: 1.2 +Name: proliantutils +Version: 2.12.2 +Summary: Client Library for interfacing with various devices in HP Proliant Servers. +Home-page: https://opendev.org/x/proliantutils +Author: Hewlett Packard Enterprise +Author-email: proliantutils@gmail.com +License: Apache License, Version 2.0 +Description: proliantutils + ============= + + **proliantutils** is a set of utility libraries for interfacing and managing + various components (like iLO, HPSSA) for HPE Proliant Servers. This library + is used by iLO drivers in Ironic for managing Proliant Servers (though the + library can be used by anyone who wants to manage HPE Proliant servers). + + Please use launchpad_ to report bugs and ask questions. + + .. _launchpad: https://bugs.launchpad.net/proliantutils + + Installation + ------------ + + Install the module from PyPI_. If you are using Ironic, install the module + on Ironic conductor node:: + + pip install proliantutils + + .. _PyPI: https://pypi.python.org/pypi/proliantutils + + Some GNU/Linux distributions provide *python-proliantutils* package. + + Usage + ----- + + iLO + ~~~ + + For interfacing with the iLO, use *IloClient* object:: + + >>> from proliantutils.ilo import client + >>> ilo_client = client.IloClient('10.10.1.57', 'Administrator', 'password') + >>> ilo_client.get_host_power_status() + 'OFF' + >>> + + For operations supported on the client object, please refer + *proliantutils.ilo.operations*. + + +Platform: UNKNOWN +Classifier: Development Status :: 4 - Beta +Classifier: Environment :: Console +Classifier: Environment :: Web Environment +Classifier: Intended Audience :: Developers +Classifier: Intended Audience :: Information Technology +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.6 diff -pruN 2.12.0-1/proliantutils/redfish/redfish.py 2.12.2-0ubuntu1/proliantutils/redfish/redfish.py --- 2.12.0-1/proliantutils/redfish/redfish.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/redfish/redfish.py 2021-12-01 12:18:07.000000000 +0000 @@ -25,7 +25,6 @@ from OpenSSL.crypto import FILETYPE_ASN1 from OpenSSL.crypto import load_certificate from six.moves.urllib import parse import sushy -from sushy.resources.system import mappings as sushy_map from sushy import utils from proliantutils import exception @@ -127,6 +126,15 @@ _CERTIFICATE_PATTERN = ( LOG = log.get_logger(__name__) +# Copied from ironic/drivers/modules/redfish/inspect.py +CPU_ARCH_MAP = { + sushy.PROCESSOR_ARCH_x86: 'x86_64', + sushy.PROCESSOR_ARCH_IA_64: 'ia64', + sushy.PROCESSOR_ARCH_ARM: 'arm', + sushy.PROCESSOR_ARCH_MIPS: 'mips', + sushy.PROCESSOR_ARCH_OEM: 'oem' +} + class RedfishOperations(operations.IloOperations): """Operations supported on redfish based hardware. @@ -1237,8 +1245,8 @@ class RedfishOperations(operations.IloOp # local_gb = sushy_system.storage_summary prop = {'memory_mb': (sushy_system.memory_summary.size_gib * 1024), 'cpus': sushy_system.processors.summary.count, - 'cpu_arch': sushy_map.PROCESSOR_ARCH_VALUE_MAP_REV.get( - sushy_system.processors.summary.architecture), + 'cpu_arch': CPU_ARCH_MAP.get( + sushy_system.processors.summary.architecture), 'local_gb': common_storage.get_local_gb(sushy_system)} return {'properties': prop, 'macs': sushy_system.ethernet_interfaces.summary} diff -pruN 2.12.0-1/proliantutils/redfish/resources/system/ethernet_interface.py 2.12.2-0ubuntu1/proliantutils/redfish/resources/system/ethernet_interface.py --- 2.12.0-1/proliantutils/redfish/resources/system/ethernet_interface.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/redfish/resources/system/ethernet_interface.py 2021-12-01 12:18:07.000000000 +0000 @@ -14,14 +14,12 @@ # License for the specific language governing permissions and limitations # under the License. +import sushy from sushy.resources import base from sushy.resources.system import ethernet_interface from sushy import utils as sushy_utils -from proliantutils.redfish.resources.system import constants as sys_cons - - class EthernetInterface(ethernet_interface.EthernetInterface): uefi_device_path = base.Field('UefiDevicePath') @@ -50,8 +48,8 @@ class EthernetInterfaceCollection(base.R for eth in self.get_members(): if eth.mac_address is not None: if (eth.status is not None - and eth.status.health == sys_cons.HEALTH_OK - and eth.status.state == sys_cons.HEALTH_STATE_ENABLED): + and eth.status.health == sushy.HEALTH_OK + and eth.status.state == sushy.STATE_ENABLED): mac_dict.update( {'Port ' + eth.identity: eth.mac_address}) return mac_dict diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/manager/test_https_cert.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/manager/test_https_cert.py --- 2.12.0-1/proliantutils/tests/redfish/resources/manager/test_https_cert.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/manager/test_https_cert.py 2021-12-01 12:18:07.000000000 +0000 @@ -110,16 +110,20 @@ class HttpsCertTestCase(testtools.TestCa 'The Redfish controller failed to import certificate. Error', self.https_cert_inst.import_certificate, 'certificate') + @mock.patch('time.sleep', autospec=True) @mock.patch.object(https_cert.HttpsCert, 'get_generate_csr_refresh', autospec=True) - def test_wait_for_csr_to_create_ok(self, get_generate_csr_refresh_mock): + def test_wait_for_csr_to_create_ok(self, get_generate_csr_refresh_mock, + sleep_mock): self.cert_sign_request = 'certificate' self.https_cert_inst.wait_for_csr_to_create() self.assertTrue(get_generate_csr_refresh_mock.called) + @mock.patch('time.sleep', autospec=True) @mock.patch.object(https_cert.HttpsCert, 'get_generate_csr_refresh', autospec=True) - def test_wait_for_csr_to_create_fails(self, get_generate_csr_refresh_mock): + def test_wait_for_csr_to_create_fails(self, get_generate_csr_refresh_mock, + sleep_mock): exc = exception.IloError('error') get_generate_csr_refresh_mock.side_effect = exc self.assertRaises(exception.IloError, diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/manager/test_security_params.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/manager/test_security_params.py --- 2.12.0-1/proliantutils/tests/redfish/resources/manager/test_security_params.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/manager/test_security_params.py 2021-12-01 12:18:07.000000000 +0000 @@ -36,7 +36,8 @@ class SecurityParamsTestCase(testtools.T path = ("/redfish/v1/Mangers/1/SecurityService/" "SecurityDashboard/SecurityParams") self.sec_param = security_params.SecurityParams( - self.conn, path, '1.0.2', None) + self.conn, path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sec_param._parse_attributes(self.json_doc) @@ -67,7 +68,7 @@ class SecurityParamsCollectionTestCase(t self.conn, ('/redfish/v1/Managers/1/SecurityService/' 'SecurityDashboard/SecurityParams'), - redfish_version='1.0.2') + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sec_params_col._parse_attributes(self.json_doc) @@ -89,7 +90,8 @@ class SecurityParamsCollectionTestCase(t self.sec_params_col._conn, ('/redfish/v1/Managers/1/SecurityService/SecurityDashboard/' 'SecurityParams/1'), - self.sec_params_col.redfish_version, None) + redfish_version=self.sec_params_col.redfish_version, + registries=None, root=self.sec_params_col.root) @mock.patch.object(security_params, 'SecurityParams', autospec=True) def test_get_members(self, mock_eth): @@ -99,9 +101,11 @@ class SecurityParamsCollectionTestCase(t path2 = ('/redfish/v1/Managers/1/SecurityService/SecurityDashboard/' 'SecurityParams/1') calls = [mock.call(self.sec_params_col._conn, path, - self.sec_params_col.redfish_version, None), + redfish_version=self.sec_params_col.redfish_version, + registries=None, root=self.sec_params_col.root), mock.call(self.sec_params_col._conn, path2, - self.sec_params_col.redfish_version, None)] + redfish_version=self.sec_params_col.redfish_version, + registries=None, root=self.sec_params_col.root)] mock_eth.assert_has_calls(calls) self.assertIsInstance(members, list) self.assertEqual(2, len(members)) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_array_controller.py 2021-12-01 12:18:07.000000000 +0000 @@ -34,7 +34,8 @@ class HPEArrayControllerTestCase(testtoo path = ("/redfish/v1/Systems/1/SmartStorage/ArrayControllers") self.sys_stor = array_controller.HPEArrayController( - self.conn, path, '1.0.2', None) + self.conn, path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_stor._parse_attributes(self.json_doc) @@ -91,7 +92,7 @@ class HPEArrayControllerCollectionTestCa self.conn.get.return_value.json.return_value = self.json_doc self.sys_stor_col = array_controller.HPEArrayControllerCollection( self.conn, '/redfish/v1/Systems/1/SmartStorage/ArrayControllers', - '1.0.2', None) + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_stor_col._parse_attributes(self.json_doc) @@ -108,7 +109,8 @@ class HPEArrayControllerCollectionTestCa mock_eth.assert_called_once_with( self.sys_stor_col._conn, '/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0', - self.sys_stor_col.redfish_version, None) + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root) @mock.patch.object(array_controller, 'HPEArrayController', autospec=True) def test_get_members(self, mock_eth): @@ -116,7 +118,8 @@ class HPEArrayControllerCollectionTestCa path = ("/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0") calls = [ mock.call(self.sys_stor_col._conn, path, - self.sys_stor_col.redfish_version, None), + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root), ] mock_eth.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_drive.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_drive.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_drive.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_drive.py 2021-12-01 12:18:07.000000000 +0000 @@ -35,7 +35,8 @@ class DriveTestCase(testtools.TestCase): drive_path = ("/redfish/v1/Systems/437XR1138R2/Storage/1/" "Drives/35D38F11ACEF7BD3") self.sys_drive = drive.Drive( - self.conn, drive_path, redfish_version='1.0.2') + self.conn, drive_path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_drive._parse_attributes(self.json_doc['drive1']) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py 2021-12-01 12:18:07.000000000 +0000 @@ -34,7 +34,7 @@ class HPELogicalDriveTestCase(testtools. path = ("/redfish/v1/Systems/1/SmartStorage/" "ArrayControllers/0/LogicalDrives") self.sys_stor = logical_drive.HPELogicalDrive( - self.conn, path, '1.0.2', None) + self.conn, path, '1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_stor._parse_attributes(self.json_doc) @@ -53,7 +53,7 @@ class HPELogicalDriveCollectionTestCase( self.sys_stor_col = logical_drive.HPELogicalDriveCollection( self.conn, ('/redfish/v1/Systems/1/SmartStorage/' 'ArrayControllers/0/LogicalDrives'), - redfish_version='1.0.2') + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_stor_col._parse_attributes(self.json_doc) @@ -75,7 +75,8 @@ class HPELogicalDriveCollectionTestCase( self.sys_stor_col._conn, ('/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0/' 'LogicalDrives/1'), - self.sys_stor_col.redfish_version, None) + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root) @mock.patch.object(logical_drive, 'HPELogicalDrive', autospec=True) def test_get_members(self, mock_eth): @@ -86,9 +87,11 @@ class HPELogicalDriveCollectionTestCase( "0/LogicalDrives/2") calls = [ mock.call(self.sys_stor_col._conn, path1, - self.sys_stor_col.redfish_version, None), + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root), mock.call(self.sys_stor_col._conn, path2, - self.sys_stor_col.redfish_version, None), + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root), ] mock_eth.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py 2021-12-01 12:18:07.000000000 +0000 @@ -35,7 +35,8 @@ class HPEPhysicalDriveTestCase(testtools path = ("/redfish/v1/Systems/1/SmartStorage/" "ArrayControllers/0/DiskDrives") self.sys_stor = physical_drive.HPEPhysicalDrive( - self.conn, path, '1.0.2', None) + self.conn, path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_stor._parse_attributes(self.json_doc['drive1']) @@ -56,7 +57,7 @@ class HPEPhysicalDriveCollectionTestCase self.sys_stor_col = physical_drive.HPEPhysicalDriveCollection( self.conn, ('/redfish/v1/Systems/1/SmartStorage/' 'ArrayControllers/0/DiskDrives'), - redfish_version='1.0.2') + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_stor_col._parse_attributes(self.json_doc) @@ -78,7 +79,8 @@ class HPEPhysicalDriveCollectionTestCase self.sys_stor_col._conn, ('/redfish/v1/Systems/1/SmartStorage/ArrayControllers/0/' 'DiskDrives/3'), - self.sys_stor_col.redfish_version, None) + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root) @mock.patch.object(physical_drive, 'HPEPhysicalDrive', autospec=True) def test_get_members(self, mock_eth): @@ -89,9 +91,11 @@ class HPEPhysicalDriveCollectionTestCase "0/DiskDrives/4") calls = [ mock.call(self.sys_stor_col._conn, path, - self.sys_stor_col.redfish_version, None), + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root), mock.call(self.sys_stor_col._conn, path2, - self.sys_stor_col.redfish_version, None), + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root), ] mock_eth.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py 2021-12-01 12:18:07.000000000 +0000 @@ -33,7 +33,8 @@ class SimpleStorageTestCase(testtools.Te simple_path = ("/redfish/v1/Systems/437XR1138R2/SimpleStorage/1") self.sys_simple = simple_storage.SimpleStorage( - self.conn, simple_path, '1.0.2', None) + self.conn, simple_path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_simple._parse_attributes(self.json_doc) @@ -65,7 +66,7 @@ class SimpleStorageCollectionTestCase(te self.conn.get.return_value.json.return_value = self.json_doc self.sys_simple_col = simple_storage.SimpleStorageCollection( self.conn, '/redfish/v1/Systems/437XR1138R2/SimpleStorage', - '1.0.2', None) + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_simple_col._parse_attributes(self.json_doc) @@ -82,7 +83,8 @@ class SimpleStorageCollectionTestCase(te mock_simple.assert_called_once_with( self.sys_simple_col._conn, '/redfish/v1/Systems/437XR1138R2/SimpleStorage/1', - self.sys_simple_col.redfish_version, None) + redfish_version=self.sys_simple_col.redfish_version, + registries=None, root=self.sys_simple_col.root) @mock.patch.object(simple_storage, 'SimpleStorage', autospec=True) def test_get_members(self, mock_simple): @@ -90,7 +92,8 @@ class SimpleStorageCollectionTestCase(te simple_path = ("/redfish/v1/Systems/437XR1138R2/SimpleStorage/1") calls = [ mock.call(self.sys_simple_col._conn, simple_path, - self.sys_simple_col.redfish_version, None), + redfish_version=self.sys_simple_col.redfish_version, + registries=None, root=self.sys_simple_col.root), ] mock_simple.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py 2021-12-01 12:18:07.000000000 +0000 @@ -34,7 +34,7 @@ class HPESmartStorageTestCase(testtools. path = ("/redfish/v1/Systems/1/SmartStorage") self.sys_stor = smart_storage.HPESmartStorage( - self.conn, path, '1.0.2', None) + self.conn, path, '1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_stor._parse_attributes(self.json_doc) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_storage.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_storage.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_storage.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_storage.py 2021-12-01 12:18:07.000000000 +0000 @@ -32,7 +32,8 @@ class StorageTestCase(testtools.TestCase path = ("/redfish/v1/Systems/437XR1138R2/Storage/1") self.sys_stor = storage.Storage( - self.conn, path, redfish_version='1.0.2') + self.conn, path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_stor._parse_attributes(self.json_doc) @@ -154,7 +155,7 @@ class StorageCollectionTestCase(testtool self.conn.get.return_value.json.return_value = self.json_doc self.sys_stor_col = storage.StorageCollection( self.conn, '/redfish/v1/Systems/437XR1138R2/Storage', - redfish_version='1.0.2') + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_stor_col._parse_attributes(self.json_doc) @@ -171,7 +172,8 @@ class StorageCollectionTestCase(testtool mock_eth.assert_called_once_with( self.sys_stor_col._conn, ('/redfish/v1/Systems/437XR1138R2/Storage/1'), - self.sys_stor_col.redfish_version, None) + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root) @mock.patch.object(storage, 'Storage', autospec=True) def test_get_members(self, mock_eth): @@ -179,7 +181,8 @@ class StorageCollectionTestCase(testtool path = ("/redfish/v1/Systems/437XR1138R2/Storage/1") calls = [ mock.call(self.sys_stor_col._conn, path, - self.sys_stor_col.redfish_version, None), + redfish_version=self.sys_stor_col.redfish_version, + registries=None, root=self.sys_stor_col.root), ] mock_eth.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_volume.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_volume.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/storage/test_volume.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/storage/test_volume.py 2021-12-01 12:18:07.000000000 +0000 @@ -32,7 +32,8 @@ class VolumeTestCase(testtools.TestCase) vol_path = ("/redfish/v1/Systems/437XR1138R2/Storage/1/Volumes/1") self.sys_vol = volume.Volume( - self.conn, vol_path, '1.0.2', None) + self.conn, vol_path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_vol._parse_attributes(self.json_doc) @@ -52,7 +53,7 @@ class VolumeCollectionTestCase(testtools self.conn.get.return_value.json.return_value = self.json_doc self.sys_vol_col = volume.VolumeCollection( self.conn, '/redfish/v1/Systems/437XR1138R2/Storage/1/Volumes', - '1.0.2', None) + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_vol_col._parse_attributes(self.json_doc) @@ -69,7 +70,8 @@ class VolumeCollectionTestCase(testtools mock_vol.assert_called_once_with( self.sys_vol_col._conn, ('/redfish/v1/Systems/437XR1138R2/Volumes/1'), - self.sys_vol_col.redfish_version, None) + redfish_version=self.sys_vol_col.redfish_version, + registries=None, root=self.sys_vol_col.root) @mock.patch.object(volume, 'Volume', autospec=True) def test_get_members(self, mock_vol): @@ -77,7 +79,8 @@ class VolumeCollectionTestCase(testtools vol_path = ("/redfish/v1/Systems/437XR1138R2/Storage/1/Volumes/1") calls = [ mock.call(self.sys_vol_col._conn, vol_path, - self.sys_vol_col.redfish_version, None), + redfish_version=self.sys_vol_col.redfish_version, + registries=None, root=self.sys_vol_col.root), ] mock_vol.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/test_ethernet_interface.py 2021-12-01 12:18:07.000000000 +0000 @@ -16,9 +16,9 @@ import json import mock +import sushy import testtools -from proliantutils.redfish.resources.system import constants as sys_cons from proliantutils.redfish.resources.system import ethernet_interface @@ -36,7 +36,8 @@ class EthernetInterfaceTestCase(testtool eth_path = ("/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/" "12446A3B0411") self.sys_eth = ethernet_interface.EthernetInterface( - self.conn, eth_path, '1.0.2', None) + self.conn, eth_path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_eth._parse_attributes(self.json_doc['default']) @@ -47,9 +48,8 @@ class EthernetInterfaceTestCase(testtool self.assertEqual( '12:44:6A:3B:04:11', self.sys_eth.permanent_mac_address) self.assertEqual('12:44:6A:3B:04:11', self.sys_eth.mac_address) - self.assertEqual(sys_cons.HEALTH_STATE_ENABLED, - self.sys_eth.status.state) - self.assertEqual(sys_cons.HEALTH_OK, self.sys_eth.status.health) + self.assertEqual(sushy.STATE_ENABLED, self.sys_eth.status.state) + self.assertEqual(sushy.HEALTH_OK, self.sys_eth.status.health) self.assertEqual(1000, self.sys_eth.speed_mbps) @@ -64,7 +64,7 @@ class EthernetInterfaceCollectionTestCas self.conn.get.return_value.json.return_value = self.json_doc self.sys_eth_col = ethernet_interface.EthernetInterfaceCollection( self.conn, '/redfish/v1/Systems/437XR1138R2/EthernetInterfaces', - '1.0.2', None) + '1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_eth_col._parse_attributes(self.json_doc) @@ -84,7 +84,8 @@ class EthernetInterfaceCollectionTestCas self.sys_eth_col._conn, ('/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/' '12446A3B0411'), - self.sys_eth_col.redfish_version, None) + redfish_version=self.sys_eth_col.redfish_version, registries=None, + root=self.sys_eth_col.root) @mock.patch.object(ethernet_interface, 'EthernetInterface', autospec=True) def test_get_members(self, mock_eth): @@ -93,7 +94,9 @@ class EthernetInterfaceCollectionTestCas "12446A3B0411") calls = [ mock.call(self.sys_eth_col._conn, eth_path, - self.sys_eth_col.redfish_version, None), + redfish_version=self.sys_eth_col.redfish_version, + registries=None, + root=self.sys_eth_col.root), ] mock_eth.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/resources/system/test_pci_device.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/test_pci_device.py --- 2.12.0-1/proliantutils/tests/redfish/resources/system/test_pci_device.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/resources/system/test_pci_device.py 2021-12-01 12:18:07.000000000 +0000 @@ -33,7 +33,8 @@ class PCIDeviceTestCase(testtools.TestCa pci_path = "/redfish/v1/Systems/1/PCIDevices/1" self.sys_pci = pci_device.PCIDevice( - self.conn, pci_path, '1.0.2', None) + self.conn, pci_path, redfish_version='1.0.2', + registries=None, root=None) def test__parse_attributes(self): self.sys_pci._parse_attributes(self.json_doc) @@ -53,7 +54,7 @@ class PCIDeviceCollectionTestCase(testto self.conn.get.return_value.json.return_value = self.json_doc self.sys_pci_col = pci_device.PCIDeviceCollection( self.conn, '/redfish/v1/Systems/1/PCIDevices', - redfish_version='1.0.2') + redfish_version='1.0.2', registries=None, root=None) def test__parse_attributes(self): self.sys_pci_col._parse_attributes(self.json_doc) @@ -70,7 +71,8 @@ class PCIDeviceCollectionTestCase(testto mock_pci.assert_called_once_with( self.sys_pci_col._conn, ('/redfish/v1/Systems/1/PCIDevices/1'), - self.sys_pci_col.redfish_version, None) + redfish_version=self.sys_pci_col.redfish_version, + registries=None, root=self.sys_pci_col.root) @mock.patch.object(pci_device, 'PCIDevice', autospec=True) def test_get_members(self, mock_pci): @@ -79,9 +81,11 @@ class PCIDeviceCollectionTestCase(testto "/redfish/v1/Systems/1/PCIDevices/6"] calls = [ mock.call(self.sys_pci_col._conn, path_list[0], - self.sys_pci_col.redfish_version, None), + redfish_version=self.sys_pci_col.redfish_version, + registries=None, root=self.sys_pci_col.root), mock.call(self.sys_pci_col._conn, path_list[1], - self.sys_pci_col.redfish_version, None) + redfish_version=self.sys_pci_col.redfish_version, + registries=None, root=self.sys_pci_col.root) ] mock_pci.assert_has_calls(calls) self.assertIsInstance(members, list) diff -pruN 2.12.0-1/proliantutils/tests/redfish/test_redfish.py 2.12.2-0ubuntu1/proliantutils/tests/redfish/test_redfish.py --- 2.12.0-1/proliantutils/tests/redfish/test_redfish.py 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils/tests/redfish/test_redfish.py 2021-12-01 12:18:07.000000000 +0000 @@ -1081,7 +1081,7 @@ class RedfishOperationsTestCase(testtool count_mock = mock.PropertyMock(return_value=40) type(get_system_mock.return_value.processors.summary).count = ( count_mock) - arch_mock = mock.PropertyMock(return_value='x86 or x86-64') + arch_mock = mock.PropertyMock(return_value=sushy.PROCESSOR_ARCH_x86) type(get_system_mock.return_value.processors.summary).architecture = ( arch_mock) type(get_system_mock.return_value.ethernet_interfaces).summary = ( @@ -1090,7 +1090,7 @@ class RedfishOperationsTestCase(testtool local_gb_mock.return_value = 600 actual = self.rf_client.get_essential_properties() expected = {'properties': {'cpus': 40, - 'cpu_arch': 'x86', + 'cpu_arch': 'x86_64', 'memory_mb': 20480, 'local_gb': 600}, 'macs': {'1': '12:44:6A:3B:04:11'}} diff -pruN 2.12.0-1/proliantutils.egg-info/dependency_links.txt 2.12.2-0ubuntu1/proliantutils.egg-info/dependency_links.txt --- 2.12.0-1/proliantutils.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/dependency_links.txt 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 2.12.0-1/proliantutils.egg-info/entry_points.txt 2.12.2-0ubuntu1/proliantutils.egg-info/entry_points.txt --- 2.12.0-1/proliantutils.egg-info/entry_points.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/entry_points.txt 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1,3 @@ +[ironic_python_agent.hardware_managers] +hp-proliant = proliantutils.ipa_hw_manager.hardware_manager:ProliantHardwareManager + diff -pruN 2.12.0-1/proliantutils.egg-info/not-zip-safe 2.12.2-0ubuntu1/proliantutils.egg-info/not-zip-safe --- 2.12.0-1/proliantutils.egg-info/not-zip-safe 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/not-zip-safe 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 2.12.0-1/proliantutils.egg-info/PKG-INFO 2.12.2-0ubuntu1/proliantutils.egg-info/PKG-INFO --- 2.12.0-1/proliantutils.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/PKG-INFO 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1,65 @@ +Metadata-Version: 1.2 +Name: proliantutils +Version: 2.12.2 +Summary: Client Library for interfacing with various devices in HP Proliant Servers. +Home-page: https://opendev.org/x/proliantutils +Author: Hewlett Packard Enterprise +Author-email: proliantutils@gmail.com +License: Apache License, Version 2.0 +Description: proliantutils + ============= + + **proliantutils** is a set of utility libraries for interfacing and managing + various components (like iLO, HPSSA) for HPE Proliant Servers. This library + is used by iLO drivers in Ironic for managing Proliant Servers (though the + library can be used by anyone who wants to manage HPE Proliant servers). + + Please use launchpad_ to report bugs and ask questions. + + .. _launchpad: https://bugs.launchpad.net/proliantutils + + Installation + ------------ + + Install the module from PyPI_. If you are using Ironic, install the module + on Ironic conductor node:: + + pip install proliantutils + + .. _PyPI: https://pypi.python.org/pypi/proliantutils + + Some GNU/Linux distributions provide *python-proliantutils* package. + + Usage + ----- + + iLO + ~~~ + + For interfacing with the iLO, use *IloClient* object:: + + >>> from proliantutils.ilo import client + >>> ilo_client = client.IloClient('10.10.1.57', 'Administrator', 'password') + >>> ilo_client.get_host_power_status() + 'OFF' + >>> + + For operations supported on the client object, please refer + *proliantutils.ilo.operations*. + + +Platform: UNKNOWN +Classifier: Development Status :: 4 - Beta +Classifier: Environment :: Console +Classifier: Environment :: Web Environment +Classifier: Intended Audience :: Developers +Classifier: Intended Audience :: Information Technology +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.6 diff -pruN 2.12.0-1/proliantutils.egg-info/requires.txt 2.12.2-0ubuntu1/proliantutils.egg-info/requires.txt --- 2.12.0-1/proliantutils.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/requires.txt 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1,11 @@ +jsonschema>=2.6.0 +oslo.concurrency>=3.8.0 +oslo.serialization>=1.10.0 +oslo.utils>=3.20.0 +pbr>=2.0.0 +pyOpenSSL>=19.1.0 +pysnmp<5.0.0,>=4.2.3 +requests!=2.12.2,!=2.13.0,>=2.10.0 +retrying!=1.3.0,>=1.2.3 +six>=1.9.0 +sushy>=3.11.0 diff -pruN 2.12.0-1/proliantutils.egg-info/SOURCES.txt 2.12.2-0ubuntu1/proliantutils.egg-info/SOURCES.txt --- 2.12.0-1/proliantutils.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/SOURCES.txt 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1,231 @@ +.stestr.conf +.zuul.yaml +AUTHORS +ChangeLog +LICENSE +README.md +README.rst +requirements.txt +setup.cfg +setup.py +test-requirements.txt +tox.ini +doc/Makefile +doc/make.bat +doc/proliantutils_api_reference.md +doc/hpssa/index.rst +doc/source/conf.py +doc/source/index.rst +proliantutils/__init__.py +proliantutils/exception.py +proliantutils/log.py +proliantutils/utils.py +proliantutils.egg-info/PKG-INFO +proliantutils.egg-info/SOURCES.txt +proliantutils.egg-info/dependency_links.txt +proliantutils.egg-info/entry_points.txt +proliantutils.egg-info/not-zip-safe +proliantutils.egg-info/requires.txt +proliantutils.egg-info/top_level.txt +proliantutils/functests/__init__.py +proliantutils/functests/test_hpssa.py +proliantutils/hpssa/__init__.py +proliantutils/hpssa/constants.py +proliantutils/hpssa/disk_allocator.py +proliantutils/hpssa/manager.py +proliantutils/hpssa/objects.py +proliantutils/hpssa/raid_config_schema.json +proliantutils/ilo/__init__.py +proliantutils/ilo/client.py +proliantutils/ilo/common.py +proliantutils/ilo/constants.py +proliantutils/ilo/firmware_controller.py +proliantutils/ilo/ipmi.py +proliantutils/ilo/mappings.py +proliantutils/ilo/operations.py +proliantutils/ilo/ribcl.py +proliantutils/ilo/ris.py +proliantutils/ilo/snmp/__init__.py +proliantutils/ilo/snmp/snmp_cpqdisk_sizes.py +proliantutils/ilo/snmp/cpqdisk_mibs/CPQHOST-MIB.py +proliantutils/ilo/snmp/cpqdisk_mibs/CPQIDA-MIB.py +proliantutils/ilo/snmp/cpqdisk_mibs/CPQSCSI-MIB.py +proliantutils/ilo/snmp/cpqdisk_mibs/IANAifType-MIB.py +proliantutils/ilo/snmp/cpqdisk_mibs/IF-MIB.py +proliantutils/ilo/snmp/cpqdisk_mibs/RFC1215-MIB.py +proliantutils/ipa_hw_manager/__init__.py +proliantutils/ipa_hw_manager/hardware_manager.py +proliantutils/redfish/__init__.py +proliantutils/redfish/connector.py +proliantutils/redfish/main.py +proliantutils/redfish/redfish.py +proliantutils/redfish/utils.py +proliantutils/redfish/resources/__init__.py +proliantutils/redfish/resources/gpu_common.py +proliantutils/redfish/resources/update_service.py +proliantutils/redfish/resources/account_service/__init__.py +proliantutils/redfish/resources/account_service/account.py +proliantutils/redfish/resources/account_service/account_service.py +proliantutils/redfish/resources/chassis/__init__.py +proliantutils/redfish/resources/chassis/chassis.py +proliantutils/redfish/resources/chassis/devices.py +proliantutils/redfish/resources/manager/__init__.py +proliantutils/redfish/resources/manager/constants.py +proliantutils/redfish/resources/manager/https_cert.py +proliantutils/redfish/resources/manager/manager.py +proliantutils/redfish/resources/manager/mapping.py +proliantutils/redfish/resources/manager/network_protocol.py +proliantutils/redfish/resources/manager/security_dashboard.py +proliantutils/redfish/resources/manager/security_params.py +proliantutils/redfish/resources/manager/security_service.py +proliantutils/redfish/resources/manager/virtual_media.py +proliantutils/redfish/resources/system/__init__.py +proliantutils/redfish/resources/system/bios.py +proliantutils/redfish/resources/system/constants.py +proliantutils/redfish/resources/system/ethernet_interface.py +proliantutils/redfish/resources/system/iscsi.py +proliantutils/redfish/resources/system/mappings.py +proliantutils/redfish/resources/system/memory.py +proliantutils/redfish/resources/system/pci_device.py +proliantutils/redfish/resources/system/secure_boot.py +proliantutils/redfish/resources/system/smart_storage_config.py +proliantutils/redfish/resources/system/system.py +proliantutils/redfish/resources/system/tls_config.py +proliantutils/redfish/resources/system/storage/__init__.py +proliantutils/redfish/resources/system/storage/array_controller.py +proliantutils/redfish/resources/system/storage/common.py +proliantutils/redfish/resources/system/storage/constants.py +proliantutils/redfish/resources/system/storage/drive.py +proliantutils/redfish/resources/system/storage/logical_drive.py +proliantutils/redfish/resources/system/storage/mappings.py +proliantutils/redfish/resources/system/storage/physical_drive.py +proliantutils/redfish/resources/system/storage/simple_storage.py +proliantutils/redfish/resources/system/storage/smart_storage.py +proliantutils/redfish/resources/system/storage/storage.py +proliantutils/redfish/resources/system/storage/volume.py +proliantutils/rest/__init__.py +proliantutils/rest/v1.py +proliantutils/sum/__init__.py +proliantutils/sum/sum_controller.py +proliantutils/tests/__init__.py +proliantutils/tests/test_exception.py +proliantutils/tests/test_log.py +proliantutils/tests/test_utils.py +proliantutils/tests/hpssa/__init__.py +proliantutils/tests/hpssa/raid_constants.py +proliantutils/tests/hpssa/test_disk_allocator.py +proliantutils/tests/hpssa/test_manager.py +proliantutils/tests/hpssa/test_objects.py +proliantutils/tests/ilo/__init__.py +proliantutils/tests/ilo/ipmi_sample_outputs.py +proliantutils/tests/ilo/ribcl_sample_outputs.py +proliantutils/tests/ilo/ris_sample_outputs.py +proliantutils/tests/ilo/test_client.py +proliantutils/tests/ilo/test_common.py +proliantutils/tests/ilo/test_firmware_controller.py +proliantutils/tests/ilo/test_ipmi.py +proliantutils/tests/ilo/test_operations.py +proliantutils/tests/ilo/test_ribcl.py +proliantutils/tests/ilo/test_ris.py +proliantutils/tests/ilo/snmp/__init__.py +proliantutils/tests/ilo/snmp/snmp_sample_output.py +proliantutils/tests/ilo/snmp/test_snmp_cpqdisk_sizes.py +proliantutils/tests/ipa_hw_manager/__init__.py +proliantutils/tests/ipa_hw_manager/test_hardware_manager.py +proliantutils/tests/redfish/__init__.py +proliantutils/tests/redfish/test_connector.py +proliantutils/tests/redfish/test_main.py +proliantutils/tests/redfish/test_redfish.py +proliantutils/tests/redfish/test_utils.py +proliantutils/tests/redfish/json_samples/account.json +proliantutils/tests/redfish/json_samples/account_collection.json +proliantutils/tests/redfish/json_samples/account_service.json +proliantutils/tests/redfish/json_samples/array_controller.json +proliantutils/tests/redfish/json_samples/array_controller_collection.json +proliantutils/tests/redfish/json_samples/bios.json +proliantutils/tests/redfish/json_samples/bios_base_configs.json +proliantutils/tests/redfish/json_samples/bios_boot.json +proliantutils/tests/redfish/json_samples/bios_failed.json +proliantutils/tests/redfish/json_samples/bios_mappings.json +proliantutils/tests/redfish/json_samples/certfile.crt +proliantutils/tests/redfish/json_samples/chassis.json +proliantutils/tests/redfish/json_samples/devices.json +proliantutils/tests/redfish/json_samples/devices_collection.json +proliantutils/tests/redfish/json_samples/disk_drive.json +proliantutils/tests/redfish/json_samples/disk_drive_collection.json +proliantutils/tests/redfish/json_samples/drive.json +proliantutils/tests/redfish/json_samples/ethernet_interface.json +proliantutils/tests/redfish/json_samples/ethernet_interface_collection.json +proliantutils/tests/redfish/json_samples/https_cert.json +proliantutils/tests/redfish/json_samples/iscsi.json +proliantutils/tests/redfish/json_samples/iscsi_settings.json +proliantutils/tests/redfish/json_samples/logical_drive.json +proliantutils/tests/redfish/json_samples/logical_drive_collection.json +proliantutils/tests/redfish/json_samples/logical_nvdimm.json +proliantutils/tests/redfish/json_samples/manager.json +proliantutils/tests/redfish/json_samples/memory_collection.json +proliantutils/tests/redfish/json_samples/pci_device.json +proliantutils/tests/redfish/json_samples/pci_device1.json +proliantutils/tests/redfish/json_samples/pci_device_collection.json +proliantutils/tests/redfish/json_samples/root.json +proliantutils/tests/redfish/json_samples/secure_boot.json +proliantutils/tests/redfish/json_samples/security_dashboard.json +proliantutils/tests/redfish/json_samples/security_param.json +proliantutils/tests/redfish/json_samples/security_param1.json +proliantutils/tests/redfish/json_samples/security_params_collection.json +proliantutils/tests/redfish/json_samples/security_service.json +proliantutils/tests/redfish/json_samples/simple_storage.json +proliantutils/tests/redfish/json_samples/simple_storage_collection.json +proliantutils/tests/redfish/json_samples/smart_storage.json +proliantutils/tests/redfish/json_samples/smart_storage_config.json +proliantutils/tests/redfish/json_samples/storage.json +proliantutils/tests/redfish/json_samples/storage_collection.json +proliantutils/tests/redfish/json_samples/system.json +proliantutils/tests/redfish/json_samples/tls_config.json +proliantutils/tests/redfish/json_samples/tls_config_settings.json +proliantutils/tests/redfish/json_samples/update_service.json +proliantutils/tests/redfish/json_samples/vmedia.json +proliantutils/tests/redfish/json_samples/vmedia_collection.json +proliantutils/tests/redfish/json_samples/volume.json +proliantutils/tests/redfish/json_samples/volume_collection.json +proliantutils/tests/redfish/resources/__init__.py +proliantutils/tests/redfish/resources/test_gpu_common.py +proliantutils/tests/redfish/resources/test_update_service.py +proliantutils/tests/redfish/resources/account_service/__init__.py +proliantutils/tests/redfish/resources/account_service/test_account.py +proliantutils/tests/redfish/resources/account_service/test_account_service.py +proliantutils/tests/redfish/resources/chassis/test_chassis.py +proliantutils/tests/redfish/resources/chassis/test_devices.py +proliantutils/tests/redfish/resources/manager/__init__.py +proliantutils/tests/redfish/resources/manager/test_https_cert.py +proliantutils/tests/redfish/resources/manager/test_manager.py +proliantutils/tests/redfish/resources/manager/test_security_dashboard.py +proliantutils/tests/redfish/resources/manager/test_security_params.py +proliantutils/tests/redfish/resources/manager/test_security_service.py +proliantutils/tests/redfish/resources/manager/test_virtual_media.py +proliantutils/tests/redfish/resources/system/__init__.py +proliantutils/tests/redfish/resources/system/test_bios.py +proliantutils/tests/redfish/resources/system/test_ethernet_interface.py +proliantutils/tests/redfish/resources/system/test_iscsi.py +proliantutils/tests/redfish/resources/system/test_memory.py +proliantutils/tests/redfish/resources/system/test_pci_device.py +proliantutils/tests/redfish/resources/system/test_secure_boot.py +proliantutils/tests/redfish/resources/system/test_smart_storage_config.py +proliantutils/tests/redfish/resources/system/test_system.py +proliantutils/tests/redfish/resources/system/test_tls_config.py +proliantutils/tests/redfish/resources/system/storage/__init__.py +proliantutils/tests/redfish/resources/system/storage/test_array_controller.py +proliantutils/tests/redfish/resources/system/storage/test_common.py +proliantutils/tests/redfish/resources/system/storage/test_drive.py +proliantutils/tests/redfish/resources/system/storage/test_logical_drive.py +proliantutils/tests/redfish/resources/system/storage/test_physical_drive.py +proliantutils/tests/redfish/resources/system/storage/test_simple_storage.py +proliantutils/tests/redfish/resources/system/storage/test_smart_storage.py +proliantutils/tests/redfish/resources/system/storage/test_storage.py +proliantutils/tests/redfish/resources/system/storage/test_volume.py +proliantutils/tests/rest/__init__.py +proliantutils/tests/rest/rest_sample_outputs.py +proliantutils/tests/rest/test_v1.py +proliantutils/tests/sum/__init__.py +proliantutils/tests/sum/sum_sample_output.py +proliantutils/tests/sum/test_sum_controller.py \ No newline at end of file diff -pruN 2.12.0-1/proliantutils.egg-info/top_level.txt 2.12.2-0ubuntu1/proliantutils.egg-info/top_level.txt --- 2.12.0-1/proliantutils.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.12.2-0ubuntu1/proliantutils.egg-info/top_level.txt 2021-12-01 12:18:55.000000000 +0000 @@ -0,0 +1 @@ +proliantutils diff -pruN 2.12.0-1/requirements.txt 2.12.2-0ubuntu1/requirements.txt --- 2.12.0-1/requirements.txt 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/requirements.txt 2021-12-01 12:18:07.000000000 +0000 @@ -9,5 +9,5 @@ retrying!=1.3.0,>=1.2.3 # Apache-2.0 pysnmp>=4.2.3,<5.0.0 # BSD # Redfish communication uses the Sushy library -sushy>=3.1.0 +sushy>=3.11.0 pyOpenSSL>=19.1.0 diff -pruN 2.12.0-1/setup.cfg 2.12.2-0ubuntu1/setup.cfg --- 2.12.0-1/setup.cfg 2021-07-29 05:14:47.000000000 +0000 +++ 2.12.2-0ubuntu1/setup.cfg 2021-12-01 12:18:55.709110700 +0000 @@ -1,32 +1,37 @@ [metadata] name = proliantutils summary = Client Library for interfacing with various devices in HP Proliant Servers. -description-file = - README.rst +description-file = + README.rst license = Apache License, Version 2.0 author = Hewlett Packard Enterprise author-email = proliantutils@gmail.com home-page = https://opendev.org/x/proliantutils python-requires = >=3.6 -classifier = - Development Status :: 4 - Beta - Environment :: Console - Environment :: Web Environment - Intended Audience :: Developers - Intended Audience :: Information Technology - License :: OSI Approved :: Apache Software License - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 +classifier = + Development Status :: 4 - Beta + Environment :: Console + Environment :: Web Environment + Intended Audience :: Developers + Intended Audience :: Information Technology + License :: OSI Approved :: Apache Software License + Operating System :: OS Independent + Programming Language :: Python + Programming Language :: Python :: 3 + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] -packages = - proliantutils +packages = + proliantutils [entry_points] -ironic_python_agent.hardware_managers = - hp-proliant = proliantutils.ipa_hw_manager.hardware_manager:ProliantHardwareManager +ironic_python_agent.hardware_managers = + hp-proliant = proliantutils.ipa_hw_manager.hardware_manager:ProliantHardwareManager + +[egg_info] +tag_build = +tag_date = 0 +