Refactor codes for term vnf ut

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

diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py
index a64a7f3..4b235c1 100644 (file)
--- a/lcm/lcm/nf/tests/test_terminate_vnf.py
+++ b/lcm/lcm/nf/tests/test_terminate_vnf.py
@@ -12,73 +12,91 @@
 # See the License for the specific language governing permissions and\r
 # limitations under the License.\r
 \r
-\r
 import json\r
 import uuid\r
-\r
 import mock\r
+\r
 from django.test import TestCase, Client\r
 from rest_framework import status\r
 \r
-from lcm.nf.biz.terminate_vnf import TerminateVnf\r
-from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \\r
-    PortInstModel, FlavourInstModel, StorageInstModel, SubscriptionModel\r
+from lcm.pub.database.models import NfInstModel\r
+from lcm.pub.database.models import JobStatusModel\r
+from lcm.pub.database.models import VmInstModel\r
+from lcm.pub.database.models import NetworkInstModel\r
+from lcm.pub.database.models import SubNetworkInstModel\r
+from lcm.pub.database.models import PortInstModel\r
+from lcm.pub.database.models import FlavourInstModel\r
+from lcm.pub.database.models import StorageInstModel\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
+from lcm.nf.biz.terminate_vnf import TerminateVnf\r
 \r
 \r
 class TestNFTerminate(TestCase):\r
     def setUp(self):\r
         self.client = Client()\r
-        StorageInstModel.objects.create(storageid="1",\r
-                                        vimid="1",\r
-                                        resourceid="11",\r
-                                        insttype=0,\r
-                                        instid="1111",\r
-                                        is_predefined=1)\r
-        NetworkInstModel.objects.create(networkid='1',\r
-                                        vimid='1',\r
-                                        resourceid='1',\r
-                                        name='pnet_network',\r
-                                        is_predefined=1,\r
-                                        tenant='admin',\r
-                                        insttype=0,\r
-                                        instid='1111')\r
-        SubNetworkInstModel.objects.create(subnetworkid='1',\r
-                                           vimid='1',\r
-                                           resourceid='1',\r
-                                           networkid='1',\r
-                                           is_predefined=1,\r
-                                           name='sub_pnet',\r
-                                           tenant='admin',\r
-                                           insttype=0,\r
-                                           instid='1111')\r
-        PortInstModel.objects.create(portid='1',\r
-                                     networkid='1',\r
-                                     subnetworkid='1',\r
-                                     vimid='1',\r
-                                     resourceid='1',\r
-                                     is_predefined=1,\r
-                                     name='aaa_pnet_cp',\r
-                                     tenant='admin',\r
-                                     insttype=0,\r
-                                     instid='1111')\r
-        FlavourInstModel.objects.create(flavourid="1",\r
-                                        vimid="1",\r
-                                        resourceid="11",\r
-                                        instid="1111",\r
-                                        is_predefined=1)\r
-        VmInstModel.objects.create(vmid="1",\r
-                                   vimid="1",\r
-                                   resourceid="11",\r
-                                   insttype=0,\r
-                                   instid="1111",\r
-                                   vmname="test_01",\r
-                                   is_predefined=1,\r
-                                   operationalstate=1)\r
+        StorageInstModel.objects.create(\r
+            storageid="1",\r
+            vimid="1",\r
+            resourceid="11",\r
+            insttype=0,\r
+            instid="1111",\r
+            is_predefined=1\r
+        )\r
+        NetworkInstModel.objects.create(\r
+            networkid='1',\r
+            vimid='1',\r
+            resourceid='1',\r
+            name='pnet_network',\r
+            is_predefined=1,\r
+            tenant='admin',\r
+            insttype=0,\r
+            instid='1111'\r
+        )\r
+        SubNetworkInstModel.objects.create(\r
+            subnetworkid='1',\r
+            vimid='1',\r
+            resourceid='1',\r
+            networkid='1',\r
+            is_predefined=1,\r
+            name='sub_pnet',\r
+            tenant='admin',\r
+            insttype=0,\r
+            instid='1111'\r
+        )\r
+        PortInstModel.objects.create(\r
+            portid='1',\r
+            networkid='1',\r
+            subnetworkid='1',\r
+            vimid='1',\r
+            resourceid='1',\r
+            is_predefined=1,\r
+            name='aaa_pnet_cp',\r
+            tenant='admin',\r
+            insttype=0,\r
+            instid='1111'\r
+        )\r
+        FlavourInstModel.objects.create(\r
+            flavourid="1",\r
+            vimid="1",\r
+            resourceid="11",\r
+            instid="1111",\r
+            is_predefined=1\r
+        )\r
+        VmInstModel.objects.create(\r
+            vmid="1",\r
+            vimid="1",\r
+            resourceid="11",\r
+            insttype=0,\r
+            instid="1111",\r
+            vmname="test_01",\r
+            is_predefined=1,\r
+            operationalstate=1\r
+        )\r
 \r
     def tearDown(self):\r
         VmInstModel.objects.all().delete()\r
@@ -88,9 +106,11 @@ class TestNFTerminate(TestCase):
         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(TerminateVnf, 'run')\r
@@ -99,19 +119,29 @@ class TestNFTerminate(TestCase):
             "terminationType": "GRACEFUL",\r
             "gracefulTerminationTimeout": 120\r
         }\r
-        NfInstModel(nfinstid='12',\r
-                    nf_name='VNF1',\r
-                    nf_desc="VNF DESC",\r
-                    vnfdid="1",\r
-                    netype="XGW",\r
-                    vendor="ZTE",\r
-                    vnfSoftwareVersion="V1",\r
-                    version="V1",\r
-                    package_id="2",\r
-                    status='INSTANTIATED').save()\r
+        NfInstModel(\r
+            nfinstid='12',\r
+            nf_name='VNF1',\r
+            nf_desc="VNF DESC",\r
+            vnfdid="1",\r
+            netype="XGW",\r
+            vendor="ZTE",\r
+            vnfSoftwareVersion="V1",\r
+            version="V1",\r
+            package_id="2",\r
+            status='INSTANTIATED'\r
+        ).save()\r
         mock_run.re.return_value = None\r
-        response = self.client.post("/api/vnflcm/v1/vnf_instances/12/terminate", data=req_data, format='json')\r
-        self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content)\r
+        response = self.client.post(\r
+            "/api/vnflcm/v1/vnf_instances/12/terminate",\r
+            data=req_data,\r
+            format='json'\r
+        )\r
+        self.failUnlessEqual(\r
+            status.HTTP_202_ACCEPTED,\r
+            response.status_code,\r
+            response.content\r
+        )\r
 \r
     @mock.patch.object(TerminateVnf, 'run')\r
     def test_terminate_vnf_not_found(self, mock_run):\r
@@ -120,8 +150,16 @@ class TestNFTerminate(TestCase):
             "gracefulTerminationTimeout": 120\r
         }\r
         mock_run.re.return_value = None\r
-        response = self.client.post("/api/vnflcm/v1/vnf_instances/567/terminate", data=req_data, format='json')\r
-        self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code, response.content)\r
+        response = self.client.post(\r
+            "/api/vnflcm/v1/vnf_instances/567/terminate",\r
+            data=req_data,\r
+            format='json'\r
+        )\r
+        self.failUnlessEqual(\r
+            status.HTTP_404_NOT_FOUND,\r
+            response.status_code,\r
+            response.content\r
+        )\r
 \r
     @mock.patch.object(TerminateVnf, 'run')\r
     def test_terminate_vnf_conflict(self, mock_run):\r
@@ -129,19 +167,29 @@ class TestNFTerminate(TestCase):
             "terminationType": "GRACEFUL",\r
             "gracefulTerminationTimeout": 120\r
         }\r
-        NfInstModel(nfinstid='123',\r
-                    nf_name='VNF1',\r
-                    nf_desc="VNF DESC",\r
-                    vnfdid="1",\r
-                    netype="XGW",\r
-                    vendor="ZTE",\r
-                    vnfSoftwareVersion="V1",\r
-                    version="V1",\r
-                    package_id="2",\r
-                    status='NOT_INSTANTIATED').save()\r
+        NfInstModel(\r
+            nfinstid='123',\r
+            nf_name='VNF1',\r
+            nf_desc="VNF DESC",\r
+            vnfdid="1",\r
+            netype="XGW",\r
+            vendor="ZTE",\r
+            vnfSoftwareVersion="V1",\r
+            version="V1",\r
+            package_id="2",\r
+            status='NOT_INSTANTIATED'\r
+        ).save()\r
         mock_run.re.return_value = None\r
-        response = self.client.post("/api/vnflcm/v1/vnf_instances/123/terminate", data=req_data, format='json')\r
-        self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code, response.content)\r
+        response = self.client.post(\r
+            "/api/vnflcm/v1/vnf_instances/123/terminate",\r
+            data=req_data,\r
+            format='json'\r
+        )\r
+        self.failUnlessEqual(\r
+            status.HTTP_409_CONFLICT,\r
+            response.status_code,\r
+            response.content\r
+        )\r
 \r
     def test_terminate_vnf_when_inst_id_not_exist(self):\r
         data = {\r
@@ -158,21 +206,23 @@ class TestNFTerminate(TestCase):
     @mock.patch.object(api, 'call')\r
     @mock.patch.object(NotificationsUtil, 'post_notification')\r
     def test_terminate_vnf_success(self, mock_post_notification, mock_call, mock_call_req):\r
-        NfInstModel.objects.create(nfinstid='1111',\r
-                                   nf_name='2222',\r
-                                   vnfminstid='1',\r
-                                   package_id='todo',\r
-                                   version='',\r
-                                   vendor='',\r
-                                   netype='',\r
-                                   vnfd_model='',\r
-                                   status='VNF_INSTANTIATED',\r
-                                   nf_desc='',\r
-                                   vnfdid='',\r
-                                   vnfSoftwareVersion='',\r
-                                   vnfConfigurableProperties='todo',\r
-                                   localizationLanguage='EN_US',\r
-                                   create_time=now_time())\r
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='2222',\r
+            vnfminstid='1',\r
+            package_id='todo',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='VNF_INSTANTIATED',\r
+            nf_desc='',\r
+            vnfdid='',\r
+            vnfSoftwareVersion='',\r
+            vnfConfigurableProperties='todo',\r
+            localizationLanguage='EN_US',\r
+            create_time=now_time()\r
+        )\r
 \r
         SubscriptionModel.objects.create(\r
             subscription_id=str(uuid.uuid4()),\r
@@ -213,7 +263,11 @@ class TestNFTerminate(TestCase):
             }), '200']\r
         t2_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
         t3_delete_flavor = [0, json.JSONEncoder().encode({"vim_id": "vimid_1"}), '200']\r
-        mock_call_req.side_effect = [t1_apply_grant_result, t2_lcm_notify_result, t3_delete_flavor]\r
+        mock_call_req.side_effect = [\r
+            t1_apply_grant_result,\r
+            t2_lcm_notify_result,\r
+            t3_delete_flavor\r
+        ]\r
         mock_call.return_value = None\r
         mock_post_notification.return_value = None\r
         data = {\r