summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryunlong ying <ying.yunlong@zte.com.cn>2017-02-21 08:15:05 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-02-21 08:15:05 +0000
commit33e38547c8345726d995318c46655ec5ffc81184 (patch)
treed596f56ef64a8db318e1b6e61be6ebf7f079116b
parentc896ac50fd771af03326df4e765267f02e8f0432 (diff)
parentc7eb0cdd0191a46acf80c616b37e48555ad8e606 (diff)
Merge "Add test case of create volume failed"
-rw-r--r--lcm/lcm/nf/vnfs/const.py6
-rw-r--r--lcm/lcm/nf/vnfs/tests/test_vnf_create.py74
-rw-r--r--lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py14
3 files changed, 65 insertions, 29 deletions
diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/vnfs/const.py
index 89c5d4ba..b9c0733b 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/vnfs/const.py
@@ -404,7 +404,7 @@ vnfd_model_dict = {
'description': u'ppvm'
}
],
- 'volumn_storages': [
+ 'volume_storages': [
{
"volume_storage_id": "volume_storage1",
"description": "",
@@ -416,8 +416,8 @@ vnfd_model_dict = {
"disk_type": "data",
"delete_on_termination_vm": True,
"location_info": {
- "vimid": "vimid",
- "tenant": "tenantname",
+ "vimid": "vimid_1",
+ "tenant": "tenantname_1",
"availability_zone": "zone1"
},
"is_predefined": False,
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
index e323f604..4096ee77 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
@@ -25,6 +25,8 @@ from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, Ne
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
class TestNFInstantiate(TestCase):
@@ -137,26 +139,60 @@ class TestNFInstantiate(TestCase):
InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception")
+ @mock.patch.object(restcall, 'call_req')
+ @mock.patch.object(api, 'call')
+ def test_instantiate_vnf_when_(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": '1', "accessinfo": {"tenant": '2'}}}), '200'] # apply_grant_to_nfvo
+ mock_call_req.side_effect = [r1, r2, r3]
+ c1_data = { # get_tenant_id
+ "tenants": [
+ {
+ "id": "1",
+ "name": "tenantname_1"
+ }
+ ]
+ }
+ 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"
+ }
+ c3_data = { # get_volume
+ "status": "available11",
+ "name": "wangsong",
+ "attachments": [
+ {
+ "device": "/dev/vdc",
+ "serverId": "3030e666-528e-4954-88f5-cc21dab1262b",
+ "volumeId": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
+ "hostName": None,
+ "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31"
+ }
+ ],
+ "createTime": "2015-12-02T06:39:40.000000",
+ "type": None,
+ "id": "4bd3e9eb-cd8b-456a-8589-910836a0ab31",
+ "size": 40
+ }
+ mock_call.side_effect = [c1_data, c2_data, c3_data]
-
-
-
-
- # @mock.patch.object(restcall, 'call_req')
- # def test_instantiate_vnf_when_(self, 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": '1', "accessinfo": {"tenant": '2'}}}), '200'] # apply_grant_to_nfvo
- # mock_call_req.side_effect = [r1, r2, r3]
- # 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, 255, "Nf instancing apply grant exception")
+ 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, 255, "unexpected exception")
diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
index 3cd689ea..d9f8c8bf 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
@@ -374,7 +374,7 @@ class InstVnf(Thread):
vimid=ret["vimId"],
resouceid=ret["id"],
name=ret["name"],
- tenant=ret["tenatId"],
+ tenant=ret["tenantId"],
insttype=0,
is_predefined=ret["returnCode"],
instid=self.nf_inst_id)
@@ -386,13 +386,13 @@ class InstVnf(Thread):
# self.inst_resource['network'].append({"vim_id": "1"}, {"res_id": "2"})
JobUtil.add_job_status(self.job_id, 35, 'Create networks!')
NetworkInstModel.objects.create(
- networkid=ret["id"],
- vimid = ret["vimId"],
- resouceid = ret["id"],
- name = ret["name"],
- tenant = ret["tenatId"],
+ networkid= ignore_case_get(ret, "id"),
+ vimid = ignore_case_get(ret, "vimId"),
+ resouceid = ignore_case_get(ret, "id"),
+ name = ignore_case_get(ret, "name"),
+ tenant = ignore_case_get(ret, "tenatId"),
insttype = 0,
- is_predefined = ret["returnCode"],
+ is_predefined = ignore_case_get(ret, "returnCode"),
instid = self.nf_inst_id)
elif res_type == adaptor.RES_SUBNET:
logger.info('Create subnets!')