summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-11-18 19:21:52 +0000
committerGerrit Code Review <review@openstack.org>2022-11-18 19:21:52 +0000
commit1437a613fc6d722206b89344e8f59187fd4101a7 (patch)
treef03ffc0d9cf211c8669e4407fbf93ecd3087341a
parentfc80f9d50986eca3eca8f4515d23205f2f0f89fd (diff)
parentf57576769024f8cb0c9e310e4552b1ae714ea855 (diff)
downloadcinder-1437a613fc6d722206b89344e8f59187fd4101a7.tar.gz
Merge "PowerStore driver - Request data validation fix" into stable/yoga
-rw-r--r--cinder/volume/drivers/dell_emc/powerstore/client.py4
-rw-r--r--releasenotes/notes/powerstore-request-data-validation-6268f2ed07b7bf40.yaml6
2 files changed, 7 insertions, 3 deletions
diff --git a/cinder/volume/drivers/dell_emc/powerstore/client.py b/cinder/volume/drivers/dell_emc/powerstore/client.py
index d307c94f8..04670518b 100644
--- a/cinder/volume/drivers/dell_emc/powerstore/client.py
+++ b/cinder/volume/drivers/dell_emc/powerstore/client.py
@@ -85,8 +85,6 @@ class PowerStoreClient(object):
payload=None,
params=None,
log_response_data=True):
- if not payload:
- payload = {}
if not params:
params = {}
request_params = {
@@ -94,7 +92,7 @@ class PowerStoreClient(object):
"verify": self._verify_cert,
"params": params
}
- if method != "GET":
+ if payload and method != "GET":
request_params["data"] = json.dumps(payload)
request_url = self.base_url + url
r = requests.request(method, request_url, **request_params)
diff --git a/releasenotes/notes/powerstore-request-data-validation-6268f2ed07b7bf40.yaml b/releasenotes/notes/powerstore-request-data-validation-6268f2ed07b7bf40.yaml
new file mode 100644
index 000000000..b238d070c
--- /dev/null
+++ b/releasenotes/notes/powerstore-request-data-validation-6268f2ed07b7bf40.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ PowerStore driver `bug #1981068
+ <https://bugs.launchpad.net/cinder/+bug/1981068>`_: Fixed
+ request data validation for the REST client.