Merge "fix nslcm middleware"

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

diff --git a/lcm/ns/tests/test_sol_ns_instantiate_api.py b/lcm/ns/tests/test_sol_ns_instantiate_api.py
index 37e9eda..2fdfb02 100644 (file)
--- a/lcm/ns/tests/test_sol_ns_instantiate_api.py
+++ b/lcm/ns/tests/test_sol_ns_instantiate_api.py
@@ -14,6 +14,7 @@
 
 import json
 import mock
+import uuid
 from mock import MagicMock
 from django.test import TestCase
 from rest_framework import status
@@ -290,7 +291,8 @@ class TestInstantiateNsApi(TestCase):
                 }]
             }
         })
-        NSInstModel(id="2", nspackage_id="7", nsd_id="2", status="active").save()
+        self.nsInstanceId = str(uuid.uuid4())
+        NSInstModel(id=self.nsInstanceId, nspackage_id="7", nsd_id="2", status="active").save()
 
     def tearDown(self):
         pass
@@ -305,20 +307,22 @@ class TestInstantiateNsApi(TestCase):
             [0, self.vnfms, '200'],
             [0, self.vnfm, '200']
         ]
-        response = self.client.post(self.url % '2', data=self.req_data, format='json')
+        response = self.client.post(self.url % self.nsInstanceId, data=self.req_data, format='json')
         self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
         self.assertIsNotNone(response['Location'])
+        response = self.client.get(response['Location'], format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
 
     @mock.patch.object(InstantNSService, 'do_biz')
     def test_ns_instantiate_normal(self, mock_do_biz):
         mock_do_biz.return_value = {'occ_id': "1"}
-        resp = self.client.post(self.url % '2', data=self.req_data, format='json')
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, resp.status_code)
+        response = self.client.post(self.url % self.nsInstanceId, data=self.req_data, format='json')
+        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
 
     @mock.patch.object(restcall, 'call_req')
     def test_ns_instantiate_when_fail_to_parse_nsd(self, mock_call_req):
         mock_call_req.return_value = [1, "Failed to parse nsd", '500']
-        resp = self.client.post(self.url % '2', data=self.req_data, format='json')
+        resp = self.client.post(self.url % self.nsInstanceId, data=self.req_data, format='json')
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     @mock.patch('lcm.ns.biz.ns_instantiate_flow.post_deal')
@@ -328,7 +332,8 @@ class TestInstantiateNsApi(TestCase):
     @mock.patch('lcm.pub.msapi.extsys.select_vnfm', MagicMock(return_value=vnfminfo))
     def test_ns_instantiate_with_pnf(self, mock_updata_job, mock_call_req, mock_post_deal):
         config.WORKFLOW_OPTION = "grapflow"
-        NSInstModel(id="1", name="test_ns", nspackage_id="1", status="created").save()
+        nsInstanceId = str(uuid.uuid4())
+        NSInstModel(id=nsInstanceId, name="test_ns", nspackage_id="1", status="created").save()
         ret = [0, json.JSONEncoder().encode({'jobId': "1", "responseDescriptor": {"progress": 100}}), '200']
         mock_call_req.side_effect = [ret for i in range(1, 20)]
         data = {
@@ -353,16 +358,137 @@ class TestInstantiateNsApi(TestCase):
                 "pnfProfileId": "du"
             }]
         }
-        response = self.client.post(self.url % '1', data=data, format='json')
+        response = self.client.post(self.url % nsInstanceId, data=data, format='json')
         self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED)
         self.assertIsNotNone(response['Location'])
+        response = self.client.get(response['Location'], format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
 
     def test_method_not_allowed(self):
-        response = self.client.put(self.url % '1', data=self.req_data, format='json')
+        response = self.client.put(self.url % self.nsInstanceId, data=self.req_data, format='json')
         self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
-        response = self.client.patch(self.url % '1', data=self.req_data, format='json')
+        response = self.client.patch(self.url % self.nsInstanceId, data=self.req_data, format='json')
         self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
-        response = self.client.delete(self.url % '1', data=self.req_data, format='json')
+        response = self.client.delete(self.url % self.nsInstanceId, data=self.req_data, format='json')
         self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
-        response = self.client.get(self.url % '1', data=self.req_data, format='json')
+        response = self.client.get(self.url % self.nsInstanceId, data=self.req_data, format='json')
         self.failUnlessEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code)
+
+    @mock.patch.object(restcall, 'call_req')
+    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd_model))
+    @mock.patch.object(BuildInWorkflowThread, 'run')
+    def test_ns_instantiate_vcpe(self, mock_run, mock_call_req):
+        config.WORKFLOW_OPTION = "buildin"
+        vcpe_nsd_model = json.dumps({
+            "model": json.dumps({
+                "vnfs": [{
+                    "vnf_id": "b1bb0ce7-2222-4fa7-95ed-4840d70a1101",
+                    "properties": {
+                        "id": "vnfd0",
+                        "nf_type": "test"
+                    },
+                    "dependencies": [{
+                        "vl_id": "5"
+                    }]
+                },
+                    {
+                        "vnf_id": "0408f076-e6c0-4c82-9940-272fddbb82de",
+                        "properties": {
+                            "id": "vnfd1",
+                            "nf_type": "test"
+                        },
+                        "dependencies": [{
+                            "vl_id": "5"
+                        }]
+                },
+                    {
+                        "vnf_id": "b1bb0ce7-2222-4fa7-95ed-4840d70a1100",
+                        "properties": {
+                            "id": "vnfd2",
+                            "nf_type": "test"
+                        },
+                        "dependencies": [{
+                            "vl_id": "5"
+                        }]
+                },
+                    {
+                        "vnf_id": "b1bb0ce7-2222-4fa7-95ed-4840d70a1102",
+                        "properties": {
+                            "id": "vnfd3",
+                            "nf_type": "test"
+                        },
+                        "dependencies": [{
+                            "vl_id": "5"
+                        }]
+                },
+                    {
+                        "vnf_id": "3fca3543-07f5-492f-812c-ed462e4f94f4",
+                        "properties": {
+                            "id": "vnfd4",
+                            "nf_type": "test"
+                        },
+                        "dependencies": [{
+                            "vl_id": "5"
+                        }]
+                },
+                ],
+                "vls": [{
+                    "vl_id": "5",
+                    "properties": {}
+                }]
+            })
+        })
+        mock_call_req.side_effect = [
+            [0, vcpe_nsd_model, '200'],
+            [0, self.vnfms, '200'],
+            [0, self.vnfm, '200']
+        ]
+        req_data = {
+            "nsFlavourId": 'default',
+            "aditionalParamsForNs": {
+                "nfvo": "vfc",
+                "nf_naming": "true",
+                "multi_stage_design": "false",
+                "availability_zone_max_count": "1",
+                "xyz": "123",
+                "nsd0_providing_service_invariant_uuid": "12204a12-7da2-4ddf-8c2f-992a1a1acebf",
+                "nsd0_providing_service_uuid": "5791dbeb-19d4-43e8-bf44-5b327ccf6bca"
+            },
+            "additionalParamsForVnf": [
+                {
+                    "vnfProfileId": "b1bb0ce7-2222-4fa7-95ed-4840d70a1101",
+                    "additionalParams": {
+                        "vimId": "CloudOwner_regionOne"
+                    }
+                },
+                {
+                    "vnfProfileId": "0408f076-e6c0-4c82-9940-272fddbb82de",
+                    "additionalParams": {
+                        "vimId": "CloudOwner_regionOne"
+                    }
+                },
+                {
+                    "vnfProfileId": "b1bb0ce7-2222-4fa7-95ed-4840d70a1100",
+                    "additionalParams": {
+                        "vimId": "CloudOwner_regionOne"
+                    }
+                },
+                {
+                    "vnfProfileId": "b1bb0ce7-2222-4fa7-95ed-4840d70a1102",
+                    "additionalParams": {
+                        "vimId": "CloudOwner_regionOne"
+                    }
+                },
+                {
+                    "vnfProfileId": "3fca3543-07f5-492f-812c-ed462e4f94f4",
+                    "additionalParams": {
+                        "vimId": "CloudOwner_regionOne"
+                    }
+                }
+            ]
+        }
+        response = self.client.post(self.url % self.nsInstanceId, data=req_data, format='json')
+        self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
+        self.assertIsNotNone(response['Location'])
+        response = self.client.get(response['Location'], format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)