summaryrefslogtreecommitdiffstats
path: root/zte/vmanager
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-12-07 15:39:55 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-12-07 15:39:55 +0800
commitdc916b021084214a5e351177168b53b05dcc1b28 (patch)
tree1e5eb77de25c66141b403834f076f7f1bd7ab70f /zte/vmanager
parent63970cb976074af766b3271423e2c1e02cb5fed6 (diff)
Optimize vfc-ztevnfmdriver instantiation Code
Change-Id: I174a4cff3c88a9dd1c7d5abddae2db7a56b3db02 Issue-ID: VFC-613 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'zte/vmanager')
-rw-r--r--zte/vmanager/driver/interfaces/views.py37
1 files changed, 7 insertions, 30 deletions
diff --git a/zte/vmanager/driver/interfaces/views.py b/zte/vmanager/driver/interfaces/views.py
index 21432b2f..694ce669 100644
--- a/zte/vmanager/driver/interfaces/views.py
+++ b/zte/vmanager/driver/interfaces/views.py
@@ -61,11 +61,6 @@ def mapping_conv(keyword_map, rest_return):
return resp_data
-query_vnfd_url = "api/nslcm/v1/vnfpackage/%s"
-query_vnfm_url = "api/extsys/v1/vnfms/%s"
-query_package_url = "api/nslcm/v1/vnfpackage/%s"
-
-
# Query vnfm_info from nslcm
def get_vnfminfo_from_nslcm(vnfmid):
ret = req_by_msb("api/nslcm/v1/vnfms/%s" % vnfmid, "GET")
@@ -84,24 +79,6 @@ def vnfpackage_get(csarid):
return ret
-create_vnf_url = "v1/vnfs"
-create_vnf_param_mapping = {
- "packageUrl": "",
- "instantiateUrl": "",
- "instantiationLevel": "",
- "vnfInstanceName": "",
- "vnfPackageId": "",
- "vnfDescriptorId": "",
- "flavorId": "",
- "vnfInstanceDescription": "",
- "extVirtualLink": "",
- "additionalParam": ""}
-create_vnf_resp_mapping = {
- "VNFInstanceID": "vnfInstanceId",
- "JobId": "jobid"
-}
-
-
@api_view(http_method_names=['POST'])
def instantiate_vnf(request, *args, **kwargs):
try:
@@ -128,12 +105,10 @@ def instantiate_vnf(request, *args, **kwargs):
data = {}
data["NFVOID"] = 1
data["VNFMID"] = vnfm_id
- # vnfdId = ignorcase_get(packageInfo, "vnfdId")
vnfdModel = json.loads(ignorcase_get(packageInfo, "vnfdModel"))
metadata = ignorcase_get(vnfdModel, "metadata")
vnfd_name = ignorcase_get(metadata, "name")
# TODO convert sdc vnf package to vnf vender package
-
inputs = []
if "SPGW" in vnfd_name.upper():
data["VNFD"] = VNF_FTP + "SPGW"
@@ -150,11 +125,9 @@ def instantiate_vnf(request, *args, **kwargs):
for name, value in ignorcase_get(ignorcase_get(request.data, "additionalParam"), "inputs").items():
inputs.append({"name": name, "value": value})
- logger.info(
- "ignorcase_get(request.data, \"additionalParam\") = %s" % ignorcase_get(request.data, "additionalParam"))
data["extension"]["inputs"] = json.dumps(inputs)
- data["extension"]["extVirtualLinks"] = ignorcase_get(
- ignorcase_get(request.data, "additionalParam"), "extVirtualLinks")
+ additionalParam = ignorcase_get(request.data, "additionalParam")
+ data["extension"]["extVirtualLinks"] = ignorcase_get(additionalParam, "extVirtualLinks")
data["extension"]["vnfinstancename"] = ignorcase_get(request.data, "vnfInstanceName")
data["extension"]["vnfid"] = data["VNFD"]
data["extension"]["multivim"] = 0
@@ -165,7 +138,7 @@ def instantiate_vnf(request, *args, **kwargs):
user=ignorcase_get(vnfm_info, "userName"),
passwd=ignorcase_get(vnfm_info, "password"),
auth_type=restcall.rest_no_auth,
- resource=create_vnf_url,
+ resource="v1/vnfs",
method='post',
content=json.JSONEncoder().encode(data))
@@ -173,6 +146,10 @@ def instantiate_vnf(request, *args, **kwargs):
if ret[0] != 0:
return Response(data={'error': ret[1]}, status=ret[2])
resp = json.JSONDecoder().decode(ret[1])
+ create_vnf_resp_mapping = {
+ "VNFInstanceID": "vnfInstanceId",
+ "JobId": "jobid"
+ }
resp_data = mapping_conv(create_vnf_resp_mapping, resp)
logger.info("[%s]resp_data=%s", fun_name(), resp_data)
except Exception as e: