From: fujinhua <fu.jinhua@zte.com.cn>
Date: Mon, 12 Nov 2018 03:45:14 +0000 (+0800)
Subject: Fix vnf term req data get logic
X-Git-Tag: 1.2.1~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F72404%2F1;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fgvnfm.git

Fix vnf term req data get logic

Change-Id: I0be04a77a97557a55284f258ad683004ccf870e8
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

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)