openstack/cinder
Code Issues Proposed changes

Merge "QNAP: Fix login on Python3"

Browse Source
This commit is contained in:
Zuul 2020-03-19 14:03:12 +00:00 committed by Gerrit Code Review
commit ff5ce3e9b9
2 changed files with 279 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

551
cinder/tests/unit/volume/drivers/test_qnap.py
View File

File diff suppressed because it is too large Load Diff

21
cinder/volume/drivers/qnap.py
View File

@ -1231,23 +1231,16 @@ class QnapAPIExecutor(object):
def execute_login(self): def execute_login(self):
"""Login and return sid.""" """Login and return sid."""
params = OrderedDict() params = OrderedDict(
params['pwd'] = base64.b64encode(self.password.encode("utf-8")) pwd=base64.b64encode(self.password.encode('utf-8')).decode(),
params['serviceKey'] = '1' serviceKey='1',
params['user'] = self.username user=self.username,
)
sanitized_params = OrderedDict() encoded_params = urllib.parse.urlencode(params)
for key in params:
value = params[key]
if value is not None:
sanitized_params[key] = six.text_type(value)
sanitized_params = urllib.parse.urlencode(sanitized_params)
url = ('/cgi-bin/authLogin.cgi?') url = ('/cgi-bin/authLogin.cgi?')
res_details = self._execute_and_get_response_details( res_details = self._execute_and_get_response_details(
self.ip, url, sanitized_params) self.ip, url, encoded_params)
root = ET.fromstring(res_details['data']) root = ET.fromstring(res_details['data'])
LOG.debug('execute_login data: %s', res_details['data']) LOG.debug('execute_login data: %s', res_details['data'])
session_id = root.find('authSid').text session_id = root.find('authSid').text