update for change to etsicatalog

Change-Id: Idc2a6950960a324964500a8c4701be422de2b782
Issue-ID: MODELING-216
Signed-off-by: dyh <dengyuanhong@chinamobile.com>

1 files changed, 0 insertions, 124 deletions

diff --git a/genericparser/jobs/views.py b/genericparser/jobs/views.py
deleted file mode 100644
index b9c5121..0000000
--- a/genericparser/jobs/views.py
+++ /dev/null
@@ -1,124 +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.
-import logging
-
-from drf_yasg import openapi
-from drf_yasg.utils import swagger_auto_schema
-from rest_framework import status
-from rest_framework.response import Response
-from rest_framework.views import APIView
-
-from genericparser.jobs.job_get import GetJobInfoService
-from genericparser.packages.serializers.genericparser_serializers import GetJobResponseSerializer
-from genericparser.packages.serializers.genericparser_serializers import PostJobRequestSerializer
-from genericparser.packages.serializers.genericparser_serializers import PostJobResponseResultSerializer
-from genericparser.pub.utils.jobutil import JobUtil
-from genericparser.pub.utils.values import ignore_case_get
-
-logger = logging.getLogger(__name__)
-
-
-class JobView(APIView):
-
-    input_job_id = openapi.Parameter(
-        'job_id',
-        openapi.IN_QUERY,
-        description="job id",
-        type=openapi.TYPE_STRING)
-    input_response_id = openapi.Parameter(
-        'responseId',
-        openapi.IN_QUERY,
-        description="response id",
-        type=openapi.TYPE_STRING)
-
-    @swagger_auto_schema(
-        operation_description="Get job status",
-        manual_parameters=[input_job_id, input_response_id],
-        responses={
-            status.HTTP_200_OK: GetJobResponseSerializer(),
-            status.HTTP_500_INTERNAL_SERVER_ERROR: PostJobResponseResultSerializer()
-        })
-    def get(self, request, job_id):
-        response_id = ignore_case_get(request.META, 'responseId')
-        ret = GetJobInfoService(job_id, response_id).do_biz()
-        response_serializer = GetJobResponseSerializer(data=ret)
-        validataion_error = self.handleValidatonError(
-            response_serializer, False)
-        if validataion_error:
-            return validataion_error
-
-        return Response(
-            data=response_serializer.data,
-            status=status.HTTP_200_OK)
-
-    @swagger_auto_schema(
-        request_body=PostJobRequestSerializer(),
-        operation_description="Update job status",
-        manual_parameters=[input_job_id],
-        responses={
-            status.HTTP_202_ACCEPTED: PostJobResponseResultSerializer(),
-            status.HTTP_500_INTERNAL_SERVER_ERROR: PostJobResponseResultSerializer()
-        }
-    )
-    def post(self, request, job_id):
-        job_result_ok = {'result': 'ok'}
-
-        logger.debug("Enter JobView:post, %s, %s ", job_id, request.data)
-        jobs = JobUtil.query_job_status(job_id)
-        if len(jobs) > 0 and jobs[-1].errcode == '255':
-            return Response(data=job_result_ok)
-
-        request_serializer = PostJobRequestSerializer(data=request.data)
-        validataion_error = self.handleValidatonError(
-            request_serializer, True)
-        if not validataion_error:
-            return validataion_error
-
-        requestData = request_serializer.data
-        progress = ignore_case_get(requestData, "progress")
-        desc = ignore_case_get(requestData, "desc", '%s' % progress)
-        errcode = '0' if ignore_case_get(
-            requestData, 'errcode') in (
-            'true', 'active') else '255'
-        logger.debug("errcode=%s", errcode)
-        JobUtil.add_job_status(job_id, progress, desc, error_code=errcode)
-
-        response_serializer = PostJobResponseResultSerializer(
-            data=job_result_ok)
-        validataion_error = self.handleValidatonError(
-            response_serializer, False)
-        if validataion_error:
-            return validataion_error
-
-        return Response(
-            data=response_serializer.data,
-            status=status.HTTP_202_ACCEPTED)
-
-    def handleValidatonError(self, base_serializer, is_request):
-        response = None
-
-        if not base_serializer.is_valid():
-            errormessage = base_serializer.errors
-            logger.error(errormessage)
-
-            if is_request:
-                message = 'Invalid request'
-            else:
-                message = 'Invalid response'
-            logger.error(message)
-
-            Response(
-                data={'result': message, 'msg': errormessage},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        return response