diff options
author | 2017-09-19 20:05:39 +0800 | |
---|---|---|
committer | 2017-09-19 20:05:39 +0800 | |
commit | 916d813520c7e29eefa0af645864700b0cddacfd (patch) | |
tree | 6418f46d97b83c1d67eb5a2124f9caa63108ed60 /esr-mgr | |
parent | f30cb941059edc86f8b8effaa261774e87395e44 (diff) |
Fix the VIM status management.
Change-Id: I03a929d4f7e1b32092250daa1ff7f2bdc6451dcd
Issue-ID: AAI-334
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
Diffstat (limited to 'esr-mgr')
-rw-r--r-- | esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRegisterInfo.java | 10 | ||||
-rw-r--r-- | esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRegisterInfo.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRegisterInfo.java index dd3fa95..f6b928c 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRegisterInfo.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRegisterInfo.java @@ -35,6 +35,8 @@ public class VimRegisterInfo { private String cloudExtraInfo; + private String status; + private ArrayList<VimAuthInfo> vimAuthInfos; public String getCloudOwner() { @@ -109,4 +111,12 @@ public class VimRegisterInfo { this.vimAuthInfos = vimAuthInfos; } + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + } diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java index de10ac1..b18c440 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java @@ -44,6 +44,7 @@ public class VimManagerUtil { cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo()); esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos()); + esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus()); esrSystemInfoList = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj); cloudRegion.setEsrSystemInfoList(esrSystemInfoList); return cloudRegion; @@ -61,7 +62,7 @@ public class VimManagerUtil { esrSystemInfoObj.setSslInsecure(vimAuthInfo.getSslInsecure()); esrSystemInfoObj.setEsrSystemInfoId(ExtsysUtil.generateId()); esrSystemInfoObj.setSystemType(SystemType.VIM.toString()); - esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString()); +// esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString()); return esrSystemInfoObj; } @@ -91,6 +92,7 @@ public class VimManagerUtil { vimRegisterInfo.setComplexName(cloudRegion.getComplexName()); vimRegisterInfo.setCloudRegionVersion(cloudRegion.getCloudRegionVersion()); vimRegisterInfo.setOwnerDefinedType(cloudRegion.getOwnerDefinedType()); + vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus()); return vimRegisterInfo; } } |