From: laili <lai.li@zte.com.cn>
Date: Thu, 1 Nov 2018 07:44:47 +0000 (+0800)
Subject: Remove directive from addtionalParams
X-Git-Tag: 3.0.0-ONAP~22^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=55fe7f696f3b79e51408da8008c6471842cc643f;p=vfc%2Fnfvo%2Flcm.git

Remove directive from addtionalParams

Change-Id: Ie69bd791cf044d90f2e9ae7633e16ba3f487eb49
Issue-ID: VFC-1176
Signed-off-by: laili <lai.li@zte.com.cn>
---

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