X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=2330fa2cbc00b4c049cb62ede3718426390bf49e;hb=03fda2d5ca97a7202b4e7953282b4156e763f183;hp=a97c6169a0ca4389b00bf58f04d8db7a06f32459;hpb=3282ed39a71c360abb21f06636ab58b22c47b5ec;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index a97c6169..2330fa2c 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -11,9 +11,8 @@
 # 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
@@ -27,7 +26,6 @@ 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__)
 
@@ -42,7 +40,6 @@ class CreateVnfAndQueryVnfs(APIView):
             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)
@@ -63,8 +60,8 @@ class CreateVnfAndQueryVnfs(APIView):
 
 class InstantiateVnf(APIView):
     def post(self, request, instanceid):
+        logger.debug("InstantiateVnf--post::> %s" % request.data)
         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()
@@ -108,43 +105,15 @@ class DeleteVnfAndQueryVnf(APIView):
 class TerminateVnf(APIView):
     def post(self, request, instanceid):
         logger.debug("TerminateVnf--post::> %s" % request.data)
-        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()
+        try:
+            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()
+        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 QueryMultipleVnf(APIView):
-    def get(self, request):
-        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 GetOperationStatus(APIView):
-#     def get(self, request):
-#         logger.debug("GetOperationStatus--get::> %s" % request.data)
-#         return Response(data='', status=status.HTTP_202_ACCEPTED)
-
-
-class SwaggerJsonView(APIView):
-    def get(self, request):
-        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)