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=6393f1226cf6b0b650e107418abb0f26804562f8;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;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..6393f12 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;
@@ -29,7 +28,7 @@ import org.onap.aai.esr.entity.rest.VimRegisterInfo;
 
 public class VimManagerUtil {
   
-  public static CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
+  public CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
     CloudRegionDetail cloudRegion = new CloudRegionDetail();
     EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
@@ -44,12 +43,13 @@ public class VimManagerUtil {
     cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo());
     
     esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
+    esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus());
     esrSystemInfoList = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
     cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
     return cloudRegion;
   }
 
-  private static EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> vimAuthInfos) {
+  private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> vimAuthInfos) {
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
     VimAuthInfo vimAuthInfo = new VimAuthInfo();
     vimAuthInfo = vimAuthInfos.get(0);
@@ -61,11 +61,11 @@ 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;
   }
   
-  private static VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
+  private VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
     VimAuthInfo vimAuthInfo = new VimAuthInfo();
     vimAuthInfo.setAuthUrl(authInfo.getServiceUrl());
     vimAuthInfo.setCloudDomain(authInfo.getCloudDomain());
@@ -76,7 +76,7 @@ public class VimManagerUtil {
     return vimAuthInfo;
   }
   
-  public static VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
+  public VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
     VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
     VimAuthInfo vimAuthInfo = new VimAuthInfo();
     ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
@@ -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;
   }
 }