From 55fe7f696f3b79e51408da8008c6471842cc643f Mon Sep 17 00:00:00 2001 From: laili Date: Thu, 1 Nov 2018 15:44:47 +0800 Subject: [PATCH] Remove directive from addtionalParams Change-Id: Ie69bd791cf044d90f2e9ae7633e16ba3f487eb49 Issue-ID: VFC-1176 Signed-off-by: laili --- lcm/ns_vnfs/biz/grant_vnf.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lcm/ns_vnfs/biz/grant_vnf.py b/lcm/ns_vnfs/biz/grant_vnf.py index d812d957..faeebecb 100644 --- a/lcm/ns_vnfs/biz/grant_vnf.py +++ b/lcm/ns_vnfs/biz/grant_vnf.py @@ -84,7 +84,17 @@ class GrantVnf(object): break req_param[grant_type].append(grant_res) self.data = req_param - vimConnections.append(resmgr.grant_vnf(self.data)) + tmp = resmgr.grant_vnf(self.data) + vimConnections.append( + { + "id": tmp["vim"]["vimId"], + "vimId": tmp["vim"]["vimId"], + "vimType": None, + "interfaceInfo": None, + "accessInfo": tmp["vim"]["accessInfo"], + "extra": None + } + ) grant_resp = { "id": str(uuid.uuid4()), @@ -102,7 +112,7 @@ class GrantVnf(object): 'vnfdVirtualComputeDescId': None, # TODO: required 'vimFlavourId': off.flavor_name }) - grant_resp['additionalparams'][off.vim_id] = off.directive + # grant_resp['additionalparams'][off.vim_id] = off.directive logger.debug("grant_resp=%s", grant_resp) return grant_resp -- 2.16.6