starlingx
/
nfv
Code Issues Proposed changes

Merge "py3: Fix urllib request data value assignment" into f/centos8

This commit is contained in:
Zuul 2021-07-07 16:23:13 +00:00 committed by Gerrit Code Review
parent bf4a7618a0 0e399fab7e
commit 8d4a9f72b4
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nfv/nfv-client/nfv_client/openstack/openstack.py
View File

@ -59,7 +59,7 @@ def get_token(auth_uri, project_name, project_domain_name, username, password,
"domain": {"name": project_domain_name}
}}}})
request_info.data = payload
request_info.data = payload.encode()
request = urllib.request.urlopen(request_info, timeout=30)
# Identity API v3 returns token id in X-Subject-Token

2
nfv/nfv-client/nfv_client/openstack/rest_api.py
View File

@ -32,7 +32,7 @@ def request(token_id, method, api_cmd, api_cmd_headers=None,
request_info.add_header(header_type, header_value)
if api_cmd_payload is not None:
request_info.data = api_cmd_payload
request_info.data = api_cmd_payload.encode()
url_request = urllib.request.urlopen(request_info,
timeout=timeout_in_secs)

2
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack.py
View File

@ -58,7 +58,7 @@ def get_token(directory):
"name": directory.auth_project,
"domain": {"name": directory.auth_project_domain_name}
}}}})
request_info.data = payload
request_info.data = payload.encode()
# WARNING: Any change to the timeout must be reflected in the config.ini
# file for the nfvi plugins.

2
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py
View File

@ -309,7 +309,7 @@ def _rest_api_request(token_id, method, api_cmd, api_cmd_headers,
request_info.add_header(header_type, header_value)
if api_cmd_payload is not None:
request_info.data = api_cmd_payload
request_info.data = api_cmd_payload.encode()
DLOG.verbose("Rest-API method=%s, api_cmd=%s, api_cmd_headers=%s, "
"api_cmd_payload=%s" % (method, api_cmd, api_cmd_headers,

4
nfv/nfv-vim/nfv_vim/api/openstack/_openstack.py
View File

@ -53,7 +53,7 @@ def validate_token(directory, admin_token, token_id):
}
}})
request_info.data = payload
request_info.data = payload.encode()
request = urllib.request.urlopen(request_info)
# Identity API v3 returns token id in X-Subject-Token
@ -114,7 +114,7 @@ def get_token(directory):
"name": directory.auth_project,
"domain": {"name": directory.auth_project_domain_name}
}}}})
request_info.data = payload
request_info.data = payload.encode()
request = urllib.request.urlopen(request_info)
# Identity API v3 returns token id in X-Subject-Token

2
nfv/nfv-vim/nfv_vim/api/openstack/_rest_api.py
View File

@ -35,7 +35,7 @@ def rest_api_request(token, method, url, headers=None, body=None):
request_info.add_header("X-Auth-Token", token.get_id())
if body is not None and '' != body:
request_info.data = body
request_info.data = body.encode()
# Enable Debug
# handler = urllib.request.HTTPHandler(debuglevel=1)