Merge pull request #2 from Metify-io/support-dmtf-mocks

Support dmtf mocks and python 3.11

Author: kwilcox

.gitignore

@@ -6,3 +6,4 @@ redfish_client.egg-info
 htmlcov
 dist
 build/
+Pipfile.lock

Makefile

@@ -17,8 +17,15 @@ coverage:
 	xdg-open htmlcov/index.html
 
 lint:
-	pipenv run pylint redfish_client
+	pipenv run ruff redfish_client
 
 publish:
+	rm -f dist/*
+
+	pipenv --rm
+	rm Pipfile.lock
+	pipenv --python 3.11
+	pipenv install --dev
 	pipenv run python setup.py sdist bdist_wheel
+
 	pipenv run python -m twine upload -r metify-internal dist/*

redfish_client/connector.py

@@ -158,10 +158,17 @@ def _session_login(self):
         resp = self._client.post(self._url(self._session_path), json=dict(
             UserName=self._username, Password=self._password,
         ), timeout=self._timeout)
-        if resp.status_code != 201:
+        if resp.status_code not in [201, 204]:
             raise AuthException("Cannot create session: {}".format(resp.text))
 
-        self._set_header("x-auth-token", resp.headers["x-auth-token"])
+        if resp.status_code == 201:
+            # 201: Redfish standard
+            self._set_header("x-auth-token", resp.headers["x-auth-token"])
+        else:
+            # 204: Redfish Mock Server standard
+            # No auth token is returned so set to anything
+            self._set_header("x-auth-token", resp.headers.get("location"))
+
         # We combine with `or` here because the default value of the dict.get
         # method is eagerly evaluated, which is not what we want.
         sess_id = resp.headers.get("location") or resp.json()["@odata.id"]

redfish_client/resource.py

@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
+import json
 import operator
 import time
 from functools import reduce
@@ -130,6 +130,9 @@ def dig(self, *keys):
                 return None
         return resource
 
+    def jp(self):
+        return json.dumps(self.raw, indent=4, sort_keys=True)
+
     def find_object(self, key):
         """ Recursively search for a key and return key's content """
         if key in self._get_content().keys():

setup.cfg

@@ -10,7 +10,7 @@ description = Redfish API client for Python
 long_description = file: README.rst
 long_description_content_type = text/x-rst
 license_file = LICENSE
-version = 0.3.10
+version = 0.3.12
 classifier =
     Development Status :: 3 - Alpha
     Environment :: Console
@@ -24,6 +24,8 @@ classifier =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [files]
 packages =