From: maopengzhang <zhang.maopeng1@zte.com.cn>
Date: Tue, 16 Jul 2019 09:04:49 +0000 (+0800)
Subject: resolve python2->python3 issues
X-Git-Tag: 1.3.4~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=22e08b5a535ab309140e054f7ffebb1fcb3bb5a9;p=vfc%2Fgvnfm%2Fvnfmgr.git

resolve python2->python3 issues

change base64 code

Change-Id: I0cc8607baa58eb7125215e7b17df97eea61344e5
Issue-ID: VFC-1429
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
---

diff --git a/mgr/mgr/pub/utils/restcall.py b/mgr/mgr/pub/utils/restcall.py
index 883f63c..3e948a2 100644
--- a/mgr/mgr/pub/utils/restcall.py
+++ b/mgr/mgr/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
@@ -39,7 +40,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))