update version of lcm

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

diff --git a/lcm/ns/views.py b/lcm/ns/views.py
index b07f21e..11790e1 100644 (file)
--- a/lcm/ns/views.py
+++ b/lcm/ns/views.py
@@ -38,6 +38,7 @@ from lcm.ns.serializers import InstantNsReqSerializer
 from lcm.ns.serializers import TerminateNsReqSerializer
 from lcm.ns.serializers import HealNsReqSerializer
 from lcm.ns.serializers import InstNsPostDealReqSerializer
+from lcm.ns.serializers import ManualScaleNsReqSerializer
 from lcm.pub.exceptions import NSLCMException
 
 logger = logging.getLogger(__name__)
@@ -54,12 +55,7 @@ class CreateNSView(APIView):
     def get(self, request):
         try:
             logger.debug("CreateNSView::get")
-            filter = None
-            csarId = ignore_case_get(request.META, 'csarId')
-            if csarId:
-                filter = {"csarId": csarId}
-
-            ret = GetNSInfoService(filter).get_ns_info()
+            ret = GetNSInfoService().get_ns_info()
             logger.debug("CreateNSView::get::ret=%s", ret)
             resp_serializer = QueryNsRespSerializer(data=ret, many=True)
             if not resp_serializer.is_valid():
@@ -113,6 +109,7 @@ class NSInstView(APIView):
     )
     def post(self, request, ns_instance_id):
         logger.debug("Enter NSInstView::post::ns_instance_id=%s", ns_instance_id)
+        logger.debug("request.data=%s", request.data)
         req_serializer = InstantNsReqSerializer(data=request.data)
         if not req_serializer.is_valid():
             return Response({'error': req_serializer.errors},
@@ -215,7 +212,7 @@ class NSDetailView(APIView):
     @swagger_auto_schema(
         request_body=None,
         responses={
-            status.HTTP_204_NO_CONTENT: None,
+            status.HTTP_204_NO_CONTENT: 'successful',
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
         }
     )
@@ -282,14 +279,30 @@ class NSInstPostDealView(APIView):
 
 
 class NSManualScaleView(APIView):
+    @swagger_auto_schema(
+        request_body=ManualScaleNsReqSerializer(help_text="NS manual scale"),
+        responses={
+            status.HTTP_202_ACCEPTED: NsOperateJobSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
+        }
+    )
     def post(self, request, ns_instance_id):
         logger.debug("Enter NSManualScaleView::post %s, %s", request.data, ns_instance_id)
         job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, ns_instance_id)
         try:
+            req_serializer = ManualScaleNsReqSerializer(data=request.data)
+            if not req_serializer.is_valid():
+                raise NSLCMException(req_serializer.errors)
+
             NSManualScaleService(ns_instance_id, request.data, job_id).start()
+
+            resp_serializer = NsOperateJobSerializer(data={'jobId': job_id})
+            if not resp_serializer.is_valid():
+                raise NSLCMException(resp_serializer.errors)
+
+            return Response(data=resp_serializer.data, status=status.HTTP_202_ACCEPTED)
         except Exception as e:
             logger.error(traceback.format_exc())
             JobUtil.add_job_status(job_id, 255, 'NS scale failed: %s' % e.message)
             return Response(data={'error': 'NS scale failed: %s' % ns_instance_id},
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        return Response(data={'jobId': job_id}, status=status.HTTP_202_ACCEPTED)