diff options
| -rw-r--r-- | lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py | 24 | ||||
| -rw-r--r-- | lcm/lcm/nf/views/instantiate_vnf_view.py | 13 |
2 files changed, 6 insertions, 31 deletions
diff --git a/lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py b/lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py deleted file mode 100644 index 17b9c0db..00000000 --- a/lcm/lcm/nf/serializers/inst_or_teri_vnf_response.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2017 ZTE Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -from rest_framework import serializers - - -class InstOrTeriVnfResponseSerializer(serializers.Serializer): - jobId = serializers.CharField( - help_text="jobId", - required=True, - max_length=255, - allow_null=True) diff --git a/lcm/lcm/nf/views/instantiate_vnf_view.py b/lcm/lcm/nf/views/instantiate_vnf_view.py index fec85d10..3b4a3bee 100644 --- a/lcm/lcm/nf/views/instantiate_vnf_view.py +++ b/lcm/lcm/nf/views/instantiate_vnf_view.py @@ -21,9 +21,8 @@ from rest_framework import status from rest_framework.response import Response
from rest_framework.views import APIView
-# from lcm.nf.serializers.serializers import InstantiateVnfRequestSerializer, InstOrTeriVnfResponseSerializer
from lcm.nf.serializers.instantiate_vnf_request import InstantiateVnfRequestSerializer
-from lcm.nf.serializers.inst_or_teri_vnf_response import InstOrTeriVnfResponseSerializer
+from lcm.nf.serializers.job_identifier import JobIdentifierSerializer
from lcm.pub.exceptions import NFLCMException
from lcm.pub.utils.jobutil import JobUtil
@@ -34,7 +33,7 @@ class InstantiateVnfView(APIView): @swagger_auto_schema(
request_body=InstantiateVnfRequestSerializer(),
responses={
- status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(),
+ status.HTTP_202_ACCEPTED: JobIdentifierSerializer(),
status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
}
)
@@ -49,12 +48,12 @@ class InstantiateVnfView(APIView): JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")
InstantiateVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start()
- instantiate_vnf_response_serializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id})
- resp_isvalid = instantiate_vnf_response_serializer.is_valid()
+ job_identifier_serializer = JobIdentifierSerializer(data={"jobId": job_id})
+ resp_isvalid = job_identifier_serializer.is_valid()
if not resp_isvalid:
- raise NFLCMException(instantiate_vnf_response_serializer.errors)
+ raise NFLCMException(job_identifier_serializer.errors)
- return Response(data=instantiate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)
+ return Response(data=job_identifier_serializer.data, status=status.HTTP_202_ACCEPTED)
except NFLCMException as e:
logger.error(e.message)
return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
|