Add vfc-vnflcm v2 tests

Change-Id: Ia691ea64a4a3154f74fe078f67c6955f06cebc26
Issue-ID: VFC-780
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/lcm/nf/vnf_create/create_vnf_identifier.py b/lcm/lcm/nf/vnf_create/create_vnf_identifier.py
index 62571a1..d85a228 100644 (file)
--- a/lcm/lcm/nf/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnf_create/create_vnf_identifier.py
@@ -73,7 +73,7 @@ class CreateVnf:
             'vnfSoftwareVersion': vnf_inst.vnfSoftwareVersion,
             'vnfdVersion': vnf_inst.version,
             'vnfPkgId': vnf_inst.package_id,
-            'vnfConfigurableProperties': []
+            'vnfConfigurableProperties': {}
         }
         return resp
 

diff --git a/lcm/lcm/urls.py b/lcm/lcm/urls.py
index fdff688..6226e52 100644 (file)
--- a/lcm/lcm/urls.py
+++ b/lcm/lcm/urls.py
@@ -18,6 +18,7 @@ from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG
 urlpatterns = [
     url(r'^', include('lcm.samples.urls')),
     url(r'^', include('lcm.nf.urls')),
+    url(r'^', include('lcm.v2.urls')),
     url(r'^', include('lcm.jobs.urls')),
     url(r'^', include('lcm.swagger.urls')),
 ]

diff --git a/lcm/lcm/v2/tests/__init__.py b/lcm/lcm/v2/tests/__init__.py
new file mode 100644 (file)
index 0000000..c7b6818
--- /dev/null
+++ b/lcm/lcm/v2/tests/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.

diff --git a/lcm/lcm/v2/tests/test_vnf_create.py b/lcm/lcm/v2/tests/test_vnf_create.py
new file mode 100644 (file)
index 0000000..c1d4d36
--- /dev/null
+++ b/lcm/lcm/v2/tests/test_vnf_create.py
@@ -0,0 +1,83 @@
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 json
+
+import mock
+from django.test import TestCase
+from rest_framework import status
+from rest_framework.test import APIClient
+
+from lcm.nf.const import vnfpackage_info
+from lcm.pub.database.models import NfInstModel, JobStatusModel
+from lcm.pub.utils import restcall
+from lcm.pub.utils.timeutil import now_time
+
+
+class TestNFInstantiate(TestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.grant_result = {
+            "vim": {
+                "vimid": 'vimid_1',
+                "accessinfo": {
+                    "tenant": 'tenantname_1'
+                }
+            }
+        }
+
+    def tearDown(self):
+        pass
+
+    def assert_job_result(self, job_id, job_progress, job_detail):
+        jobs = JobStatusModel.objects.filter(jobid=job_id,
+                                             progress=job_progress,
+                                             descp=job_detail)
+        self.assertEqual(1, len(jobs))
+
+    def test_create_vnf_identifier_when_vnf_is_exist(self):
+        NfInstModel.objects.create(nfinstid='1111',
+                                   nf_name='vFW_01',
+                                   package_id='222',
+                                   version='',
+                                   vendor='',
+                                   netype='',
+                                   vnfd_model='',
+                                   status='NOT_INSTANTIATED',
+                                   nf_desc='vFW in Nanjing TIC Edge',
+                                   vnfdid='111',
+                                   create_time=now_time())
+        data = {
+            "vnfdId": "111",
+            "vnfInstanceName": "vFW_01",
+            "vnfInstanceDescription": "vFW in Nanjing TIC Edge"
+        }
+        response = self.client.post("/api/vnflcm/v2/vnf_instances", data=data, format='json')
+        self.failUnlessEqual(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)
+        context = json.loads(response.content)
+        self.assertEqual({'error': 'VNF is already exist.'}, context)
+
+    @mock.patch.object(restcall, 'call_req')
+    def test_create_vnf_identifier(self, mock_call_req):
+        r2_get_vnfpackage_from_catalog = [0, json.JSONEncoder().encode(vnfpackage_info), '200']
+        mock_call_req.side_effect = [r2_get_vnfpackage_from_catalog]
+        data = {
+            "vnfdId": "111",
+            "vnfInstanceName": "vFW_01",
+            "vnfInstanceDescription": "vFW in Nanjing TIC Edge"
+        }
+        response = self.client.post("/api/vnflcm/v2/vnf_instances", data=data, format='json')
+        self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
+        context = json.loads(response.content)
+        self.assertTrue(NfInstModel.objects.filter(nfinstid=context['id']).exists())