diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2018-08-14 16:27:07 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-08-14 16:27:07 +0800 |
| commit | 971e40a924ba1f564e2f2b990eb5b87c904790aa (patch) | |
| tree | 33ed5f61d6ff612c03d322ff31da7e25c63baab2 | |
| parent | 63a969df1fdf9ccd895769cd9b297b85705b8947 (diff) | |
Refactor unit test for vnf heal
Change-Id: I4a4be6a7dbec8b291c540826a61c15944ad427a5
Issue-ID: VFC-1009
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
| -rw-r--r-- | lcm/ns/tests/vnfs/tests.py | 65 |
1 files changed, 44 insertions, 21 deletions
diff --git a/lcm/ns/tests/vnfs/tests.py b/lcm/ns/tests/vnfs/tests.py index 1406fae2..2e3e4f14 100644 --- a/lcm/ns/tests/vnfs/tests.py +++ b/lcm/ns/tests/vnfs/tests.py @@ -436,15 +436,33 @@ class TestHealVnfViews(TestCase): self.job_id = JobUtil.create_job("VNF", JOB_TYPE.HEAL_VNF, self.nf_inst_id) NSInstModel(id=self.ns_inst_id, name="ns_name").save() - NfInstModel.objects.create(nfinstid=self.nf_inst_id, nf_name='name_1', vnf_id='1', - vnfm_inst_id='1', ns_inst_id='111,2-2-2', - max_cpu='14', max_ram='12296', max_hd='101', max_shd="20", max_net=10, - status='active', mnfinstid=self.nf_uuid, package_id='pkg1', - vnfd_model='{"metadata": {"vnfdId": "1","vnfdName": "PGW001",' - '"vnfProvider": "zte","vnfdVersion": "V00001","vnfVersion": "V5.10.20",' - '"productType": "CN","vnfType": "PGW",' - '"description": "PGW VNFD description",' - '"isShared":true,"vnfExtendType":"driver"}}') + NfInstModel.objects.create(nfinstid=self.nf_inst_id, + nf_name='name_1', + vnf_id='1', + vnfm_inst_id='1', + ns_inst_id='111,2-2-2', + max_cpu='14', + max_ram='12296', + max_hd='101', + max_shd="20", + max_net=10, + status='active', + mnfinstid=self.nf_uuid, + package_id='pkg1', + vnfd_model=json.dumps({ + "metadata": { + "vnfdId": "1", + "vnfdName": "PGW001", + "vnfProvider": "zte", + "vnfdVersion": "V00001", + "vnfVersion": "V5.10.20", + "productType": "CN", + "vnfType": "PGW", + "description": "PGW VNFD description", + "isShared": True, + "vnfExtendType": "driver" + } + })) def tearDown(self): NSInstModel.objects.all().delete() @@ -461,18 +479,23 @@ class TestHealVnfViews(TestCase): "/api/resmgr/v1/vnf/1": [0, json.JSONEncoder().encode({"jobId": self.job_id}), '200'], "/api/ztevnfmdriver/v1/1/jobs/" + self.job_id + "?responseId=0": - [0, json.JSONEncoder().encode({"jobId": self.job_id, - "responsedescriptor": {"progress": "100", - "status": JOB_MODEL_STATUS.FINISHED, - "responseid": "3", - "statusdescription": "creating", - "errorcode": "0", - "responsehistorylist": [ - {"progress": "0", - "status": JOB_MODEL_STATUS.PROCESSING, - "responseid": "2", - "statusdescription": "creating", - "errorcode": "0"}]}}), '200']} + [0, json.JSONEncoder().encode({ + "jobId": self.job_id, + "responsedescriptor": { + "progress": "100", + "status": JOB_MODEL_STATUS.FINISHED, + "responseid": "3", + "statusdescription": "creating", + "errorcode": "0", + "responsehistorylist": [{ + "progress": "0", + "status": JOB_MODEL_STATUS.PROCESSING, + "responseid": "2", + "statusdescription": "creating", + "errorcode": "0" + }] + } + }), '200']} def side_effect(*args): return mock_vals[args[4]] |