Update python2 to python3

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

diff --git a/lcm/ns/tests/test_ns_create.py b/lcm/ns/tests/test_ns_create.py
index a2c363e..dee1fcb 100644 (file)
--- a/lcm/ns/tests/test_ns_create.py
+++ b/lcm/ns/tests/test_ns_create.py
@@ -13,25 +13,21 @@
 # limitations under the License.
 import json
 import mock
-import os
 import uuid
 
 from django.test import TestCase
+from lcm.pub.database.models import NSInstModel
+from lcm.ns.biz.ns_create import CreateNSService
+from lcm.pub.utils import restcall
 from rest_framework import status
 from rest_framework.test import APIClient
-
-from lcm.ns.biz.ns_create import CreateNSService
-from lcm.pub.database.models import NSInstModel
-from lcm.pub.utils import restcall, fileutil
+from lcm.ns.tests import CREATE_NS_DICT
 
 
 class TestNsInstantiate(TestCase):
     def setUp(self):
         self.client = APIClient()
-        self.nsd_id = str(uuid.uuid4())
-        self.ns_package_id = str(uuid.uuid4())
-        self.cur_path = os.path.dirname(os.path.abspath(__file__))
-        self.create_ns_json = fileutil.read_json_file(self.cur_path + '/data/create_ns.json')
+        self.create_ns_dict = CREATE_NS_DICT
 
     def tearDown(self):
         NSInstModel.objects.all().delete()
@@ -39,15 +35,15 @@ class TestNsInstantiate(TestCase):
     @mock.patch.object(restcall, 'call_req')
     def test_create_ns(self, mock_call_req):
         nspackage_info = {
-            "csarId": self.ns_package_id,
+            "csarId": str(uuid.uuid4()),
             "packageInfo": {}
         }
         r1_query_nspackage_from_catalog = [0, json.JSONEncoder().encode(nspackage_info), '201']
         r2_create_ns_to_aai = [0, json.JSONEncoder().encode({}), '201']
         mock_call_req.side_effect = [r1_query_nspackage_from_catalog, r2_create_ns_to_aai]
-        self.create_ns_json["csarId"] = self.nsd_id
-        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_json, format='json')
-        self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
+        self.create_ns_dict["csarId"] = str(uuid.uuid4())
+        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_dict, format='json')
+        self.assertEqual(status.HTTP_201_CREATED, response.status_code)
 
     @mock.patch.object(CreateNSService, "do_biz")
     def test_create_ns_empty_data(self, mock_do_biz):
@@ -60,8 +56,8 @@ class TestNsInstantiate(TestCase):
     @mock.patch.object(CreateNSService, "do_biz")
     def test_create_ns_non_existing_nsd(self, mock_do_biz):
         mock_do_biz.side_effect = Exception("nsd not exists.")
-        self.create_ns_json["csarId"] = "1"
-        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_json, format='json')
+        self.create_ns_dict["csarId"] = "1"
+        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_dict, format='json')
         self.assertEqual(response.data["error"], "nsd not exists.")
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertIn("error", response.data)
@@ -69,20 +65,20 @@ class TestNsInstantiate(TestCase):
     @mock.patch.object(restcall, 'call_req')
     def test_create_ns_when_fail_to_get_nsd(self, mock_call_req):
         mock_call_req.return_value = [1, "Failed to get nsd.", '500']
-        self.create_ns_json["csarId"] = "1"
-        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_json, format='json')
+        self.create_ns_dict["csarId"] = "1"
+        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_dict, format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertIn("error", response.data)
 
     @mock.patch.object(restcall, 'call_req')
     def test_create_ns_when_ns_name_exist(self, mock_call_req):
         nspackage_info = json.JSONEncoder().encode({
-            "csarId": self.ns_package_id,
+            "csarId": str(uuid.uuid4()),
             "packageInfo": {}
         })
         mock_call_req.return_value = [0, nspackage_info, '200']
         NSInstModel(id="1", name="ns").save()
-        self.create_ns_json["csarId"] = "1"
-        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_json, format='json')
+        self.create_ns_dict["csarId"] = "1"
+        response = self.client.post("/api/nslcm/v1/ns", data=self.create_ns_dict, format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertIn("error", response.data)