From 98cb202da1f53b113e6f8e2eb3a4c2536eedb9c7 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Mon, 12 Nov 2018 11:45:14 +0800 Subject: Fix vnf term req data get logic Change-Id: I0be04a77a97557a55284f258ad683004ccf870e8 Issue-ID: VFC-1163 Signed-off-by: fujinhua --- gvnfmadapter/driver/interfaces/views.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gvnfmadapter/driver/interfaces/views.py b/gvnfmadapter/driver/interfaces/views.py index d246080..e6c26fc 100644 --- a/gvnfmadapter/driver/interfaces/views.py +++ b/gvnfmadapter/driver/interfaces/views.py @@ -112,10 +112,14 @@ class VnfTermInfo(APIView): logger.debug("Terminate vnf begin!") vnfm_id = vnfmid try: + term_type = ignorcase_get(request.data, "terminationType") input_data = { - "terminationType": ignorcase_get(request.data, "terminationType"), - "gracefulTerminationTimeout": ignorcase_get(request.data, "gracefulTerminationTimeout") + "terminationType": term_type.upper() if term_type else "FORCEFUL" } + term_timeout = ignorcase_get(request.data, "gracefulTerminationTimeout") + if term_timeout: + input_data["gracefulTerminationTimeout"] = int(term_timeout) + logger.debug("do_terminatevnf: vnfm_id=[%s],vnfInstanceId=[%s],input_data=[%s]", vnfm_id, vnfInstanceId, input_data) resp = do_terminatevnf(vnfm_id, vnfInstanceId, input_data) -- cgit 1.2.3-korg