summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRegisterInfo.java10
-rw-r--r--esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java4
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;
}
}