aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2018-11-02 01:55:36 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-02 01:55:36 +0000
commitb6f1ca9aaa49086a7b3304a828c8fedadf5e3800 (patch)
treec4a5427588995aa8aaec11c6428e625f57c94588
parent54a3a58c5c57788b24265cf99bde972678c917e5 (diff)
parent55fe7f696f3b79e51408da8008c6471842cc643f (diff)
Merge "Remove directive from addtionalParams"
-rw-r--r--lcm/ns_vnfs/biz/grant_vnf.py14
1 files 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