diff options
author | 2018-02-05 18:27:09 +0800 | |
---|---|---|
committer | 2018-02-05 18:27:09 +0800 | |
commit | 299d55253b7914d7ad3528a9cc32b375a0aa4dc1 (patch) | |
tree | 94e6564158ca842336eaebadaad26e649f72ef59 | |
parent | cfe41080ef15984f8209f7b5b1e1f84042dcdbbd (diff) |
Add grant vnf swagger generate logic
Change-Id: Icb147d11de097b34113c8c9b2b6b65a9e507bf30
Issue-ID: VFC-714
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r-- | lcm/ns/vnfs/serializers.py | 2 | ||||
-rw-r--r-- | lcm/ns/vnfs/views.py | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lcm/ns/vnfs/serializers.py b/lcm/ns/vnfs/serializers.py index e25d1d65..4dbaeb6f 100644 --- a/lcm/ns/vnfs/serializers.py +++ b/lcm/ns/vnfs/serializers.py @@ -76,5 +76,5 @@ class VimSerializer(serializers.Serializer): class GrantVnfRespSerializer(serializers.Serializer): - vnfInstanceId = serializers.CharField(help_text="ID of VNF instance", required=True) + vnfInstanceId = serializers.CharField(help_text="ID of VNF instance", required=False, allow_null=True) vim = VimSerializer(help_text="VIM Info", required=True) diff --git a/lcm/ns/vnfs/views.py b/lcm/ns/vnfs/views.py index 87a786bc..963fe7d7 100644 --- a/lcm/ns/vnfs/views.py +++ b/lcm/ns/vnfs/views.py @@ -37,6 +37,8 @@ from lcm.ns.vnfs.serializers import InstVnfRespSerializer from lcm.ns.vnfs.serializers import GetVnfRespSerializer from lcm.ns.vnfs.serializers import TerminateVnfReqSerializer from lcm.ns.vnfs.serializers import TerminateVnfRespSerializer +from lcm.ns.vnfs.serializers import GrantVnfReqSerializer +from lcm.ns.vnfs.serializers import GrantVnfRespSerializer logger = logging.getLogger(__name__) @@ -132,9 +134,20 @@ class NfDetailView(APIView): class NfGrant(APIView): + @swagger_auto_schema( + request_body=GrantVnfReqSerializer(), + responses={ + status.HTTP_201_CREATED: GrantVnfRespSerializer(), + status.HTTP_409_CONFLICT: "Inner error" + } + ) def post(self, request): logger.debug("NfGrant--post::> %s" % request.data) try: + req_serializer = GrantVnfReqSerializer(data=request.data) + if not req_serializer.is_valid(): + raise Exception(req_serializer.errors) + vnf_inst_id = ignore_case_get(request.data, 'vnfInstanceId') job_id = JobUtil.create_job("VNF", JOB_TYPE.GRANT_VNF, vnf_inst_id) rsp = GrantVnfs(request.data, job_id).send_grant_vnf_to_resMgr() @@ -148,6 +161,10 @@ class NfGrant(APIView): } } """ + 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: logger.error(e.message) |