From: luxin <luxin7@huawei.com>
Date: Thu, 25 Jan 2018 03:47:39 +0000 (+0800)
Subject: vimId Replaced by PARAM_VIMID
X-Git-Tag: v1.1.0~38
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ba31958a569edd78807d3d921296f57703c6cf32;p=vfc%2Fnfvo%2Fresmanagement.git

vimId Replaced by PARAM_VIMID

Change-Id: Idcde7837f0734e5980caaa7641310b2c01b3d798
Issue-ID: VFC-672
Signed-off-by: luxin <luxin7@huawei.com>
---

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
index 66d87d9..24dddd8 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
@@ -23,9 +23,9 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
-import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
@@ -133,7 +133,7 @@ public class IResourceAddServiceImpl {
         for(Object object : hostArray) {
             JSONObject hostObject = JSONObject.fromObject(object);
             if(hostObject.getString("project").contains("total")) {
-                String vimId = JsonUtil.getJsonFieldStr(hostObj, "vimId");
+                String vimId = JsonUtil.getJsonFieldStr(hostObj, ParamConstant.PARAM_VIMID);
                 String hostId = vimId + hostName;
                 JSONObject host = new JSONObject();
                 host.put("id", hostId);
@@ -141,7 +141,7 @@ public class IResourceAddServiceImpl {
                 host.put("cpu", JsonUtil.getJsonFieldStr(hostObject, "cpu"));
                 host.put("memory", JsonUtil.getJsonFieldStr(hostObject, "memory_mb"));
                 host.put("disk", JsonUtil.getJsonFieldStr(hostObject, "disk_gb"));
-                host.put("vimId", JsonUtil.getJsonFieldStr(hostObj, "vimId"));
+                host.put(ParamConstant.PARAM_VIMID, JsonUtil.getJsonFieldStr(hostObj, ParamConstant.PARAM_VIMID));
                 host.put("vimName", JsonUtil.getJsonFieldStr(hostObj, "vimName"));
                 return host;
             }