Align grant request with SOL003.

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / tests / test_terminate_vnf.py

diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py
index 0136862..97330b6 100644 (file)
--- a/lcm/lcm/nf/tests/test_terminate_vnf.py
+++ b/lcm/lcm/nf/tests/test_terminate_vnf.py
@@ -22,7 +22,7 @@ from rest_framework import status
 \r
 from lcm.nf.biz.terminate_vnf import TerminateVnf\r
 from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \\r
-    PortInstModel, FlavourInstModel, StorageInstModel, NfvoRegInfoModel\r
+    PortInstModel, FlavourInstModel, StorageInstModel\r
 from lcm.pub.utils import restcall\r
 from lcm.pub.utils.jobutil import JobUtil\r
 from lcm.pub.utils.timeutil import now_time\r
@@ -34,13 +34,13 @@ class TestNFTerminate(TestCase):
         self.client = Client()\r
         StorageInstModel.objects.create(storageid="1",\r
                                         vimid="1",\r
-                                        resouceid="11",\r
+                                        resourceid="11",\r
                                         insttype=0,\r
                                         instid="1111",\r
                                         is_predefined=1)\r
         NetworkInstModel.objects.create(networkid='1',\r
                                         vimid='1',\r
-                                        resouceid='1',\r
+                                        resourceid='1',\r
                                         name='pnet_network',\r
                                         is_predefined=1,\r
                                         tenant='admin',\r
@@ -48,7 +48,7 @@ class TestNFTerminate(TestCase):
                                         instid='1111')\r
         SubNetworkInstModel.objects.create(subnetworkid='1',\r
                                            vimid='1',\r
-                                           resouceid='1',\r
+                                           resourceid='1',\r
                                            networkid='1',\r
                                            is_predefined=1,\r
                                            name='sub_pnet',\r
@@ -59,7 +59,7 @@ class TestNFTerminate(TestCase):
                                      networkid='1',\r
                                      subnetworkid='1',\r
                                      vimid='1',\r
-                                     resouceid='1',\r
+                                     resourceid='1',\r
                                      is_predefined=1,\r
                                      name='aaa_pnet_cp',\r
                                      tenant='admin',\r
@@ -67,20 +67,17 @@ class TestNFTerminate(TestCase):
                                      instid='1111')\r
         FlavourInstModel.objects.create(flavourid="1",\r
                                         vimid="1",\r
-                                        resouceid="11",\r
+                                        resourceid="11",\r
                                         instid="1111",\r
                                         is_predefined=1)\r
         VmInstModel.objects.create(vmid="1",\r
                                    vimid="1",\r
-                                   resouceid="11",\r
+                                   resourceid="11",\r
                                    insttype=0,\r
                                    instid="1111",\r
                                    vmname="test_01",\r
                                    is_predefined=1,\r
                                    operationalstate=1)\r
-        NfvoRegInfoModel.objects.create(nfvoid='1111',\r
-                                        vnfminstid='11111',\r
-                                        apiurl='1')\r
 \r
     def tearDown(self):\r
         VmInstModel.objects.all().delete()\r
@@ -121,6 +118,7 @@ class TestNFTerminate(TestCase):
     def test_terminate_vnf_success(self, mock_call, mock_call_req):\r
         NfInstModel.objects.create(nfinstid='1111',\r
                                    nf_name='2222',\r
+                                   vnfminstid='1',\r
                                    package_id='todo',\r
                                    version='',\r
                                    vendor='',\r
@@ -135,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