Update python2 to python3

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

diff --git a/lcm/ns/views/deprecated/scale_ns_views.py b/lcm/ns/views/deprecated/scale_ns_views.py
index ee37532..c05a75d 100644 (file)
--- a/lcm/ns/views/deprecated/scale_ns_views.py
+++ b/lcm/ns/views/deprecated/scale_ns_views.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 import logging
 import traceback
-
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import status
 from rest_framework.response import Response
@@ -23,7 +22,8 @@ from lcm.ns.biz.ns_manual_scale import NSManualScaleService
 from lcm.ns.serializers.deprecated.ns_serializers import _NsOperateJobSerializer
 from lcm.ns.serializers.deprecated.ns_serializers import _ManualScaleNsReqSerializer
 from lcm.pub.exceptions import NSLCMException
-from lcm.pub.utils.jobutil import JobUtil, JOB_TYPE
+from lcm.pub.utils.jobutil import JobUtil
+from lcm.pub.enum import JOB_TYPE
 
 logger = logging.getLogger(__name__)
 
@@ -43,8 +43,12 @@ class NSManualScaleView(APIView):
             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()
+            req = request.data
+            scale_data = {}
+            scale_data['scaleType'] = req['scaleType']
+            scaleNsData = req['scaleNsData'][0]
+            scale_data['scaleNsData'] = {"scaleNsByStepsData": scaleNsData['scaleNsByStepsData'][0]}
+            NSManualScaleService(ns_instance_id, scale_data, job_id).start()
 
             resp_serializer = _NsOperateJobSerializer(data={'jobId': job_id})
             if not resp_serializer.is_valid():
@@ -53,6 +57,6 @@ class NSManualScaleView(APIView):
             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)
+            JobUtil.add_job_status(job_id, 255, 'NS scale failed: %s' % e.args[0])
             return Response(data={'error': 'NS scale failed: %s' % ns_instance_id},
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)