Refactor ns get UT of vfc-nfvo-lcm

Change-Id: I15585f6e870ba48fb22d2b78b4e486982f42d2ed
Issue-ID: VFC-654
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/ns/ns_get.py b/lcm/ns/ns_get.py
index 7447001..239c4eb 100644 (file)
--- a/lcm/ns/ns_get.py
+++ b/lcm/ns/ns_get.py
@@ -29,9 +29,6 @@ class GetNSInfoService(object):
         if self.ns_filter and "ns_inst_id" in self.ns_filter:
             ns_inst_id = self.ns_filter["ns_inst_id"]
             ns_insts = NSInstModel.objects.filter(id=ns_inst_id)
-        elif self.ns_filter and "csarId" in self.ns_filter:
-            csar_id = self.ns_filter["csarId"]
-            ns_insts = NSInstModel.objects.filter(nsd_id=csar_id)
         else:
             ns_insts = NSInstModel.objects.all()
 

diff --git a/lcm/ns/tests/test_ns_get.py b/lcm/ns/tests/test_ns_get.py
index 1dad989..e41f397 100644 (file)
--- a/lcm/ns/tests/test_ns_get.py
+++ b/lcm/ns/tests/test_ns_get.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
 # See the License for the specific language governing permissions and\r
 # limitations under the License.\r
-import uuid\r
-\r
 from django.test import TestCase, Client\r
 from rest_framework import status\r
 \r
@@ -22,18 +20,14 @@ from lcm.pub.database.models import NSInstModel
 class TestNsQuery(TestCase):\r
     def setUp(self):\r
         self.client = Client()\r
-        self.nsd_id = str(uuid.uuid4())\r
-        self.ns_package_id = str(uuid.uuid4())\r
-        NSInstModel(id=1, nsd_id=1, name='test01').save()\r
-        NSInstModel(id=2, nsd_id=1, name='test02').save()\r
-\r
-    def test_query_ns_by_csarId(self):\r
-        response = self.client.get("/api/nslcm/v1/ns?csarId=1")\r
-        self.failUnlessEqual(status.HTTP_200_OK, response.status_code)\r
+        NSInstModel(id=1, nsd_id=11, name='test01').save()\r
+        NSInstModel(id=2, nsd_id=22, name='test02').save()\r
 \r
     def test_query_ns_by_nsinstance_id(self):\r
         response = self.client.get("/api/nslcm/v1/ns/1")\r
         self.failUnlessEqual(status.HTTP_200_OK, response.status_code)\r
+        self.assertIsNotNone(response.data)\r
+        self.assertEqual(1, len(response.data))\r
 \r
     def test_query_all_nsinstance(self):\r
         response = self.client.get("/api/nslcm/v1/ns")\r
@@ -43,4 +37,4 @@ class TestNsQuery(TestCase):
 \r
     def test_query_ns_by_non_existing_nsinstance_id(self):\r
         response = self.client.get("/api/nslcm/v1/ns/200")\r
-        self.assertIsNone(response.data)\r
+        self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)\r