commit 97c93945107a97b0f66bf715a8828cbbd3f6513d
author George Keishing <gkeishin@in.ibm.com> Mon Mar 04 12:45:07 2019 -0600
committer George Keishing <gkeishin@in.ibm.com> Fri Mar 08 14:01:21 2019 +0000
tree ecb389af839f4dc516796b76fa365be9cd0c490a
parent 42e1ac69cb05a76a7f890b91585a7ab37450db7a

New BMC redfish library integration

Changes:
   - Use redfish_plus.py when importing Redfish instances.
   - Update bmc_redfish.py.
   - Update bmc_redfish_utility.py.
   - Update object name 'redfish' to 'Redfish'.
   - Update test setup and teardown in suites.
   - Update response error checking using valid_status_codes.
   - Fix test cases required for migration.

Change-Id: Ida154aede649d9a2bbef66d16ccf725f5ea37ed0
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

lib/bmc_redfish_utils.py

diff --git a/lib/bmc_redfish_utils.py b/lib/bmc_redfish_utils.py
index 492a1a3..1bf53a7 100644
--- a/lib/bmc_redfish_utils.py
+++ b/lib/bmc_redfish_utils.py
@@ -27,8 +27,8 @@
         }
         """
         session_dict = {
-            "key": self._redfish_._session_key_,
-            "location": self._redfish_._session_location_
+            "key": self._redfish_.get_session_key(),
+            "location": self._redfish_.get_session_location()
         }
         return session_dict
 
@@ -111,8 +111,8 @@
 
         global resource_list
         resource_list = []
-
-        self._rest_response_ = self._redfish_.get(resource_path)
+        self._rest_response_ = \
+            self._redfish_.get(resource_path, valid_status_codes=[200, 404, 500])
 
         # Return empty list.
         if self._rest_response_.status != 200:
@@ -124,7 +124,8 @@
             return uri_path
 
         for resource in resource_list:
-            self._rest_response_ = self._redfish_.get(resource)
+            self._rest_response_ = \
+                self._redfish_.get(resource, valid_status_codes=[200, 404, 500])
             if self._rest_response_.status != 200:
                 continue
             self.walk_nested_dict(self._rest_response_.dict)
@@ -154,7 +155,8 @@
             # Example: '/redfish/v1/JsonSchemas/' and sub resources.
             if 'JsonSchemas' in resource:
                 continue
-            self._rest_response_ = self._redfish_.get(resource)
+            self._rest_response_ = \
+                self._redfish_.get(resource, valid_status_codes=[200, 404, 500])
             if self._rest_response_.status != 200:
                 continue
             resource_dict[resource] = self._rest_response_.dict