Get inst resource before grant resource

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

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index 2fe03ba..7f5bb48 100644 (file)
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -26,17 +26,17 @@ from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
 
 
-class TestNsInstantiate(TestCase):
+class TestNFInstantiate(TestCase):
     def setUp(self):
         self.client = Client()
         VmInstModel.objects.create(vmid="1", vimid="1", resouceid="11", insttype=0, instid="1", vmname="test_01",
                                    operationalstate=1)
-        VmInstModel.objects.create(vmid="2", vimid="2", resouceid="22", insttype=0, instid="2", vmname="test_02",
-                               operationalstate=1)
+        VmInstModel.objects.create(vmid="2", vimid="2", resouceid="22", insttype=0, instid="2",
+                                   vmname="test_02", operationalstate=1)
         NetworkInstModel.objects.create(networkid='1', vimid='1', resouceid='1', name='pnet_network',
                                         tenant='admin', insttype=0, instid='1')
         SubNetworkInstModel.objects.create(subnetworkid='1', vimid='1', resouceid='1', networkid='1',
-                                           name='sub_pnet',tenant='admin', insttype=0, instid='1')
+                                           name='sub_pnet', tenant='admin', insttype=0, instid='1')
         PortInstModel.objects.create(portid='1', networkid='1', subnetworkid='1', vimid='1', resouceid='1',
                                      name='aaa_pnet_cp', tenant='admin', insttype=0, instid='1')
 
@@ -55,7 +55,7 @@ class TestNsInstantiate(TestCase):
         self.assertEqual(1, len(jobs))
 
     def test_swagger_ok(self):
-        response = self.client.get("/gvnfmapi/lcm/v1/swagger.json", format='json')
+        response = self.client.get("/openoapi/vnflcm/v1/swagger.json", format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
     @mock.patch.object(restcall, 'call_req')
@@ -66,7 +66,7 @@ class TestNsInstantiate(TestCase):
             "vnfdId": "111",
             "vnfInstanceName": "vFW_01",
             "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
-        response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances", data=data, format='json')
+        response = self.client.post("/openoapi/vnflcm/v1/vnf_instances", data=data, format='json')
         self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
         context = json.loads(response.content)
         self.assertTrue(NfInstModel.objects.filter(nfinstid=context['vnfInstanceId']).exists())
@@ -74,7 +74,7 @@ class TestNsInstantiate(TestCase):
     @mock.patch.object(InstVnf, 'run')
     def test_instantiate_vnf(self, mock_run):
         mock_run.re.return_value = None
-        response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances/12/instantiate", data={}, format='json')
+        response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/instantiate", data={}, format='json')
         self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
 
     def test_instantiate_vnf_when_inst_id_not_exist(self):
@@ -543,4 +543,4 @@ vnfd_model_dict = {
     ],
     "localizationLanguage": "en_US",
     "additionalParams": {}
-}
\ No newline at end of file
+}