From: Victor Gao <victor.gao@huawei.com>
Date: Thu, 3 May 2018 03:51:35 +0000 (+0800)
Subject: Update VimID in grant interface as optional
X-Git-Tag: 1.2.0~17^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1a67d23396355b08033a7c8680084f224c3d9ec8;p=vfc%2Fnfvo%2Fresmanagement.git

Update VimID in grant interface as optional

it should be optional from VNFM
and Resouce Manager could provide the
 specific vim by specific rules
(e.g. storage first or performance first).
but for now,we dont have the interface/capability
to pass the "rules"to resource Manager.
resource Manager could integrate OOF which may
provide this capabilities or interface.

Change-Id: I91faba8d573680beecf81dc88a252e34150b3b0b
Issue-ID: VFC-604
Signed-off-by: victor.gao <victor.gao@huawei.com>
---

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
index 1afbcbb..c379571 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
@@ -72,10 +72,18 @@ public class GrantResServiceImpl implements GrantResService {
         return result;
     }
 
+    private String getVimId(JSONObject object) {
+        String vimId = "";
+        if (object.containsKey(ParamConstant.PARAM_VIMID)){
+            vimId = object.getString(ParamConstant.PARAM_VIMID);
+        }
+        // TODO: Need integrate OOF to get vimID in R3.
+        return vimId;
+    }
     @Override
     public JSONObject grantResourceReal(JSONObject object) throws ServiceException {
         LOGGER.info("function=grantResource; object: {}", object.toString());
-        String vimId = object.getString(ParamConstant.PARAM_VIMID);
+        String vimId = getVimId(object);
         JSONObject vimJson = VimUtil.getVimById(vimId);
         JSONObject vim = parseVim(vimJson);
         String resType = "";
@@ -168,7 +176,7 @@ public class GrantResServiceImpl implements GrantResService {
     /**
      * <br>
      * 
-     * @param addResource
+     * @param getGrantResource
      * @return
      * @since VFC 1.0
      */