version 3.5.0.0

HewlettPackard · Jan 24, 2022 · 245a0c1 · 245a0c1
1 parent 3a55bf7
commit 245a0c1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/redfish/__init__.py b/src/redfish/__init__.py
@@ -1,7 +1,7 @@
 """ Redfish restful library """
 
 __all__ = ['rest', 'ris', 'hpilo']
-__version__ = "3.3.0"
+__version__ = "3.5.0.0"
 
 import logging
 from redfish.rest.v1 import AuthMethod, LegacyRestClient, RedfishClient

diff --git a/src/redfish/hpilo/risblobstore2.py b/src/redfish/hpilo/risblobstore2.py
@@ -865,7 +865,8 @@ def initializecreds(username=None, password=None):
         if LOGGER.isEnabledFor(logging.DEBUG):
             dll.enabledebugoutput()
         dll.ChifInitialize(None)
-        if dll.ChifIsSecurityRequired() > 0 or username:
+        #if dll.ChifIsSecurityRequired() > 0 or username:
+        if dll.ChifIsSecurityRequired() > 0:
             if not username or not password:
                 return False
             dll.initiate_credentials.argtypes = [c_char_p, c_char_p]

diff --git a/src/redfish/rest/connections.py b/src/redfish/rest/connections.py
@@ -138,7 +138,10 @@ def _init_connection(self):
             except KeyError:
                 pass
             timeout = urllib3.util.Timeout(connect=40.0, read=None)
-            http = PoolManager(cert_reqs=cert_reqs, maxsize=6, timeout=timeout, **self._connection_properties)
+            if "timeout" not in self._connection_properties:
+                http = PoolManager(cert_reqs=cert_reqs, maxsize=6, timeout=timeout, **self._connection_properties)
+            else:
+                http = PoolManager(cert_reqs=cert_reqs, maxsize=6, **self._connection_properties)
 
         self._conn = http.request
 

diff --git a/src/redfish/ris/rmc.py b/src/redfish/ris/rmc.py
@@ -982,10 +982,10 @@ def getcollectionmembers(self, path, fullresp=False):
         members = self.get_handler(path, service=True, silent=True)
         if members and not fullresp:
             try:
-                members = members.dict['Members'] if self.typepath.defs. \
-                    isgen10 else members.dict['Items']
+                members = members.dict['Members'] if self.typepath.defs.\
+                                                                 isgen10 else members.dict['Current']
             except KeyError:
-                members = []
+                members = members
         elif fullresp:
             members = [members.dict]