Modify gvnfm-vnflcm code and unit tests

Modify call aai logic and fix related unit tests in gvnfm vnflcm

Change-Id: I3483f723ce91310d500e340fcdbb7e173972d777
Issue-ID: VFC-346
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

1 files changed, 3 insertions, 50 deletions

diff --git a/lcm/lcm/pub/utils/restcall.py b/lcm/lcm/pub/utils/restcall.py
index 89c4d224..6bcb0331 100644
--- a/lcm/lcm/pub/utils/restcall.py
+++ b/lcm/lcm/pub/utils/restcall.py
@@ -29,7 +29,7 @@ HTTP_404_NOTFOUND, HTTP_403_FORBIDDEN, HTTP_401_UNAUTHORIZED, HTTP_400_BADREQUES
 logger = logging.getLogger(__name__)
 
 
-def call_req(base_url, user, passwd, auth_type, resource, method, content=''):
+def call_req(base_url, user, passwd, auth_type, resource, method, content='', additional_headers={}):
     callid = str(uuid.uuid1())
     logger.debug("[%s]call_req('%s','%s','%s',%s,'%s','%s','%s')" % (
         callid, base_url, user, passwd, auth_type, resource, method, content))
@@ -41,6 +41,8 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content=''):
         if user:
             headers['Authorization'] = 'Basic ' + ('%s:%s' % (user, passwd)).encode("base64")
         ca_certs = None
+        if additional_headers:
+            headers.update(additional_headers)
         for retry_times in range(3):
             http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == rest_no_auth))
             http.follow_all_redirects = True
@@ -93,52 +95,3 @@ def combine_url(base_url, resource):
     else:
         full_url = base_url + '/' + resource
     return full_url
-
-
-def call_req_aai(base_url, user, passwd, auth_type, resource, method, content=''):
-    callid = str(uuid.uuid1())
-    logger.debug("[%s]call_req('%s','%s','%s',%s,'%s','%s','%s')" % (
-        callid, base_url, user, passwd, auth_type, resource, method, content))
-    ret = None
-    resp_status = ''
-    try:
-        full_url = combine_url(base_url, resource)
-        headers = {'content-type': 'application/json', 'accept': 'application/json',
-                   'X-FromAppId': 'VFC-GVNFM-VNFLCM', 'X-TransactionId': str(uuid.uuid1())}
-        if user:
-            headers['Authorization'] = 'Basic ' + ('%s:%s' % (user, passwd)).encode("base64")
-        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))
-            http.follow_all_redirects = True
-            try:
-                resp, resp_content = http.request(full_url, method=method.upper(), body=content, headers=headers)
-                resp_status, resp_body = resp['status'], resp_content.decode('UTF-8')
-                logger.debug("[%s][%d]status=%s,resp_body=%s)" % (callid, retry_times, resp_status, resp_body))
-                if resp_status in status_ok_list:
-                    ret = [0, resp_body, resp_status]
-                else:
-                    ret = [1, resp_body, resp_status]
-                break
-            except Exception as ex:
-                if 'httplib.ResponseNotReady' in str(sys.exc_info()):
-                    logger.debug("retry_times=%d", retry_times)
-                    logger.error(traceback.format_exc())
-                    ret = [1, "Unable to connect to %s" % full_url, resp_status]
-                    continue
-                raise ex
-    except urllib2.URLError as err:
-        ret = [2, str(err), resp_status]
-    except Exception as ex:
-        logger.error(traceback.format_exc())
-        logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
-        res_info = str(sys.exc_info())
-        if 'httplib.ResponseNotReady' in res_info:
-            res_info = "The URL[%s] request failed or is not responding." % full_url
-        ret = [3, res_info, resp_status]
-    except:
-        logger.error(traceback.format_exc())
-        ret = [4, str(sys.exc_info()), resp_status]
-
-    logger.debug("[%s]ret=%s" % (callid, str(ret)))
-    return ret