X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FVimManagerUtil.java;h=06a8ef09b4fac88dcdcdfb2edf1dfd3e878c7f1b;hb=aed0d0c540665963a719dd42ccb0e974294df0b7;hp=de10ac1765d47653d9ee58ea8d84d1bcb9e75cb6;hpb=f30cb941059edc86f8b8effaa261774e87395e44;p=aai%2Fesr-server.git 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..06a8ef0 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 @@ -18,7 +18,6 @@ package org.onap.aai.esr.util; import java.util.ArrayList; -import org.onap.aai.esr.common.SystemStatus; import org.onap.aai.esr.common.SystemType; import org.onap.aai.esr.entity.aai.EsrSystemInfo; import org.onap.aai.esr.entity.aai.CloudRegionDetail; @@ -44,6 +43,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 +61,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 +91,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; } }