diff options
Diffstat (limited to 'gvnfmadapter')
| -rw-r--r-- | gvnfmadapter/driver/interfaces/views.py | 45 | ||||
| -rw-r--r-- | gvnfmadapter/driver/pub/config/config.py | 5 | ||||
| -rw-r--r-- | gvnfmadapter/driver/pub/utils/restcall.py | 55 |
3 files changed, 17 insertions, 88 deletions
diff --git a/gvnfmadapter/driver/interfaces/views.py b/gvnfmadapter/driver/interfaces/views.py index 7d521e8..e7a72d0 100644 --- a/gvnfmadapter/driver/interfaces/views.py +++ b/gvnfmadapter/driver/interfaces/views.py @@ -22,9 +22,8 @@ from rest_framework.decorators import api_view from rest_framework.response import Response from driver.pub.utils import restcall -from driver.pub.utils.restcall import req_by_msb, call_aai +from driver.pub.utils.restcall import req_by_msb -# ================================================== vnf_create_url = "api/vnflcm/v1/vnf_instances" vnf_inst_url = "api/vnflcm/v1/vnf_instances/%s/instantiate" vnf_delete_url = "api/vnflcm/v1/vnf_instances/%s" @@ -97,11 +96,6 @@ def set_terminatevnf_params(data): input_data["gracefulTerminationTimeout"] = ignorcase_get(data,"gracefulTerminationTimeout") return input_data -def get_inst_levelId(vnfdId): - inst_levelId = 0 - return inst_levelId - -# Query vnfm info from nslcm def get_vnfminfo_from_nslcm(vnfm_id): ret = req_by_msb((EXTSYS_GET_VNFM) % vnfm_id, "GET") if ret[0] != 0: @@ -110,43 +104,34 @@ def get_vnfminfo_from_nslcm(vnfm_id): logger.debug("[%s] vnfm_info=%s", fun_name(), vnfm_info) return 0, vnfm_info -# Query vnfm info from esr -def get_vnfm_info(vnfm_id): - ret = call_aai((EXTSYS_GET_VNFM) % vnfm_id, "GET") - if ret[0] != 0: - return 255, Response(data={'error': ret[1]}, status=ret[2]) - vnfm_info = json.JSONDecoder().decode(ret[1]) - logger.debug("[%s] vnfm_info=%s", fun_name(), vnfm_info) - return 0, vnfm_info - -def call_vnfm_rest(vnfm_info, input_data, res_url, call_method = "post"): +def call_vnfm(resource, method, vnfm_info, data): ret = restcall.call_req( base_url=ignorcase_get(vnfm_info, "url"), user=ignorcase_get(vnfm_info, "userName"), passwd=ignorcase_get(vnfm_info, "password"), auth_type=restcall.rest_no_auth, - resource=res_url, - method=call_method, - content=json.JSONEncoder().encode(input_data)) + resource=resource, + method=method, + content=json.JSONEncoder().encode(data)) return ret -def call_vnfm_createvnf(vnfm_info, input_data): - return call_vnfm_rest(vnfm_info, input_data, vnf_create_url) +# def call_vnfm_createvnf(vnfm_info, input_data): +# return call_vnfm(vnfm_info, input_data, vnf_create_url) def call_vnfm_instvnf(vnfm_info, input_data, vnfInstanceId): - return call_vnfm_rest(vnfm_info, input_data, vnf_inst_url % vnfInstanceId, "post") + return call_vnfm(vnfm_info, input_data, vnf_inst_url % vnfInstanceId, "post") def call_vnfm_terminatevnf(vnfm_info, input_data, vnfInstanceId): - return call_vnfm_rest(vnfm_info, input_data, vnf_terminate_url % vnfInstanceId, "post") + return call_vnfm(vnfm_info, input_data, vnf_terminate_url % vnfInstanceId, "post") def call_vnfm_deletevnf(vnfm_info, vnfInstanceId): - return call_vnfm_rest(vnfm_info, None, vnf_delete_url % vnfInstanceId, "delete") + return call_vnfm(vnfm_info, None, vnf_delete_url % vnfInstanceId, "delete") def call_vnfm_queryvnf(vnfm_info,vnfInstanceId): - return call_vnfm_rest(vnfm_info, None, vnf_query_url % vnfInstanceId, "get") + return call_vnfm(vnfm_info, None, vnf_query_url % vnfInstanceId, "get") def call_vnfm_operation_status(vnfm_info, jobId, responseId = None): - return call_vnfm_rest(vnfm_info, None, operation_status_url % (jobId, responseId), "get") + return call_vnfm(vnfm_info, None, operation_status_url % (jobId, responseId), "get") def wait4job(vnfm_id,jobId,gracefulTerminationTimeout): begin_time = time.time() @@ -182,7 +167,8 @@ def do_createvnf(request, data, vnfm_id): if ret != 0: return ret, vnfm_info - ret = call_vnfm_createvnf(vnfm_info, data) + # ret = call_vnfm_createvnf(vnfm_info, data) + ret = call_vnfm("api/vnflcm/v1/vnf_instances", "POST", vnfm_info, data) logger.debug("[%s] call_req ret=%s", fun_name(), ret) if ret[0] != 0: return 255, Response(data={'error': ret[1]}, status=ret[2]) @@ -199,7 +185,8 @@ def do_instvnf(vnfInstanceId, request, data, vnfm_id): if ret != 0: return ret, vnfm_info - ret = call_vnfm_instvnf(vnfm_info,data, vnfInstanceId) + # ret = call_vnfm_instvnf(vnfm_info,data, vnfInstanceId) + ret = call_vnfm("api/vnflcm/v1/vnf_instances/%s/instantiate" % vnfInstanceId, "POST", vnfm_info, data) logger.debug("[%s] call_req ret=%s", fun_name(), ret) if ret[0] != 0: return 255, Response(data={'error': ret[1]}, status=ret[2]) diff --git a/gvnfmadapter/driver/pub/config/config.py b/gvnfmadapter/driver/pub/config/config.py index aef1de7..198ae76 100644 --- a/gvnfmadapter/driver/pub/config/config.py +++ b/gvnfmadapter/driver/pub/config/config.py @@ -12,11 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [AAI] -AAI_BASE_URL = "https://127.0.0.1:8443/aai/v11" -AAI_USER = "AAI" -AAI_PASSWORD = "AAI" - # [MSB] MSB_SERVICE_IP = '127.0.0.1' MSB_SERVICE_PORT = '80' diff --git a/gvnfmadapter/driver/pub/utils/restcall.py b/gvnfmadapter/driver/pub/utils/restcall.py index 4280e73..08f4cf3 100644 --- a/gvnfmadapter/driver/pub/utils/restcall.py +++ b/gvnfmadapter/driver/pub/utils/restcall.py @@ -19,7 +19,7 @@ import urllib2 import uuid import httplib2 -from driver.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT, AAI_BASE_URL, AAI_USER, AAI_PASSWORD +from driver.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2 HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT, HTTP_202_ACCEPTED = '200', '201', '204', '202' @@ -93,56 +93,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-SVNFM-ZTE-DRIVER', '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 - - -def call_aai(resource, method, data=''): - return call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, method, data) |