From: fujinhua <fu.jinhua@zte.com.cn>
Date: Wed, 10 Jan 2018 05:42:19 +0000 (+0800)
Subject: Refactor ns get UT of vfc-nfvo-lcm
X-Git-Tag: v1.1.0~243
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F27785%2F2;p=vfc%2Fnfvo%2Flcm.git

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 74470017..239c4ebd 100644
--- 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 1dad989d..e41f397a 100644
--- 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.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import uuid
-
 from django.test import TestCase, Client
 from rest_framework import status
 
@@ -22,18 +20,14 @@ from lcm.pub.database.models import NSInstModel
 class TestNsQuery(TestCase):
     def setUp(self):
         self.client = Client()
-        self.nsd_id = str(uuid.uuid4())
-        self.ns_package_id = str(uuid.uuid4())
-        NSInstModel(id=1, nsd_id=1, name='test01').save()
-        NSInstModel(id=2, nsd_id=1, name='test02').save()
-
-    def test_query_ns_by_csarId(self):
-        response = self.client.get("/api/nslcm/v1/ns?csarId=1")
-        self.failUnlessEqual(status.HTTP_200_OK, response.status_code)
+        NSInstModel(id=1, nsd_id=11, name='test01').save()
+        NSInstModel(id=2, nsd_id=22, name='test02').save()
 
     def test_query_ns_by_nsinstance_id(self):
         response = self.client.get("/api/nslcm/v1/ns/1")
         self.failUnlessEqual(status.HTTP_200_OK, response.status_code)
+        self.assertIsNotNone(response.data)
+        self.assertEqual(1, len(response.data))
 
     def test_query_all_nsinstance(self):
         response = self.client.get("/api/nslcm/v1/ns")
@@ -43,4 +37,4 @@ class TestNsQuery(TestCase):
 
     def test_query_ns_by_non_existing_nsinstance_id(self):
         response = self.client.get("/api/nslcm/v1/ns/200")
-        self.assertIsNone(response.data)
+        self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)