Modify vfc-lcm variable name to hump

[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 3847764..e462e1c 100644 (file)
--- a/lcm/ns/tests/test_ns_create.py
+++ b/lcm/ns/tests/test_ns_create.py
@@ -12,47 +12,54 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import json
-
 import uuid
-import mock
 
+import mock
 from django.test import TestCase, Client
 from rest_framework import status
+from rest_framework.test import APIClient
 
 from lcm.ns.ns_create import CreateNSService
+from lcm.pub.database.models import NSInstModel
 from lcm.pub.exceptions import NSLCMException
-from lcm.pub.database.models import NSInstModel, NSDModel
 from lcm.pub.utils import restcall
 
 
 class TestNsInstantiate(TestCase):
     def setUp(self):
         self.client = Client()
+        self.client1 = APIClient()
         self.nsd_id = str(uuid.uuid4())
         self.ns_package_id = str(uuid.uuid4())
-        NSDModel(id=self.ns_package_id, nsd_id=self.nsd_id, name='name').save()
 
     def tearDown(self):
-        NSDModel.objects.all().delete()
         NSInstModel.objects.all().delete()
 
     @mock.patch.object(restcall, 'call_req')
     def test_create_ns(self, mock_call_req):
-        r1_create_ns_to_aai = [0, json.JSONEncoder().encode({}), '201']
-        mock_call_req.side_effect = [r1_create_ns_to_aai]
+        nspackage_info = {
+            "csarId": self.ns_package_id,
+            "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]
         data = {
-            'nsdid': self.nsd_id,
-            'nsname': 'ns',
-            'description': 'description'}
-        response = self.client.post("/api/nslcm/v1/ns", data=data)
+            "context": {
+                "globalCustomerId": "global-customer-id-test1",
+                "serviceType": "service-type-test1"
+            },
+            "csarId": self.nsd_id,
+            "nsName": "ns",
+            "description": "description"
+        }
+        response = self.client1.post("/api/nslcm/v1/ns", data=data, format='json')
         self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
 
     @mock.patch.object(CreateNSService, "do_biz")
     def test_create_ns_empty_data(self, mock_do_biz):
         mock_do_biz.side_effect = Exception("Exception in CreateNS.")
-
         data = {}
-
         response = self.client.post("/api/nslcm/v1/ns", data=data)
         self.assertEqual(response.data["error"], "Exception in CreateNS.")
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -62,12 +69,11 @@ class TestNsInstantiate(TestCase):
     def test_create_ns_non_existing_nsd(self, mock_do_biz):
         mock_do_biz.side_effect = NSLCMException("nsd not exists.")
         new_nsd_id = '1'
-
         data = {
             'nsdid': new_nsd_id,
             'nsname': 'ns',
-            'description': 'description'}
-
+            'description': 'description'
+        }
         response = self.client.post("/api/nslcm/v1/ns", data=data)
         self.assertEqual(response.data["error"], "nsd not exists.")
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)