Modify code and test case of lcm notify

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / vnfs / tests / test_vnf_create.py

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index 4096ee7..f9b5e30 100644 (file)
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -18,14 +18,15 @@ import mock
 from django.test import TestCase, Client
 from rest_framework import status
 
-from lcm.nf.vnfs.const import vnfd_rawdata
+from lcm.nf.vnfs.const import vnfd_rawdata, c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \
+    c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, c9_data_create_vm, \
+    c10_data_get_vm
 from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
 from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, \
     SubNetworkInstModel, PortInstModel
 from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time
-from lcm.pub.vimapi import adaptor
 from lcm.pub.vimapi import api
 
 
@@ -85,6 +86,11 @@ class TestNFInstantiate(TestCase):
         self.nf_inst_id = str(uuid.uuid4())
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
         JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+        jobs = JobStatusModel.objects.filter(
+            jobid=self.job_id,
+            progress=0,
+            descp="INST_VNF_READY")
+        self.assertEqual(1, len(jobs))
         data = inst_req_data
         InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
         self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.")
@@ -157,16 +163,21 @@ class TestNFInstantiate(TestCase):
                 }
             ]
         }
-        c2_data = {  # create_volume
-            "id": "bc9eebdbbfd356458269340b9ea6fb73",
-            "name": "volume1",
-            # "returnCode": 1,
-            "vimId": "vim_volume_1",
-            "vimName": "vim_volume_1",
-            "tenantId": "vim_volume_1",
-            "volumeType": "123",
-            "availabilityZone": "availabilityZone",
-            "status": "avaluable"
+        c2_data = {
+            "returnCode": 0,
+            "vimId": "11111",
+            "vimName": "11111",
+            "status": "ACTIVE",
+            "id": "3c9eebdbbfd345658269340b9ea6fb73",
+            "name": "net1",
+            "tenantId": "tenant1",
+            "networkName": "ommnet",
+            "shared": 1,
+            "vlanTransparent": 1,
+            "networkType": "vlan",
+            "segmentationId": 202,
+            "physicalNetwork": "ctrl",
+            "routerExternal": 0
         }
         c3_data = {  # get_volume
             "status": "available11",
@@ -196,6 +207,36 @@ class TestNFInstantiate(TestCase):
 
 
 
+
+
+
+    @mock.patch.object(restcall, 'call_req')
+    @mock.patch.object(api, 'call')
+    def test_instantiate_vnf_when_111(self, mock_call, mock_call_req):
+        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())
+        r1 = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}),
+              '200']  # get csar_id from nslcm by vnfd_id
+        r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']  # get rawdata from catalog by csar_id
+        r3 = [0, json.JSONEncoder().encode({"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}),
+              '200']  # apply_grant_to_nfvo
+        r4 = [0, None, '200']
+        mock_call_req.side_effect = [r1, r2, r3, r4]
+        mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume,
+                                 c4_data_create_network, c5_data_create_subnet, c6_data_create_port,
+                                 c7_data_create_flavor, c8_data_list_image, c9_data_create_vm, c10_data_get_vm]
+
+        self.nf_inst_id = '1111'
+        self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+        data = inst_req_data
+        InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
+        self.assert_job_result(self.job_id, 100, "Instantiate Vnf success.")
+
+
+
+
     # @mock.patch.object(restcall, 'call_req')
     # # @mock.patch.object(adaptor, 'create_vim_res')
     # def test_instantiate_vnf_when_create_res_failed(self, mock_call_req):