From: Yan Yang <yangyanyj@chinamobile.com>
Date: Tue, 13 Nov 2018 04:36:24 +0000 (+0000)
Subject: Merge "Fix ns term logic"
X-Git-Tag: 3.0.0-ONAP~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cd061f479aab78eab62b81db702fa1f85dd534b0;p=vfc%2Fnfvo%2Flcm.git

Merge "Fix ns term logic"
---

cd061f479aab78eab62b81db702fa1f85dd534b0
diff --cc lcm/pub/msapi/nslcm.py
index 4dd0d223,1ea9f11a..f46ebc4a
--- a/lcm/pub/msapi/nslcm.py
+++ b/lcm/pub/msapi/nslcm.py
@@@ -32,7 -31,8 +32,8 @@@ def call_from_ns_cancel_resource(res_ty
          # vnf
          method = "POST"
          uri = '/api/nslcm/v1/ns/terminatevnf/%s' % instid
-     req_param = {}
+     if not req_param:
+         req_param = {}
      ret = req_by_msb(uri, method, json.dumps(req_param))
 -    logger.info("[NS terminate] call vnfm [%s] result:%s" % (res_type, ret))
 +    logger.info("[NS terminate] call res_type [%s] result:%s" % (res_type, ret))
      return ret