Refactor codes for inst vnf ut

Change-Id: I1d6e421bbffff0819e59bafc4a4961a151eb793c
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/lcm/nf/tests/const.py b/lcm/lcm/nf/tests/const.py
index 38d251e..3eec3e2 100644 (file)
--- a/lcm/lcm/nf/tests/const.py
+++ b/lcm/lcm/nf/tests/const.py
@@ -13,6 +13,30 @@
 # limitations under the License.
 import json
 
+instantiate_grant_result = {
+    "vimConnections": [
+        {
+            "vimid": 'vim_1',
+            "accessInfo":
+            {
+                "tenant": 'chinamobile'
+            }
+        },
+    ],
+    "vnfId": "413aa1fe-b4d1-11e8-8268-dff5aab95c63",
+    "vimAssets":
+    {
+        "computeResourceFlavours": [
+            {
+                "resourceProviderId": "vgw",
+                "vimFlavourId": "yui",
+                "vimConnectionId": ""
+            },
+        ]
+    }
+}
+
+
 inst_req_data = {
     "flavourId": "flavour_1",
     "instantiationLevelId": "instantiationLevel_1",

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index ad5f229..76fd83b 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -14,57 +14,52 @@
 \r
 import json\r
 import uuid\r
-\r
 import mock\r
+\r
 from django.test import TestCase\r
 from rest_framework import status\r
 from rest_framework.test import APIClient\r
 \r
-from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
-from .const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \\r
-    c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, \\r
-    c9_data_create_vm, c10_data_get_vm, inst_req_data, vnfpackage_info\r
-from lcm.pub.database.models import NfInstModel, JobStatusModel, SubscriptionModel\r
+from .const import c1_data_get_tenant_id\r
+from .const import c4_data_create_network\r
+from .const import c2_data_create_volume\r
+from .const import c5_data_create_subnet\r
+from .const import c3_data_get_volume\r
+from .const import c6_data_create_port\r
+from .const import c7_data_create_flavor\r
+from .const import c8_data_list_image\r
+from .const import c9_data_create_vm\r
+from .const import c10_data_get_vm\r
+from .const import inst_req_data\r
+from .const import vnfpackage_info\r
+from .const import instantiate_grant_result\r
+\r
+from lcm.pub.database.models import NfInstModel\r
+from lcm.pub.database.models import JobStatusModel\r
+from lcm.pub.database.models import SubscriptionModel\r
 from lcm.pub.utils import restcall\r
 from lcm.pub.utils.jobutil import JobUtil\r
 from lcm.pub.utils.timeutil import now_time\r
 from lcm.pub.utils.notificationsutil import NotificationsUtil\r
 from lcm.pub.vimapi import api\r
 \r
+from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
+\r
 \r
 class TestNFInstantiate(TestCase):\r
     def setUp(self):\r
         self.client = APIClient()\r
-        self.grant_result = {\r
-            "vimConnections": [\r
-                {\r
-                    "vimid": 'vim_1',\r
-                    "accessInfo":\r
-                    {\r
-                        "tenant": 'chinamobile'\r
-                    }\r
-                },\r
-            ],\r
-            "vnfId": "413aa1fe-b4d1-11e8-8268-dff5aab95c63",\r
-            "vimAssets":\r
-            {\r
-                "computeResourceFlavours": [\r
-                    {\r
-                        "resourceProviderId": "vgw",\r
-                        "vimFlavourId": "yui",\r
-                        "vimConnectionId": ""\r
-                    },\r
-                ]\r
-            }\r
-        }\r
+        self.grant_result = instantiate_grant_result\r
 \r
     def tearDown(self):\r
         NfInstModel.objects.all().delete()\r
 \r
     def assert_job_result(self, job_id, job_progress, job_detail):\r
-        jobs = JobStatusModel.objects.filter(jobid=job_id,\r
-                                             progress=job_progress,\r
-                                             descp=job_detail)\r
+        jobs = JobStatusModel.objects.filter(\r
+            jobid=job_id,\r
+            progress=job_progress,\r
+            descp=job_detail\r
+        )\r
         self.assertEqual(1, len(jobs))\r
 \r
     @mock.patch.object(InstantiateVnf, 'run')\r
@@ -80,7 +75,10 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,\r
             format='json'\r
         )\r
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)\r
+        self.failUnlessEqual(\r
+            status.HTTP_202_ACCEPTED,\r
+            response.status_code\r
+        )\r
 \r
     @mock.patch.object(InstantiateVnf, 'run')\r
     def test_instantiate_vnf_notfound(self, mock_run):\r
@@ -90,7 +88,11 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,\r
             format='json'\r
         )\r
-        self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code, response.content)\r
+        self.failUnlessEqual(\r
+            status.HTTP_404_NOT_FOUND,\r
+            response.status_code,\r
+            response.content\r
+        )\r
 \r
     @mock.patch.object(InstantiateVnf, 'run')\r
     def test_instantiate_vnf_conflict(self, mock_run):\r
@@ -105,128 +107,216 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,\r
             format='json'\r
         )\r
-        self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code, response.content)\r
+        self.failUnlessEqual(\r
+            status.HTTP_409_CONFLICT,\r
+            response.status_code,\r
+            response.content\r
+        )\r
 \r
     def test_instantiate_vnf_when_inst_id_not_exist(self):\r
         self.nf_inst_id = str(uuid.uuid4())\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
-        jobs = JobStatusModel.objects.filter(jobid=self.job_id,\r
-                                             progress=0,\r
-                                             descp='INST_VNF_READY')\r
+        jobs = JobStatusModel.objects.filter(\r
+            jobid=self.job_id,\r
+            progress=0,\r
+            descp='INST_VNF_READY'\r
+        )\r
         self.assertEqual(1, len(jobs))\r
         data = inst_req_data\r
-        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, 'VNF nf_inst_id is not exist.')\r
+        InstantiateVnf(\r
+            data,\r
+            nf_inst_id=self.nf_inst_id,\r
+            job_id=self.job_id\r
+        ).run()\r
+        self.assert_job_result(\r
+            self.job_id,\r
+            255,\r
+            'VNF nf_inst_id is not exist.'\r
+        )\r
 \r
     def test_instantiate_vnf_when_already_instantiated(self):\r
-        NfInstModel.objects.create(nfinstid='1111',\r
-                                   nf_name='vFW_01',\r
-                                   package_id='222',\r
-                                   version='',\r
-                                   vendor='',\r
-                                   netype='',\r
-                                   vnfd_model='',\r
-                                   status='INSTANTIATED',\r
-                                   nf_desc='vFW in Nanjing TIC Edge',\r
-                                   vnfdid='111',\r
-                                   create_time=now_time())\r
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='vFW_01',\r
+            package_id='222',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='INSTANTIATED',\r
+            nf_desc='vFW in Nanjing TIC Edge',\r
+            vnfdid='111',\r
+            create_time=now_time()\r
+        )\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
-        jobs = JobStatusModel.objects.filter(jobid=self.job_id,\r
-                                             progress=0,\r
-                                             descp='INST_VNF_READY')\r
+        jobs = JobStatusModel.objects.filter(\r
+            jobid=self.job_id,\r
+            progress=0,\r
+            descp='INST_VNF_READY'\r
+        )\r
         self.assertEqual(1, len(jobs))\r
         data = inst_req_data\r
-        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, 'VNF instantiationState is not NOT_INSTANTIATED.')\r
+        InstantiateVnf(\r
+            data,\r
+            nf_inst_id=self.nf_inst_id,\r
+            job_id=self.job_id\r
+        ).run()\r
+        self.assert_job_result(\r
+            self.job_id,\r
+            255,\r
+            'VNF instantiationState is not NOT_INSTANTIATED.'\r
+        )\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     def test_instantiate_vnf_when_get_packageinfo_by_csarid_failed(self, mock_call_req):\r
-        NfInstModel.objects.create(nfinstid='1111',\r
-                                   nf_name='vFW_01',\r
-                                   package_id='222',\r
-                                   version='',\r
-                                   vendor='',\r
-                                   netype='',\r
-                                   vnfd_model='',\r
-                                   status='NOT_INSTANTIATED',\r
-                                   nf_desc='vFW in Nanjing TIC Edge',\r
-                                   vnfdid='111',\r
-                                   create_time=now_time())\r
-        r1_get_vnfpackage_by_vnfdid = [1, json.JSONEncoder().encode(vnfpackage_info), '200']\r
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='vFW_01',\r
+            package_id='222',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='NOT_INSTANTIATED',\r
+            nf_desc='vFW in Nanjing TIC Edge',\r
+            vnfdid='111',\r
+            create_time=now_time()\r
+        )\r
+        r1_get_vnfpackage_by_vnfdid = [\r
+            1,\r
+            json.JSONEncoder().encode(vnfpackage_info),\r
+            '200'\r
+        ]\r
         mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
-        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, 'Failed to query vnf CSAR(111) from catalog.')\r
+        InstantiateVnf(\r
+            data,\r
+            nf_inst_id=self.nf_inst_id,\r
+            job_id=self.job_id\r
+        ).run()\r
+        self.assert_job_result(\r
+            self.job_id,\r
+            255,\r
+            'Failed to query vnf CSAR(111) from catalog.'\r
+        )\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req):\r
-        NfInstModel.objects.create(nfinstid='1111',\r
-                                   nf_name='vFW_01',\r
-                                   package_id='222',\r
-                                   version='',\r
-                                   vendor='',\r
-                                   netype='',\r
-                                   vnfd_model='',\r
-                                   status='NOT_INSTANTIATED',\r
-                                   nf_desc='vFW in Nanjing TIC Edge',\r
-                                   vnfdid='111',\r
-                                   create_time=now_time())\r
-        r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']\r
-        r2_apply_grant_result = [1, json.JSONEncoder().encode(self.grant_result), '200']\r
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result]\r
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='vFW_01',\r
+            package_id='222',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='NOT_INSTANTIATED',\r
+            nf_desc='vFW in Nanjing TIC Edge',\r
+            vnfdid='111',\r
+            create_time=now_time()\r
+        )\r
+        r1_get_vnfpackage_by_vnfdid = [\r
+            0,\r
+            json.JSONEncoder().encode(vnfpackage_info),\r
+            '200'\r
+        ]\r
+        r2_apply_grant_result = [\r
+            1,\r
+            json.JSONEncoder().encode(self.grant_result),\r
+            '200'\r
+        ]\r
+        mock_call_req.side_effect = [\r
+            r1_get_vnfpackage_by_vnfdid,\r
+            r2_apply_grant_result\r
+        ]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
-        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, 'Nf instancing apply grant exception')\r
+        InstantiateVnf(\r
+            data,\r
+            nf_inst_id=self.nf_inst_id,\r
+            job_id=self.job_id\r
+        ).run()\r
+        self.assert_job_result(\r
+            self.job_id,\r
+            255,\r
+            'Nf instancing apply grant exception'\r
+        )\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     @mock.patch.object(api, 'call')\r
     def test_instantiate_vnf_when_unexpected_exception(self, mock_call, mock_call_req):\r
-        NfInstModel.objects.create(nfinstid='1111',\r
-                                   nf_name='vFW_01',\r
-                                   package_id='222',\r
-                                   version='',\r
-                                   vendor='',\r
-                                   netype='',\r
-                                   vnfd_model='',\r
-                                   status='NOT_INSTANTIATED',\r
-                                   nf_desc='vFW in Nanjing TIC Edge',\r
-                                   vnfdid='111',\r
-                                   create_time=now_time())\r
-        r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']\r
-        r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']\r
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result]\r
-        mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume]\r
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='vFW_01',\r
+            package_id='222',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='NOT_INSTANTIATED',\r
+            nf_desc='vFW in Nanjing TIC Edge',\r
+            vnfdid='111',\r
+            create_time=now_time()\r
+        )\r
+        r1_get_vnfpackage_by_vnfdid = [\r
+            0,\r
+            json.JSONEncoder().encode(vnfpackage_info),\r
+            '200'\r
+        ]\r
+        r2_apply_grant_result = [\r
+            0,\r
+            json.JSONEncoder().encode(self.grant_result),\r
+            '200'\r
+        ]\r
+        mock_call_req.side_effect = [\r
+            r1_get_vnfpackage_by_vnfdid,\r
+            r2_apply_grant_result\r
+        ]\r
+        mock_call.side_effect = [\r
+            c1_data_get_tenant_id,\r
+            c2_data_create_volume,\r
+            c3_data_get_volume\r
+        ]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
-        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, 'unexpected exception')\r
+        InstantiateVnf(\r
+            data,\r
+            nf_inst_id=self.nf_inst_id,\r
+            job_id=self.job_id\r
+        ).run()\r
+        self.assert_job_result(\r
+            self.job_id,\r
+            255,\r
+            'unexpected exception'\r
+        )\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     @mock.patch.object(api, 'call')\r
     @mock.patch.object(NotificationsUtil, 'post_notification')\r
     def test_instantiate_vnf_success(self, mock_post_notification, mock_call, mock_call_req):\r
-        NfInstModel.objects.create(nfinstid='1111',\r
-                                   nf_name='vFW_01',\r
-                                   package_id='222',\r
-                                   version='',\r
-                                   vendor='',\r
-                                   netype='',\r
-                                   vnfd_model='',\r
-                                   status='NOT_INSTANTIATED',\r
-                                   nf_desc='vFW in Nanjing TIC Edge',\r
-                                   vnfdid='111',\r
-                                   create_time=now_time())\r
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='vFW_01',\r
+            package_id='222',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='NOT_INSTANTIATED',\r
+            nf_desc='vFW in Nanjing TIC Edge',\r
+            vnfdid='111',\r
+            create_time=now_time()\r
+        )\r
         SubscriptionModel.objects.create(\r
             subscription_id=str(uuid.uuid4()),\r
             callback_uri='api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification',\r
@@ -251,22 +341,51 @@ class TestNFInstantiate(TestCase):
                 'vnfInstanceNames': [],\r
             })\r
         )\r
-        r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']\r
-        r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']\r
-        r3_all_aai_result = [1, json.JSONEncoder().encode(''), '404']\r
-        r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result, r4_lcm_notify_result]\r
-        mock_call.side_effect = [c1_data_get_tenant_id,\r
-                                 c2_data_create_volume, c3_data_get_volume,\r
-                                 c4_data_create_network,\r
-                                 c5_data_create_subnet,\r
-                                 c6_data_create_port,\r
-                                 c7_data_create_flavor,\r
-                                 c8_data_list_image, c9_data_create_vm, c10_data_get_vm]\r
+        r1_get_vnfpackage_by_vnfdid = [\r
+            0,\r
+            json.JSONEncoder().encode(vnfpackage_info),\r
+            '200'\r
+        ]\r
+        r2_apply_grant_result = [\r
+            0,\r
+            json.JSONEncoder().encode(self.grant_result),\r
+            '200'\r
+        ]\r
+        r3_all_aai_result = [\r
+            1,\r
+            json.JSONEncoder().encode(''),\r
+            '404'\r
+        ]\r
+        r4_lcm_notify_result = [\r
+            0,\r
+            json.JSONEncoder().encode(''),\r
+            '200'\r
+        ]\r
+        mock_call_req.side_effect = [\r
+            r1_get_vnfpackage_by_vnfdid,\r
+            r2_apply_grant_result,\r
+            r3_all_aai_result,\r
+            r4_lcm_notify_result\r
+        ]\r
+        mock_call.side_effect = [\r
+            c1_data_get_tenant_id,\r
+            c2_data_create_volume,\r
+            c3_data_get_volume,\r
+            c4_data_create_network,\r
+            c5_data_create_subnet,\r
+            c6_data_create_port,\r
+            c7_data_create_flavor,\r
+            c8_data_list_image,\r
+            c9_data_create_vm,\r
+            c10_data_get_vm\r
+        ]\r
         mock_post_notification.side_effect = None\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
         JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
-        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        # self.assert_job_result(self.job_id, 100, 'Instantiate Vnf success.')\r
+        InstantiateVnf(\r
+            data,\r
+            nf_inst_id=self.nf_inst_id,\r
+            job_id=self.job_id\r
+        ).run()\r