summaryrefslogtreecommitdiffstats
path: root/gvnfmadapter
diff options
context:
space:
mode:
authorlaili <lai.li@zte.com.cn>2018-08-15 10:00:21 +0800
committerlaili <lai.li@zte.com.cn>2018-08-15 10:10:18 +0800
commita137816c1365e2b92590051243b51c1606fec879 (patch)
tree226aa83f7f2573e6311a5728e4b978e5a32c4737 /gvnfmadapter
parent994e54cdcbbbe3767e21c9dc06852ba9745a7603 (diff)
Deal with gvnfm adapter stuffs.
Modify VnfQueryInfo. Change-Id: Ia48b88bf611f36295d343c9900b49094a08cfa8a Issue-ID: VFC-1020 Signed-off-by: laili <lai.li@zte.com.cn>
Diffstat (limited to 'gvnfmadapter')
-rw-r--r--gvnfmadapter/driver/interfaces/tests.py2
-rw-r--r--gvnfmadapter/driver/interfaces/views.py29
2 files changed, 20 insertions, 11 deletions
diff --git a/gvnfmadapter/driver/interfaces/tests.py b/gvnfmadapter/driver/interfaces/tests.py
index 21a83b2..29cb918 100644
--- a/gvnfmadapter/driver/interfaces/tests.py
+++ b/gvnfmadapter/driver/interfaces/tests.py
@@ -142,7 +142,7 @@ class InterfacesTest(TestCase):
}
job_info = {
"ResponseInfo": {
- "vnfInstanceId": "88",
+ "id": "88",
"instantiationState": "INSTANTIATED",
"vnfSoftwareVersion": "v1.2.3"
}
diff --git a/gvnfmadapter/driver/interfaces/views.py b/gvnfmadapter/driver/interfaces/views.py
index 3fd11f9..50e8d36 100644
--- a/gvnfmadapter/driver/interfaces/views.py
+++ b/gvnfmadapter/driver/interfaces/views.py
@@ -53,7 +53,7 @@ class VnfInstInfo(APIView):
raise Exception(requestSerializer.errors)
# requestData = requestSerializer.data
- requestData = request.data
+ requestData = request.data
input_data = {
"vnfdId": ignorcase_get(requestData, "vnfDescriptorId"),
"vnfInstanceName": ignorcase_get(requestData, "vnfInstanceName"),
@@ -163,15 +163,22 @@ class VnfQueryInfo(APIView):
"vnfType": "",
"vnfStatus": ""
}
- resp_response_data = mapping_conv(query_vnf_resp_mapping, ignorcase_get(resp, "ResponseInfo"))
+ ResponseInfo = ignorcase_get(resp, "ResponseInfo")
+ resp_response_data = mapping_conv(query_vnf_resp_mapping, ResponseInfo)
resp_data = {
"vnfInfo": resp_response_data
}
- ResponseInfo = ignorcase_get(resp, "ResponseInfo")
- resp_data["vnfInfo"]["version"] = ignorcase_get(ResponseInfo, "vnfSoftwareVersion")
+ id = ignorcase_get(ResponseInfo, "id")
+ if id:
+ resp_data["vnfInfo"]["vnfInstanceId"] = id
+ vnfPkgId = ignorcase_get(ResponseInfo, "vnfPkgId")
+ if vnfPkgId:
+ resp_data["vnfInfo"]["vnfPackageId"] = vnfPkgId
+ vnfSoftwareVersion = ignorcase_get(ResponseInfo, "vnfSoftwareVersion")
+ if vnfSoftwareVersion:
+ resp_data["vnfInfo"]["version"] = vnfSoftwareVersion
if ignorcase_get(ResponseInfo, "instantiationState") == "INSTANTIATED":
resp_data["vnfInfo"]["vnfStatus"] = "ACTIVE"
- resp_data["vnfInfo"]["vnfInstanceId"] = ignorcase_get(ResponseInfo, "vnfInstanceId")
logger.debug("[%s]resp_data=%s", fun_name(), resp_data)
return Response(data=resp_data, status=status.HTTP_200_OK)
except GvnfmDriverException as e:
@@ -320,11 +327,13 @@ def call_vnfm(resource, method, vnfm_info, data=""):
def mapping_conv(keyword_map, rest_return):
resp_data = {}
for param in keyword_map:
- if keyword_map[param]:
- if isinstance(keyword_map[param], dict):
- resp_data[param] = mapping_conv(keyword_map[param], ignorcase_get(rest_return, param))
- else:
- resp_data[param] = ignorcase_get(rest_return, param)
+ # if keyword_map[param]:
+ if isinstance(keyword_map[param], dict):
+ resp_data[param] = mapping_conv(keyword_map[param], ignorcase_get(rest_return, param))
+ else:
+ value = ignorcase_get(rest_return, param)
+ if value:
+ resp_data[param] = value
return resp_data