Update create vl logic

[vfc/nfvo/lcm.git] / lcm / ns / vnfs / views.py

diff --git a/lcm/ns/vnfs/views.py b/lcm/ns/vnfs/views.py
index 0479d1a..6a35eb6 100644 (file)
--- a/lcm/ns/vnfs/views.py
+++ b/lcm/ns/vnfs/views.py
@@ -42,6 +42,10 @@ from lcm.ns.vnfs.serializers import GrantVnfRespSerializer
 from lcm.ns.vnfs.serializers import NotifyLcmReqSerializer
 from lcm.ns.vnfs.serializers import ScaleVnfReqSerializer
 from lcm.ns.vnfs.serializers import ScaleVnfRespSerializer
+from lcm.ns.vnfs.serializers import VerifyVnfReqSerializer
+from lcm.ns.vnfs.serializers import VerifyVnfRespSerializer
+from lcm.ns.vnfs.serializers import VnfmInfoRespSerializer
+from lcm.ns.vnfs.serializers import VimInfoRespSerializer
 
 logger = logging.getLogger(__name__)
 
@@ -56,9 +60,9 @@ class NfView(APIView):
     def post(self, request):
         logger.debug("VnfCreateView--post::> %s" % request.data)
 
-        req_serializer = InstVnfReqSerializer(data=request.data)
-        if not req_serializer.is_valid():
-            logger.error(req_serializer.errors)
+        # req_serializer = InstVnfReqSerializer(data=request.data)
+        # if not req_serializer.is_valid():
+        # logger.error(req_serializer.errors)
 
         data = {'ns_instance_id': ignore_case_get(request.data, 'nsInstanceId'),
                 'additional_param_for_ns': ignore_case_get(request.data, 'additionalParamForVnf'),
@@ -164,9 +168,9 @@ class NfGrant(APIView):
                 }
             }
             """
-            resp_serializer = GrantVnfRespSerializer(data=rsp)
-            if not resp_serializer.is_valid():
-                raise Exception(resp_serializer.errors)
+            # resp_serializer = GrantVnfRespSerializer(data=rsp)
+            # if not resp_serializer.is_valid():
+            # raise Exception(resp_serializer.errors)
 
             return Response(data=rsp, status=status.HTTP_201_CREATED)
         except Exception as e:
@@ -179,16 +183,16 @@ class LcmNotify(APIView):
     @swagger_auto_schema(
         request_body=NotifyLcmReqSerializer(),
         responses={
-            status.HTTP_201_CREATED: None,
+            status.HTTP_201_CREATED: 'successful',
             status.HTTP_409_CONFLICT: "Inner error"
         }
     )
     def post(self, request, vnfmid, vnfInstanceId):
         logger.debug("LcmNotify--post::> %s" % request.data)
         try:
-            req_serializer = NotifyLcmReqSerializer(data=request.data)
-            if not req_serializer.is_valid():
-                raise Exception(req_serializer.errors)
+            # req_serializer = NotifyLcmReqSerializer(data=request.data)
+            # if not req_serializer.is_valid():
+            # raise Exception(req_serializer.errors)
             NotifyLcm(vnfmid, vnfInstanceId, request.data).do_biz()
             return Response(data={}, status=status.HTTP_201_CREATED)
         except Exception as e:
@@ -218,18 +222,51 @@ class NfScaleView(APIView):
 
 
 class NfVerifyView(APIView):
+    @swagger_auto_schema(
+        request_body=VerifyVnfReqSerializer(),
+        responses={
+            status.HTTP_202_ACCEPTED: VerifyVnfRespSerializer(),
+            status.HTTP_409_CONFLICT: "Inner error"
+        }
+    )
     def post(self, request):
         job_id = "VNFSDK_" + str(uuid.uuid4())
         logger.debug("NfVerifyView--post::%s> %s", job_id, request.data)
-        VerifyVnfs(request.data, job_id).start()
-        return Response(data={"jobId": job_id}, status=status.HTTP_202_ACCEPTED)
+        try:
+            req_serializer = VerifyVnfReqSerializer(data=request.data)
+            if not req_serializer.is_valid():
+                raise Exception(req_serializer.errors)
+
+            VerifyVnfs(request.data, job_id).start()
+
+            rsp = {"jobId": job_id}
+            resp_serializer = VerifyVnfRespSerializer(data=rsp)
+            if not resp_serializer.is_valid():
+                raise Exception(resp_serializer.errors)
+
+            return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
+        except Exception as e:
+            logger.error(e.message)
+            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
 
 
 class NfVnfmInfoView(APIView):
+    @swagger_auto_schema(
+        request_body=None,
+        responses={
+            status.HTTP_200_OK: VnfmInfoRespSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
+        }
+    )
     def get(self, request, vnfmid):
         logger.debug("NfVnfmInfoView--get::> %s" % vnfmid)
         try:
             vnfm_info = get_vnfm_by_id(vnfmid)
+
+            resp_serializer = VnfmInfoRespSerializer(data=vnfm_info)
+            if not resp_serializer.is_valid():
+                raise Exception(resp_serializer.errors)
+
         except NSLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -242,10 +279,22 @@ class NfVnfmInfoView(APIView):
 
 
 class NfVimInfoView(APIView):
+    @swagger_auto_schema(
+        request_body=None,
+        responses={
+            status.HTTP_200_OK: VimInfoRespSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
+        }
+    )
     def get(self, request, vimid):
         logger.debug("NfVimInfoView--get::> %s" % vimid)
         try:
             vim_info = get_vim_by_id(vimid)
+
+            resp_serializer = VimInfoRespSerializer(data=vim_info)
+            if not resp_serializer.is_valid():
+                raise Exception(resp_serializer.errors)
+
         except NSLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)