X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FVimManagerUtil.java;h=0a69f40f0048d6761997ea3ff45ec2f90726c905;hp=caad56580fae16e1170c8d92709d650a2bb24938;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hpb=0f4c91c98e9fe5e403c110a85375778b7fad04fb

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 caad565..0a69f40 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
@@ -15,24 +15,22 @@
  */
 package org.onap.aai.esr.util;
 
+
 import java.util.ArrayList;
+import java.util.List;
 
-import org.onap.aai.esr.common.SystemStatus;
 import org.onap.aai.esr.common.SystemType;
-import org.onap.aai.esr.entity.aai.AuthInfo;
-import org.onap.aai.esr.entity.aai.CloudRegion;
 import org.onap.aai.esr.entity.aai.EsrSystemInfo;
+import org.onap.aai.esr.entity.aai.CloudRegionDetail;
 import org.onap.aai.esr.entity.aai.EsrSystemInfoList;
 import org.onap.aai.esr.entity.rest.VimAuthInfo;
 import org.onap.aai.esr.entity.rest.VimRegisterInfo;
 
-
 public class VimManagerUtil {
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
   
-  public static CloudRegion vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
-    CloudRegion cloudRegion = new CloudRegion();
-    EsrSystemInfoList esrSystemInfo = new EsrSystemInfoList();
-    AuthInfo authInfo = new AuthInfo();
+  public CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
+    CloudRegionDetail cloudRegion = new CloudRegionDetail();
     
     cloudRegion.setCloudOwner(vimRegisterInfo.getCloudOwner());
     cloudRegion.setCloudRegionId(vimRegisterInfo.getCloudRegionId());
@@ -43,27 +41,30 @@ public class VimManagerUtil {
     cloudRegion.setOwnerDefinedType(vimRegisterInfo.getOwnerDefinedType());
     cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo());
     
-    authInfo = vimAuthInfo2AuthInfo(vimRegisterInfo.getVimAuthInfo());
-    esrSystemInfo = ExtsysUtil.getEsrSystemInfoList(authInfo);
-    cloudRegion.setEsrSystemInfoList(esrSystemInfo);
+    EsrSystemInfo esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
+    esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus());
+    EsrSystemInfoList esrSystemInfoList = extsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
+    cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
     return cloudRegion;
   }
 
-  private static AuthInfo vimAuthInfo2AuthInfo(VimAuthInfo vimAuthInfo) {
-    AuthInfo authInfo = new AuthInfo();
-    authInfo.setCloudDomain(vimAuthInfo.getCloudDomain());
-    authInfo.setUserName(vimAuthInfo.getUserName());
-    authInfo.setPassword(vimAuthInfo.getPassword());
-    authInfo.setServiceUrl(vimAuthInfo.getAuthUrl());
-    authInfo.setSslCassert(vimAuthInfo.getSslCacert());
-    authInfo.setSslInsecure(vimAuthInfo.getSslInsecure());
-    authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
-    authInfo.setSystemType(SystemType.VIM.toString());
-    authInfo.setSystemStatus(SystemStatus.normal.toString());
-    return authInfo;
+  private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(List<VimAuthInfo> vimAuthInfos) {
+    EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
+    VimAuthInfo vimAuthInfo = vimAuthInfos.get(0);
+    esrSystemInfoObj.setCloudDomain(vimAuthInfo.getCloudDomain());
+    esrSystemInfoObj.setUserName(vimAuthInfo.getUserName());
+    esrSystemInfoObj.setPassword(vimAuthInfo.getPassword());
+    esrSystemInfoObj.setServiceUrl(vimAuthInfo.getAuthUrl());
+    esrSystemInfoObj.setSslCassert(vimAuthInfo.getSslCacert());
+    esrSystemInfoObj.setSslInsecure(vimAuthInfo.getSslInsecure());
+    esrSystemInfoObj.setDefaultTenant(vimAuthInfo.getDefaultTenant());
+    esrSystemInfoObj.setEsrSystemInfoId(extsysUtil.generateId());
+    esrSystemInfoObj.setSystemType(SystemType.VIM.toString());
+//    esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString());
+    return esrSystemInfoObj;
   }
   
-  private static VimAuthInfo authInfo2VimAuthInfo(AuthInfo authInfo) {
+  private VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
     VimAuthInfo vimAuthInfo = new VimAuthInfo();
     vimAuthInfo.setAuthUrl(authInfo.getServiceUrl());
     vimAuthInfo.setCloudDomain(authInfo.getCloudDomain());
@@ -71,20 +72,26 @@ public class VimManagerUtil {
     vimAuthInfo.setSslCacert(authInfo.getSslCassert());
     vimAuthInfo.setSslInsecure(authInfo.getSslInsecure());
     vimAuthInfo.setUserName(authInfo.getUserName());
+    vimAuthInfo.setDefaultTenant(authInfo.getDefaultTenant());
     return vimAuthInfo;
   }
   
-  public static VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegion cloudRegion) {
+  public VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
     VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
-    VimAuthInfo vimAuthInfo = new VimAuthInfo();
-    vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().getEsrSystemInfo().get(0));
-    vimRegisterInfo.setVimAuthInfo(vimAuthInfo);
+    List<VimAuthInfo> vimAuthInfos = new ArrayList<>();
+    if(cloudRegion.getEsrSystemInfoList()!=null){
+      VimAuthInfo vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
+      vimAuthInfos.add(vimAuthInfo);
+      vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
+    }
+    vimRegisterInfo.setVimAuthInfos(vimAuthInfos);
     vimRegisterInfo.setCloudExtraInfo(cloudRegion.getCloudExtraInfo());
     vimRegisterInfo.setCloudOwner(cloudRegion.getCloudOwner());
     vimRegisterInfo.setCloudRegionId(cloudRegion.getCloudRegionId());
     vimRegisterInfo.setCloudType(cloudRegion.getCloudType());
     vimRegisterInfo.setCloudZone(cloudRegion.getCloudZone());
     vimRegisterInfo.setComplexName(cloudRegion.getComplexName());
+    vimRegisterInfo.setCloudRegionVersion(cloudRegion.getCloudRegionVersion());
     vimRegisterInfo.setOwnerDefinedType(cloudRegion.getOwnerDefinedType());
     return vimRegisterInfo;
   }