Add inputs json for inst vnf

[vfc/nfvo/driver/vnfm/svnfm.git] / zte / vmanager / driver / interfaces / views.py

diff --git a/zte/vmanager/driver/interfaces/views.py b/zte/vmanager/driver/interfaces/views.py
index 292e748..3e62b06 100644 (file)
--- a/zte/vmanager/driver/interfaces/views.py
+++ b/zte/vmanager/driver/interfaces/views.py
@@ -28,7 +28,7 @@ from django.http import StreamingHttpResponse
 from driver.interfaces.serializers import HealReqSerializer, InstScaleHealRespSerializer, ScaleReqSerializer, \
     NotifyReqSerializer, GrantRespSerializer, GrantReqSerializer, JobQueryRespSerializer, TerminateVnfRequestSerializer, \
     InstantiateVnfRequestSerializer, QueryVnfResponseSerializer, SubscribesRespSerializer, \
-    SubscribeReqSerializer, SubscribeRespSerializer, VnfPkgsSerializer
+    SubscribeReqSerializer, SubscribeRespSerializer, VnfPkgsSerializer, NfvoInfoReqSerializer
 from driver.pub.config.config import VNF_FTP
 from driver.pub.utils import restcall
 from driver.pub.utils.restcall import req_by_msb
@@ -138,10 +138,11 @@ class InstantiateVnf(APIView):
             logger.debug("[%s] packageInfo=%s", fun_name(), packageInfo)
             logger.debug("VNF_FTP=%s", VNF_FTP)
             data = {
+                "vnfinstancename": "default",
                 "NFVOID": 1,
                 "VNFMID": vnfmid,
                 "vnfd_id": packageInfo.get("vnfdId"),
-                "deployflavorid": "TODO",
+                "deployflavorid": "default",
                 "extension": {},
                 "inputs": []
             }
@@ -150,6 +151,9 @@ class InstantiateVnf(APIView):
             for name, value in ignorcase_get(additionalParam, "inputs").items():
                 data["inputs"].append({"key_name": name, "value": value, "type": "TODO"})
 
+            inputs_json = load_json_file("inputs.json")
+            [data["inputs"].append(item) for item in inputs_json["inputs"]]
+
             logger.debug("[%s] call_req data=%s", fun_name(), data)
 
             ret = restcall.call_req(
@@ -698,6 +702,12 @@ class VnfPkgs(APIView):
 
 
 class VnfPkg(APIView):
+    @swagger_auto_schema(
+        responses={
+            status.HTTP_200_OK: "File stream for vnf pkg file",
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
+        }
+    )
     def get(self, request, packageId, fileName):
         logger.debug("====VnfPkg get====%s, %s", packageId, fileName)
         file_range = request.META.get('RANGE')
@@ -710,6 +720,13 @@ class VnfPkg(APIView):
 
 
 class NfvoInfo(APIView):
+    @swagger_auto_schema(
+        request_body=NfvoInfoReqSerializer(),
+        responses={
+            status.HTTP_200_OK: "Update successfully",
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
+        }
+    )
     def put(self, request, vnfmid):
         logger.debug("====NfvoInfo put====%s", vnfmid)
         req_data = {
@@ -719,7 +736,7 @@ class NfvoInfo(APIView):
         }
         ret = get_vnfminfo_from_nslcm(vnfmid)
         if ret[0] != 0:
-            raise Exception(ret[1])
+            return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
         vnfm_info = json.JSONDecoder().decode(ret[1])
         logger.debug("[%s] vnfm_info=%s", fun_name(), vnfm_info)
@@ -732,5 +749,15 @@ class NfvoInfo(APIView):
             method='put',
             content=json.dumps(req_data))
         if ret[0] != 0:
-            raise Exception(ret[1])
+            return Response(data={'error': ret[1]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         logger.debug("update nfvo info successfully.")
+        return Response(data={}, status=status.HTTP_200_OK)
+
+
+class HealthCheckView(APIView):
+    @swagger_auto_schema(
+        responses={
+            status.HTTP_200_OK: 'Active'})
+    def get(self, request, format=None):
+        logger.debug("HealthCheck")
+        return Response({"status": "active"})