X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=a97c6169a0ca4389b00bf58f04d8db7a06f32459;hb=3282ed39a71c360abb21f06636ab58b22c47b5ec;hp=c47e5004ce75d90e6066fbe9c472af6ce1f73887;hpb=852d84e026b178497f5f54c13aeaa0f518770307;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py index c47e5004..a97c6169 100644 --- a/lcm/lcm/nf/vnfs/views.py +++ b/lcm/lcm/nf/vnfs/views.py @@ -11,62 +11,108 @@ # 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. - +import json import logging +import os +import traceback from rest_framework import status from rest_framework.response import Response from rest_framework.views import APIView +from lcm.nf.vnfs.vnf_cancel.delete_vnf_identifier import DeleteVnf +from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf +from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf +from lcm.nf.vnfs.vnf_query.query_vnf import QueryVnf +from lcm.pub.exceptions import NFLCMException from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.values import ignore_case_get logger = logging.getLogger(__name__) -class CreateVnfIdentifier(APIView): +class CreateVnfAndQueryVnfs(APIView): + def get(self, request): + logger.debug("QuerySingleVnf--get::> %s" % request.data) + try: + resp_data = QueryVnf(request.data).query_multi_vnf() + except NFLCMException as e: + logger.error(e.message) + return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + except: + logger.error(traceback.format_exc()) + tt = traceback.format_exc() + return Response(data={'error': 'Failed to get Vnfs'}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + return Response(data=resp_data, status=status.HTTP_200_OK) + def post(self, request): logger.debug("CreateVnfIdentifier--post::> %s" % request.data) - data = {} - data["vnfdId"] = ignore_case_get(request.data, "vnfdId") - data["vnfInstanceName"] = ignore_case_get(request.data, "vnfInstanceName") - data["vnfInstanceDescription"] = ignore_case_get(request.data, "vnfInstanceDescription") try: - self.nf_inst_id = CreateVnf(data).do_biz() - except Exception as e: + nf_inst_id = CreateVnf(request.data).do_biz() + except NFLCMException as e: + logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - rsp = {"vnfInstanceId": self.nf_inst_id} + except Exception: + logger.error(traceback.format_exc()) + return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + rsp = {"vnfInstanceId": nf_inst_id} return Response(data=rsp, status=status.HTTP_201_CREATED) class InstantiateVnf(APIView): - def post(self, request, instanceId): - logger.debug("InstantiateVnf--post::> %s" % request.data) - data = {'flavourId': ignore_case_get(request.data, 'flavourId'), - 'instantiationLevelId': ignore_case_get(request.data, 'instantiationLevelId'), - 'extVirtualLinks': ignore_case_get(request.data, 'extVirtualLinks'), - 'localizationLanguage': ignore_case_get(request.data, 'localizationLanguage'), - 'additionalParams': ignore_case_get(request.data, 'additionalParams')} - nf_inst_id = instanceId - job_id = JobUtil.create_job('NF', 'CREATE', nf_inst_id) - JobUtil.add_job_status(job_id, 0, "INST_VNF_READY") - - # CreateVnfs(data, nf_inst_id, job_id).start() + def post(self, request, instanceid): + try: + logger.debug("InstantiateVnf--post::> %s" % request.data) + job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid) + JobUtil.add_job_status(job_id, 0, "INST_VNF_READY") + InstVnf(request.data, instanceid, job_id).start() + except NFLCMException as e: + logger.error(e.message) + return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + except Exception: + logger.error(traceback.format_exc()) + return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) rsp = {"jobId": job_id} return Response(data=rsp, status=status.HTTP_202_ACCEPTED) -class DeleteVnfIdentifier(APIView): - def delete(self, request): +class DeleteVnfAndQueryVnf(APIView): + def get(self, request, instanceid): + logger.debug("QuerySingleVnf--get::> %s" % request.data) + try: + resp_data = QueryVnf(request.data, instanceid).query_single_vnf() + except NFLCMException as e: + logger.error(e.message) + return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + except: + logger.error(traceback.format_exc()) + return Response(data={'error': 'Failed to get Vnf(%s)' % instanceid}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + return Response(data=resp_data, status=status.HTTP_200_OK) + + def delete(self, request, instanceid): logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data) - return Response(data='', status=status.HTTP_202_ACCEPTED) + try: + DeleteVnf(request.data, instanceid).do_biz() + except NFLCMException as e: + logger.error(e.message) + return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + except Exception: + logger.error(traceback.format_exc()) + return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + return Response(data=None, status=status.HTTP_204_NO_CONTENT) class TerminateVnf(APIView): - def post(self, request): + def post(self, request, instanceid): logger.debug("TerminateVnf--post::> %s" % request.data) - return Response(data='', status=status.HTTP_202_ACCEPTED) + job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid) + JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY") + TermVnf(request.data, instanceid, job_id).start() + rsp = {"jobId": job_id} + return Response(data=rsp, status=status.HTTP_202_ACCEPTED) class QueryMultipleVnf(APIView): @@ -74,14 +120,31 @@ class QueryMultipleVnf(APIView): logger.debug("QueryMultipleVnf--get::> %s" % request.data) return Response(data='', status=status.HTTP_202_ACCEPTED) +# class QuerySingleVnf(APIView): +# def get(self, request, instanceid): +# logger.debug("QuerySingleVnf--get::> %s" % request.data) +# try: +# resp_data = QueryVnf(request.data, instanceid).query_single_vnf(instanceid) +# except NFLCMException as e: +# logger.error(e.message) +# return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) +# except: +# logger.error(traceback.format_exc()) +# return Response(data={'error': 'Failed to get Vnf(%s)' % instanceid}, +# status=status.HTTP_500_INTERNAL_SERVER_ERROR) +# return Response(data=resp_data, status=status.HTTP_202_ACCEPTED) -class QuerySingleVnf(APIView): - def get(self, request): - logger.debug("QuerySingleVnf--get::> %s" % request.data) - return Response(data='', status=status.HTTP_202_ACCEPTED) + +# class GetOperationStatus(APIView): +# def get(self, request): +# logger.debug("GetOperationStatus--get::> %s" % request.data) +# return Response(data='', status=status.HTTP_202_ACCEPTED) -class GetOperationStatus(APIView): +class SwaggerJsonView(APIView): def get(self, request): - logger.debug("GetOperationStatus--get::> %s" % request.data) - return Response(data='', status=status.HTTP_202_ACCEPTED) \ No newline at end of file + json_file = os.path.join(os.path.dirname(__file__), 'swagger.json') + f = open(json_file) + json_data = json.JSONDecoder().decode(f.read()) + f.close() + return Response(json_data)