fix VNF query result none exception

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

diff --git a/lcm/lcm/nf/tests/test_query_vnf.py b/lcm/lcm/nf/tests/test_query_vnf.py
index 95f387b..2582423 100644 (file)
--- a/lcm/lcm/nf/tests/test_query_vnf.py
+++ b/lcm/lcm/nf/tests/test_query_vnf.py
@@ -116,7 +116,7 @@ class ResourceTest(TestCase):
         NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
         StorageInstModel(storageid='s02',
                          vimid='vim01',
-                         resouceid='resource01',
+                         resourceid='resource01',
                          insttype=1,
                          instid=vnf_inst_id).save()
         response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
@@ -152,7 +152,6 @@ class ResourceTest(TestCase):
         VmInstModel(vmid='x', insttype='0').save()
         response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertEqual({'error': 'StorageInst(x) does not exist.'}, response.data)
 
     def test_get_vnfs(self):
         for i in range(1, 3):
@@ -161,7 +160,7 @@ class ResourceTest(TestCase):
                         status='INSTANTIATED').save()
             StorageInstModel(storageid='s0%s' % i,
                              vimid='vim0%s' % i,
-                             resouceid='resource0%s' % i,
+                             resourceid='resource0%s' % i,
                              insttype=1,
                              instid='%s' % i).save()
         response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
@@ -170,5 +169,4 @@ class ResourceTest(TestCase):
 
     def test_get_vnfs_not_exist(self):
         response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
-        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertEqual({'error': 'VnfInsts does not exist.'}, response.data)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)