Fix the nonstandard coding.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / util / VimManagerUtil.java

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 6393f12..0a69f40 100644 (file)
--- 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
@@ -17,6 +17,7 @@ package org.onap.aai.esr.util;
 
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.onap.aai.esr.common.SystemType;
 import org.onap.aai.esr.entity.aai.EsrSystemInfo;
@@ -25,13 +26,11 @@ 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 CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
     CloudRegionDetail cloudRegion = new CloudRegionDetail();
-    EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-    EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
     
     cloudRegion.setCloudOwner(vimRegisterInfo.getCloudOwner());
     cloudRegion.setCloudRegionId(vimRegisterInfo.getCloudRegionId());
@@ -42,24 +41,24 @@ public class VimManagerUtil {
     cloudRegion.setOwnerDefinedType(vimRegisterInfo.getOwnerDefinedType());
     cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo());
     
-    esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
+    EsrSystemInfo esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
     esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus());
-    esrSystemInfoList = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
+    EsrSystemInfoList esrSystemInfoList = extsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
     cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
     return cloudRegion;
   }
 
-  private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> vimAuthInfos) {
+  private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(List<VimAuthInfo> vimAuthInfos) {
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
-    VimAuthInfo vimAuthInfo = new VimAuthInfo();
-    vimAuthInfo = vimAuthInfos.get(0);
+    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.setEsrSystemInfoId(ExtsysUtil.generateId());
+    esrSystemInfoObj.setDefaultTenant(vimAuthInfo.getDefaultTenant());
+    esrSystemInfoObj.setEsrSystemInfoId(extsysUtil.generateId());
     esrSystemInfoObj.setSystemType(SystemType.VIM.toString());
 //    esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString());
     return esrSystemInfoObj;
@@ -73,15 +72,18 @@ public class VimManagerUtil {
     vimAuthInfo.setSslCacert(authInfo.getSslCassert());
     vimAuthInfo.setSslInsecure(authInfo.getSslInsecure());
     vimAuthInfo.setUserName(authInfo.getUserName());
+    vimAuthInfo.setDefaultTenant(authInfo.getDefaultTenant());
     return vimAuthInfo;
   }
   
   public VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
     VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
-    VimAuthInfo vimAuthInfo = new VimAuthInfo();
-    ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
-    vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
-    vimAuthInfos.add(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());
@@ -91,7 +93,6 @@ 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;
   }
 }