black: re-format
black and isort are enabled in the openbmc-build-scripts on Python files
to have a consistent formatting. Re-run the formatter on the whole
repository.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I944f1915ece753f72a3fa654902d445a9749d0f9
diff --git a/lib/redfish_request.py b/lib/redfish_request.py
index 6add29f..da455a3 100644
--- a/lib/redfish_request.py
+++ b/lib/redfish_request.py
@@ -1,19 +1,18 @@
#!/usr/bin/env python3
-import requests
-import urllib.request
-from urllib3.exceptions import InsecureRequestWarning
import json
import secrets
import string
+import urllib.request
+import requests
from robot.api import logger
-from robot.libraries.BuiltIn import BuiltIn
from robot.api.deco import keyword
+from robot.libraries.BuiltIn import BuiltIn
+from urllib3.exceptions import InsecureRequestWarning
class redfish_request(object):
-
@staticmethod
def generate_clientid():
r"""
@@ -23,9 +22,11 @@
"""
- clientid = ''.join(secrets.choice(
- string.ascii_letters + string.digits) for i in range(10))
- clientid = ''.join(str(i) for i in clientid)
+ clientid = "".join(
+ secrets.choice(string.ascii_letters + string.digits)
+ for i in range(10)
+ )
+ clientid = "".join(str(i) for i in clientid)
return clientid
@@ -38,11 +39,13 @@
url Url passed by user e.g. /redfish/v1/Systems/system.
"""
- openbmc_host = \
- BuiltIn().get_variable_value("${OPENBMC_HOST}", default="")
+ openbmc_host = BuiltIn().get_variable_value(
+ "${OPENBMC_HOST}", default=""
+ )
https_port = BuiltIn().get_variable_value("${HTTPS_PORT}", default="")
- form_url = \
+ form_url = (
"https://" + str(openbmc_host) + ":" + str(https_port) + str(url)
+ )
return form_url
@@ -55,10 +58,11 @@
response Response from requests.
"""
- logger.console(msg='', newline=True)
- logger.info("Response : [%s]" % response.status_code,
- also_console=True)
- logger.console(msg='', newline=True)
+ logger.console(msg="", newline=True)
+ logger.info(
+ "Response : [%s]" % response.status_code, also_console=True
+ )
+ logger.console(msg="", newline=True)
def request_login(self, headers, url, credential, timeout=10):
r"""
@@ -81,19 +85,21 @@
if headers == "None":
headers = dict()
- headers['Content-Type'] = 'application/json'
+ headers["Content-Type"] = "application/json"
- client_id = credential['Oem']['OpenBMC'].get('ClientID', "None")
+ client_id = credential["Oem"]["OpenBMC"].get("ClientID", "None")
if "None" == client_id:
self.clientid = redfish_request.generate_clientid()
- credential['Oem']['OpenBMC']['ClientID'] = self.clientid
+ credential["Oem"]["OpenBMC"]["ClientID"] = self.clientid
- logger.console(msg='', newline=True)
- requests.packages.urllib3.\
- disable_warnings(category=InsecureRequestWarning)
- response = redfish_request.request_post(self, headers=headers,
- url=url, data=credential)
+ logger.console(msg="", newline=True)
+ requests.packages.urllib3.disable_warnings(
+ category=InsecureRequestWarning
+ )
+ response = redfish_request.request_post(
+ self, headers=headers, url=url, data=credential
+ )
return response
@@ -116,19 +122,27 @@
is not considered.
"""
- if headers.get('Content-Type', None) is None:
- headers['Content-Type'] = 'application/json'
+ if headers.get("Content-Type", None) is None:
+ headers["Content-Type"] = "application/json"
url = redfish_request.form_url(url)
- logger.console(msg='', newline=True)
- msg = "Request Method : GET ,headers = " + \
- json.dumps(headers) + " ,uri = " + str(url) + " ,timeout = " + \
- str(timeout) + " ,verify = " + str(verify)
+ logger.console(msg="", newline=True)
+ msg = (
+ "Request Method : GET ,headers = "
+ + json.dumps(headers)
+ + " ,uri = "
+ + str(url)
+ + " ,timeout = "
+ + str(timeout)
+ + " ,verify = "
+ + str(verify)
+ )
logger.info(msg, also_console=True)
- response = requests.get(url, headers=headers,
- timeout=timeout, verify=verify)
+ response = requests.get(
+ url, headers=headers, timeout=timeout, verify=verify
+ )
redfish_request.log_console(response)
return response
@@ -155,20 +169,29 @@
is not considered.
"""
- if headers.get('Content-Type', None) is None:
- headers['Content-Type'] = 'application/json'
+ if headers.get("Content-Type", None) is None:
+ headers["Content-Type"] = "application/json"
url = redfish_request.form_url(url)
- logger.console(msg='', newline=True)
- msg = "Request Method : PATCH ,headers = " + \
- json.dumps(headers) + " ,uri = " + str(url) + " ,data = " + \
- json.dumps(data) + " ,timeout = " + str(timeout) + \
- " ,verify = " + str(verify)
+ logger.console(msg="", newline=True)
+ msg = (
+ "Request Method : PATCH ,headers = "
+ + json.dumps(headers)
+ + " ,uri = "
+ + str(url)
+ + " ,data = "
+ + json.dumps(data)
+ + " ,timeout = "
+ + str(timeout)
+ + " ,verify = "
+ + str(verify)
+ )
logger.info(msg, also_console=True)
- response = requests.patch(url, headers=headers, data=data,
- timeout=timeout, verify=verify)
+ response = requests.patch(
+ url, headers=headers, data=data, timeout=timeout, verify=verify
+ )
redfish_request.log_console(response)
return response
@@ -195,26 +218,40 @@
is not considered.
"""
- if headers.get('Content-Type', None) is None:
- headers['Content-Type'] = 'application/json'
+ if headers.get("Content-Type", None) is None:
+ headers["Content-Type"] = "application/json"
url = redfish_request.form_url(url)
- logger.console(msg='', newline=True)
- msg = "Request Method : POST ,headers = " + \
- json.dumps(headers) + " ,uri = " + str(url) + " ,data = " + \
- json.dumps(data) + " ,timeout = " + str(timeout) + \
- " ,verify = " + str(verify)
+ logger.console(msg="", newline=True)
+ msg = (
+ "Request Method : POST ,headers = "
+ + json.dumps(headers)
+ + " ,uri = "
+ + str(url)
+ + " ,data = "
+ + json.dumps(data)
+ + " ,timeout = "
+ + str(timeout)
+ + " ,verify = "
+ + str(verify)
+ )
logger.info(msg, also_console=True)
- response = requests.post(url, headers=headers, data=json.dumps(data),
- timeout=timeout, verify=verify)
+ response = requests.post(
+ url,
+ headers=headers,
+ data=json.dumps(data),
+ timeout=timeout,
+ verify=verify,
+ )
redfish_request.log_console(response)
return response
- def request_put(self, headers, url, files=None, data=None,
- timeout=10, verify=False):
+ def request_put(
+ self, headers, url, files=None, data=None, timeout=10, verify=False
+ ):
r"""
Redfish put request.
@@ -239,25 +276,41 @@
is not considered.
"""
- if headers.get('Content-Type', None) is None:
- headers['Content-Type'] = 'application/json'
+ if headers.get("Content-Type", None) is None:
+ headers["Content-Type"] = "application/json"
url = redfish_request.form_url(url)
- logger.console(msg='', newline=True)
- msg = "Request Method : PUT ,headers = " + \
- json.dumps(headers) + " ,uri = " + str(url) + " ,data = " + \
- json.dumps(data) + " ,timeout = " + str(timeout) + \
- " ,verify = " + str(verify)
+ logger.console(msg="", newline=True)
+ msg = (
+ "Request Method : PUT ,headers = "
+ + json.dumps(headers)
+ + " ,uri = "
+ + str(url)
+ + " ,data = "
+ + json.dumps(data)
+ + " ,timeout = "
+ + str(timeout)
+ + " ,verify = "
+ + str(verify)
+ )
logger.info(msg, also_console=True)
- response = requests.put(url, headers=headers, files=files, data=data,
- timeout=timeout, verify=verify)
+ response = requests.put(
+ url,
+ headers=headers,
+ files=files,
+ data=data,
+ timeout=timeout,
+ verify=verify,
+ )
redfish_request.log_console(response)
return response
- def request_delete(self, headers, url, data=None, timeout=10, verify=False):
+ def request_delete(
+ self, headers, url, data=None, timeout=10, verify=False
+ ):
r"""
Redfish delete request.
@@ -279,20 +332,29 @@
is not considered.
"""
- if headers.get('Content-Type', None) is None:
- headers['Content-Type'] = 'application/json'
+ if headers.get("Content-Type", None) is None:
+ headers["Content-Type"] = "application/json"
url = redfish_request.form_url(url)
- logger.console(msg='', newline=True)
- msg = "Request Method : DELETE ,headers = " + \
- json.dumps(headers) + " ,uri = " + str(url) + " ,data = " + \
- json.dumps(data) + " ,timeout = " + str(timeout) + \
- " ,verify = " + str(verify)
- logger.console(msg='', newline=True)
+ logger.console(msg="", newline=True)
+ msg = (
+ "Request Method : DELETE ,headers = "
+ + json.dumps(headers)
+ + " ,uri = "
+ + str(url)
+ + " ,data = "
+ + json.dumps(data)
+ + " ,timeout = "
+ + str(timeout)
+ + " ,verify = "
+ + str(verify)
+ )
+ logger.console(msg="", newline=True)
- response = requests.delete(url, headers=headers, data=data,
- timeout=timeout, verify=verify)
+ response = requests.delete(
+ url, headers=headers, data=data, timeout=timeout, verify=verify
+ )
redfish_request.log_console(response)
return response