From: Fu Jinhua <fu.jinhua@zte.com.cn>
Date: Wed, 15 Aug 2018 07:34:28 +0000 (+0000)
Subject: Merge "Modify vnf instantiation related stuffs."
X-Git-Tag: 1.2.0~33
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a214ee5bbc03a68f3860a71ec1ae626cd2b20e25;hp=067ed2476d06a0bb2c378c26375e17468a2b0385;p=vfc%2Fgvnfm%2Fvnflcm.git

Merge "Modify vnf instantiation related stuffs."
---

diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py
index 98edf1ed..1fc0506c 100644
--- a/lcm/lcm/nf/biz/terminate_vnf.py
+++ b/lcm/lcm/nf/biz/terminate_vnf.py
@@ -74,7 +74,7 @@ class TerminateVnf(Thread):
             'vnfInstanceId': self.nf_inst_id,
             'vnfDescriptorId': '',
             'lifecycleOperation': 'Terminate',
-            'jobId': self.job_id,
+            'vnfLcmOpOccId': self.job_id,
             'addResource': [],
             'removeResource': [],
             'placementConstraint': [],
diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py
index 2179df97..23b246d7 100644
--- a/lcm/lcm/nf/tests/test_terminate_vnf.py
+++ b/lcm/lcm/nf/tests/test_terminate_vnf.py
@@ -133,8 +133,15 @@ class TestNFTerminate(TestCase):
                                    create_time=now_time())
         t1_apply_grant_result = [0, json.JSONEncoder().encode(
             {
-                "vimid": 'vimid_1',
-                "tenant": 'tenantname_1'
+                "id": "1",
+                "vnfInstanceId": "1",
+                "vnfLcmOpOccId": "2",
+                "vimConnections": [
+                    {
+                        "id": "1",
+                        "vimId": "1"
+                    }
+                ]
             }), '200']
         t2_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
         t3_delete_flavor = [0, json.JSONEncoder().encode({"vim_id": "vimid_1"}), '200']