summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaili <lai.li@zte.com.cn>2018-11-01 15:44:47 +0800
committerlaili <lai.li@zte.com.cn>2018-11-02 09:40:18 +0800
commit55fe7f696f3b79e51408da8008c6471842cc643f (patch)
tree2fabafbc61404d08fdcfbe8aab7fbffdf9178daf
parent6e60e4fe06099f0cdcba32c4a78efa17e7c9977c (diff)
Remove directive from addtionalParams
Change-Id: Ie69bd791cf044d90f2e9ae7633e16ba3f487eb49 Issue-ID: VFC-1176 Signed-off-by: laili <lai.li@zte.com.cn>
-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