version 6.2.0.0

Author: rajeevkallur

setup.py

@@ -3,7 +3,7 @@
 extras = {}
 
 setup(name='python-ilorest-library',
-      version='6.1.0.0',
+      version='6.2.0.0',
       description='iLO Rest Python Library',
       author='Hewlett Packard Enterprise',
       author_email='[email protected]',

src/redfish/__init__.py

@@ -1,7 +1,7 @@
 """ Redfish restful library """
 
 __all__ = ["rest", "ris", "hpilo"]
-__version__ = "6.1.0.0"
+__version__ = "6.2.0.0"
 
 import logging
 

src/redfish/hpilo/risblobstore2.py

@@ -176,7 +176,6 @@ def __init__(self, log_dir=None):
     def __del__(self):
         """Blob store 2 close channel function"""
         if hasattr(self, "channel"):
-            LOGGER.info("Closing BlobStore channel.")
             self.channel.close()
 
     def create(self, key, namespace):
@@ -492,8 +491,8 @@ def write_fragment(self, key, namespace, data=None, offset=0, count=1):
 
         dataarr = bytearray(sendpacket)
         dataarr.extend(memoryview(data))
-
-        LOGGER.debug(f"Data to be sent: {dataarr[:50]}... (first 50 bytes)")
+        LOGGER.debug(f"Data ready to be sent...")
+        #LOGGER.debug(f"Data to be sent: {dataarr[:50]}... (first 50 bytes)")
 
         # Send the data
         try:

src/redfish/hpilo/rishpilo.py

@@ -167,8 +167,8 @@ def chif_packet_exchange(self, data):
         """
         LOGGER.info("Starting chif packet exchange...")
 
-        # Log the data being sent (truncated if necessary for large data)
-        LOGGER.debug(f"Data to be sent: {data[:50]}... (first 50 bytes)")
+        LOGGER.debug(f"Data ready to be sent...")
+        #LOGGER.debug(f"Data to be sent: {data[:50]}... (first 50 bytes)")
 
         datarecv = self.dll.get_max_buffer_size()
         buff = create_string_buffer(bytes(data))
@@ -198,7 +198,8 @@ def chif_packet_exchange(self, data):
             pkt = bytearray(recbuff[:])
         else:
             pkt = bytearray(recbuff[:datarecv])
-            LOGGER.debug(f"Received data: {pkt[:50]}... (first 50 bytes)")
+            LOGGER.debug(f"Received data...")
+            #LOGGER.debug(f"Received data: {pkt[:50]}... (first 50 bytes)")
 
         return pkt
 
@@ -215,7 +216,7 @@ def send_receive_raw(self, data, retries=10):
         sequence = struct.unpack("<H", bytes(data[2:4]))[0]
 
         if LOGGER.isEnabledFor(logging.DEBUG):
-            LOGGER.debug("Sending data: %s, retries: %d, initial sequence: %d", data, retries, sequence)
+            LOGGER.debug("Retries: %d, Initial sequence: %d", retries, sequence)
 
         while tries < retries:
             try:
@@ -226,7 +227,7 @@ def send_receive_raw(self, data, retries=10):
 
                 # Log the response data for debugging (consider limiting if large)
                 if LOGGER.isEnabledFor(logging.DEBUG):
-                    LOGGER.debug("Received response: %s", resp)
+                    LOGGER.debug("Received response...")
 
                 # Check for matching sequence
                 received_sequence = struct.unpack("<H", bytes(resp[2:4]))[0]

src/redfish/ris/ris.py

@@ -1176,6 +1176,42 @@ def capture(self, redmono=False, single=True):
             ret = {}
         return ret
 
+    def normalize_urls(self, data):
+        """
+        Normalize URL-like dictionary keys:
+        - If both '/path' and '/path/' exist, keep only '/path/'.
+        - If only one version exists, ensure the key ends with '/'.
+        - All final keys end with '/'.
+        """
+        normalized_data = {}
+        seen = set()
+
+        for key in data:
+            # Normalize key with trailing slash
+            if key.endswith("/"):
+                base_key = key[:-1]
+                trailing_key = key
+            else:
+                base_key = key
+                trailing_key = key + "/"
+
+            # Avoid processing the same base path twice
+            if base_key in seen:
+                continue
+            seen.add(base_key)
+
+            # Prefer version with trailing slash
+            if trailing_key in data:
+                normalized_data[trailing_key] = data[trailing_key]
+            elif base_key in data:
+                normalized_data[trailing_key] = data[base_key]
+
+        return normalized_data
+
+    def fetch_data(self, path):
+        resp = self.client.get(path)
+        return resp
+
     def captureallconfig(self, single=True, exclueurl=None):
         """Crawls the server and returns the monolith data or just headers and responses.
 
@@ -1191,14 +1227,17 @@ def captureallconfig(self, single=True, exclueurl=None):
 
         try:
             for x, v in self.paths.items():
-                if exclueurl.lower() not in x.lower():
+                if exclueurl.lower() != x.lower():
                     if v:
-                        v_resp = v.resp
-                        if v_resp:
-                            ret[x] = {"Headers": v_resp.getheaders(), "Response": v_resp.dict}
+                        if v.resp is not None:
+                            ret[x] = {"Headers": v.resp.getheaders(), "Response": v.resp.dict}
+                        else:
+                            resp = self.fetch_data(x)
+                            ret[x] = {"Headers": resp.getheaders(), "Response": resp.dict}
         except Exception as e:
             LOGGER.debug("Error in capture: %s", e)
             ret = {}
+        ret = self.normalize_urls(ret)
         return ret
 
     def killthreads(self):