diff options
| author |   maopengzhang <zhang.maopeng1@zte.com.cn> | 2019-07-16 16:44:28 +0800 |
|---|---|---|
| committer | maopengzhang <zhang.maopeng1@zte.com.cn> | 2019-07-16 16:44:28 +0800 |
| commit | aec29027e6fceafe130b448083d6891d0f596ddf (patch) | |
| tree | 4a110fa5a78cfcde647b0ae6633e6decf9884d02 | |
| parent | 6f7ab2631e19025b7a148ab8ef969354bfbd8954 (diff) | |
resolve python2->python3 issues
change base64 code
Change-Id: I251ff01f9ab471e7ab1341f2f80bac7c91aadfca
Issue-ID: VFC-1429
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
| -rw-r--r-- | gvnfmadapter/driver/pub/utils/restcall.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gvnfmadapter/driver/pub/utils/restcall.py b/gvnfmadapter/driver/pub/utils/restcall.py index 28578cd..4b1aad6 100644 --- a/gvnfmadapter/driver/pub/utils/restcall.py +++ b/gvnfmadapter/driver/pub/utils/restcall.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import base64 import sys import traceback import logging @@ -40,7 +41,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content=''): full_url = combine_url(base_url, resource) headers = {'content-type': 'application/json', 'accept': 'application/json'} if user: - headers['Authorization'] = 'Basic ' + ('%s:%s' % (user, passwd)).encode("base64") + headers['Authorization'] = 'Basic %s' % base64.b64encode(bytes('%s:%s' % (user, passwd), "utf-8")).decode() ca_certs = None for retry_times in range(3): http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == rest_no_auth)) |