diff options
| author |   biancunkang <bian.cunkang@zte.com.cn> | 2018-08-15 15:23:58 +0800 |
|---|---|---|
| committer | biancunkang <bian.cunkang@zte.com.cn> | 2018-08-15 15:23:58 +0800 |
| commit | be956528fbc0855293d135915df674bee1e7a24b (patch) | |
| tree | 9710b15f62489aca3cae89271b6568be1fd68da5 | |
| parent | 3169a71e5d95b16ef8d564c81725ece5afe53b77 (diff) | |
Change in vnflcm
Modify terminate_vnf
Change-Id: I9b713873b0e025aacecd6b2d30f31b208fceeaad
Issue-ID: VFC-1015
Signed-off-by: biancunkang <bian.cunkang@zte.com.cn>
| -rw-r--r-- | lcm/lcm/nf/biz/terminate_vnf.py | 2 | ||||
| -rw-r--r-- | lcm/lcm/nf/tests/test_terminate_vnf.py | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py index 98edf1ed..1fc0506c 100644 --- a/lcm/lcm/nf/biz/terminate_vnf.py +++ b/lcm/lcm/nf/biz/terminate_vnf.py @@ -74,7 +74,7 @@ class TerminateVnf(Thread): 'vnfInstanceId': self.nf_inst_id, 'vnfDescriptorId': '', 'lifecycleOperation': 'Terminate', - 'jobId': self.job_id, + 'vnfLcmOpOccId': self.job_id, 'addResource': [], 'removeResource': [], 'placementConstraint': [], diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py index 2179df97..23b246d7 100644 --- a/lcm/lcm/nf/tests/test_terminate_vnf.py +++ b/lcm/lcm/nf/tests/test_terminate_vnf.py @@ -133,8 +133,15 @@ class TestNFTerminate(TestCase): create_time=now_time())
t1_apply_grant_result = [0, json.JSONEncoder().encode(
{
- "vimid": 'vimid_1',
- "tenant": 'tenantname_1'
+ "id": "1",
+ "vnfInstanceId": "1",
+ "vnfLcmOpOccId": "2",
+ "vimConnections": [
+ {
+ "id": "1",
+ "vimId": "1"
+ }
+ ]
}), '200']
t2_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
t3_delete_flavor = [0, json.JSONEncoder().encode({"vim_id": "vimid_1"}), '200']
|