From 3fec7d22be4f3b48934965052568bdd538dd4ce8 Mon Sep 17 00:00:00 2001 From: yangyan Date: Tue, 22 May 2018 11:39:53 +0800 Subject: [PATCH] update vnf instance name Issue-ID: VFC-917 Change-Id: I39511311b8c12f9319146dd33d6e02ea7f663a54 Signed-off-by: yangyan --- lcm/jobs/views.py | 6 +++--- lcm/ns/vnfs/create_vnfs.py | 1 + lcm/ns/vnfs/views.py | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lcm/jobs/views.py b/lcm/jobs/views.py index 8fb6e0ac..9ba19f3a 100644 --- a/lcm/jobs/views.py +++ b/lcm/jobs/views.py @@ -48,9 +48,9 @@ class JobView(APIView): try: response_id = ignore_case_get(request.META, 'responseId') ret = GetJobInfoService(job_id, response_id).do_biz() - resp_serializer = JobQueryRespSerializer(data=ret) - if not resp_serializer.is_valid(): - raise NSLCMException(resp_serializer.errors) + # resp_serializer = JobQueryRespSerializer(data=ret) + # if not resp_serializer.is_valid(): + # raise NSLCMException(resp_serializer.errors) # return Response(data=resp_serializer.data, status=status.HTTP_200_OK) return Response(data=ret, status=status.HTTP_200_OK) except Exception as e: diff --git a/lcm/ns/vnfs/create_vnfs.py b/lcm/ns/vnfs/create_vnfs.py index e0b6b42e..3d85bd18 100644 --- a/lcm/ns/vnfs/create_vnfs.py +++ b/lcm/ns/vnfs/create_vnfs.py @@ -124,6 +124,7 @@ class CreateVnfs(Thread): else: self.vnf_inst_name = vnf_info['properties']['name'] + str(uuid.uuid4()) self.vnf_inst_name = self.vnf_inst_name[:30] + self.vnf_inst_name = self.vnf_inst_name.replace("-", "_") return logger.error('Can not found vnf in nsd model') raise NSLCMException('Can not found vnf in nsd model') diff --git a/lcm/ns/vnfs/views.py b/lcm/ns/vnfs/views.py index 3bb152b4..3841bc68 100644 --- a/lcm/ns/vnfs/views.py +++ b/lcm/ns/vnfs/views.py @@ -60,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'), -- 2.16.6