Update python2 to python3

[vfc/nfvo/lcm.git] / lcm / ns / tests / test_ns_get.py

diff --git a/lcm/ns/tests/test_ns_get.py b/lcm/ns/tests/test_ns_get.py
index 9da1ab3..3ab4906 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,16 +20,20 @@ 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
-\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)
\ No newline at end of file
+        self.assertEqual(status.HTTP_200_OK, response.status_code)\r
+        self.assertIsNotNone(response.data)\r
+\r
+    def test_query_all_nsinstance(self):\r
+        response = self.client.get("/api/nslcm/v1/ns")\r
+        self.assertEqual(status.HTTP_200_OK, response.status_code, response.data)\r
+        self.assertIsNotNone(response.data)\r
+        self.assertEqual(2, len(response.data))\r
+\r
+    def test_query_ns_by_non_existing_nsinstance_id(self):\r
+        response = self.client.get("/api/nslcm/v1/ns/200")\r
+        self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)\r