summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2019-04-19 11:56:55 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2019-04-19 11:56:55 +0800
commit070d34fd10361e116d357bc52e130d980c330cd5 (patch)
treed3fe19fe09ef54d50f557fc0596146bac62403f3 /lcm
parent1306f9c091fadb8cdd5a6b34aef046524872cfda (diff)
refactor codes for vnflcm
Change-Id: Idbc8a6ce56d1331429326f892cb76f83a883bb3d Issue-ID: VFC-1307 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/views/change_ext_conn_view.py44
1 files changed, 11 insertions, 33 deletions
diff --git a/lcm/lcm/nf/views/change_ext_conn_view.py b/lcm/lcm/nf/views/change_ext_conn_view.py
index 41d39d03..f0e82885 100644
--- a/lcm/lcm/nf/views/change_ext_conn_view.py
+++ b/lcm/lcm/nf/views/change_ext_conn_view.py
@@ -16,19 +16,15 @@ import logging
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 lcm.nf.serializers.change_ext_vnf_connectivity_request import ChangeExtVnfConnectivityRequestSerializer
from lcm.nf.serializers.response import ProblemDetailsSerializer
-from lcm.pub.exceptions import NFLCMException
-from lcm.pub.exceptions import NFLCMExceptionNotFound
-from lcm.pub.exceptions import NFLCMExceptionConflict
-from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.database.models import NfInstModel
from lcm.nf.const import VNF_STATUS
+from lcm.nf.const import OPERATION_TYPE
from lcm.nf.biz.change_ext_conn import ChangeExtConn
from .common import view_safe_call_with_log
+from .common import deal_vnf_action
logger = logging.getLogger(__name__)
@@ -45,30 +41,12 @@ class ChangeExtConnView(APIView):
)
@view_safe_call_with_log(logger=logger)
def post(self, request, instanceid):
- logger.debug("ChangeExtConn--post::> %s" % request.data)
-
- chg_ext_conn_serializer = ChangeExtVnfConnectivityRequestSerializer(data=request.data)
- if not chg_ext_conn_serializer.is_valid():
- raise NFLCMException(chg_ext_conn_serializer.errors)
-
- job_id = JobUtil.create_job('NF', 'CHG_EXT_CONN', instanceid)
- JobUtil.add_job_status(job_id, 0, "CHG_EXT_CONN_READY")
- self.chg_ext_conn_pre_check(instanceid, job_id)
-
- ChangeExtConn(chg_ext_conn_serializer.data, instanceid, job_id).start()
-
- response = Response(data={"jobId": job_id},
- status=status.HTTP_202_ACCEPTED)
- return response
-
- def chg_ext_conn_pre_check(self, nf_inst_id, job_id):
- vnf_insts = NfInstModel.objects.filter(nfinstid=nf_inst_id)
- if not vnf_insts.exists():
- raise NFLCMExceptionNotFound("VNF nf_inst_id does not exist.")
-
- if vnf_insts[0].status != 'INSTANTIATED':
- raise NFLCMExceptionConflict("VNF instantiationState is not INSTANTIATED.")
-
- vnf_insts.update(status=VNF_STATUS.UPDATING)
- JobUtil.add_job_status(job_id, 15, 'Nf change ext conn pre-check finish')
- logger.info("Nf change ext conn pre-check finish")
+ return deal_vnf_action(
+ logger=logger,
+ opt_type=OPERATION_TYPE.CHANGE_EXT_CONN,
+ opt_status=VNF_STATUS.UPDATING,
+ instid=instanceid,
+ req=request,
+ req_serializer=ChangeExtVnfConnectivityRequestSerializer,
+ act_task=ChangeExtConn
+ )