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 98edf1e..1fc0506 100644 (file)
--- 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 2179df9..23b246d 100644 (file)
--- 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())\r
         t1_apply_grant_result = [0, json.JSONEncoder().encode(\r
             {\r
-                "vimid": 'vimid_1',\r
-                "tenant": 'tenantname_1'\r
+                "id": "1",\r
+                "vnfInstanceId": "1",\r
+                "vnfLcmOpOccId": "2",\r
+                "vimConnections": [\r
+                    {\r
+                        "id": "1",\r
+                        "vimId": "1"\r
+                    }\r
+                ]\r
             }), '200']\r
         t2_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
         t3_delete_flavor = [0, json.JSONEncoder().encode({"vim_id": "vimid_1"}), '200']\r