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=bbcc5feb14a9f2f7c97c7f29ac881615ac4834f1;hp=1fc68a98303a698c3cb3c12c170a437c3ac5830e;hb=06fe3f5d62f9b986ebb8babf6fb140baed44769f;hpb=6011cbc9b4031f3ce25a82ccb1c0fedf4a2bf57a

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 1fc68a9..bbcc5fe 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
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2018 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +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;
 import org.onap.aai.esr.entity.aai.CloudRegionDetail;
@@ -26,72 +26,73 @@ 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());
-    cloudRegion.setCloudType(vimRegisterInfo.getCloudType());
-    cloudRegion.setCloudRegionVersion(vimRegisterInfo.getCloudRegionVersion());
-    cloudRegion.setCloudZone(vimRegisterInfo.getCloudZone());
-    cloudRegion.setComplexName(vimRegisterInfo.getComplexName());
-    cloudRegion.setOwnerDefinedType(vimRegisterInfo.getOwnerDefinedType());
-    cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo());
-    
-    esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
-    esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus());
-    esrSystemInfoList = extsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
-    cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
-    return cloudRegion;
-  }
+    private static ExtsysUtil extsysUtil = new ExtsysUtil();
+
+    public CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
+        CloudRegionDetail cloudRegion = new CloudRegionDetail();
+
+        cloudRegion.setCloudOwner(vimRegisterInfo.getCloudOwner());
+        cloudRegion.setCloudRegionId(vimRegisterInfo.getCloudRegionId());
+        cloudRegion.setCloudType(vimRegisterInfo.getCloudType());
+        cloudRegion.setCloudRegionVersion(vimRegisterInfo.getCloudRegionVersion());
+        cloudRegion.setCloudZone(vimRegisterInfo.getCloudZone());
+        cloudRegion.setComplexName(vimRegisterInfo.getComplexName());
+        cloudRegion.setOwnerDefinedType(vimRegisterInfo.getOwnerDefinedType());
+        cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo());
+
+        EsrSystemInfo esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
+        esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus());
+        EsrSystemInfoList esrSystemInfoList = extsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
+        cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
+        return cloudRegion;
+    }
+
+    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 VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
+        VimAuthInfo vimAuthInfo = new VimAuthInfo();
+        vimAuthInfo.setAuthUrl(authInfo.getServiceUrl());
+        vimAuthInfo.setCloudDomain(authInfo.getCloudDomain());
+        vimAuthInfo.setPassword(authInfo.getPassword());
+        vimAuthInfo.setSslCacert(authInfo.getSslCassert());
+        vimAuthInfo.setSslInsecure(authInfo.getSslInsecure());
+        vimAuthInfo.setUserName(authInfo.getUserName());
+        vimAuthInfo.setDefaultTenant(authInfo.getDefaultTenant());
+        return vimAuthInfo;
+    }
 
-  private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> vimAuthInfos) {
-    EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
-    VimAuthInfo vimAuthInfo = new 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.setSystemType(SystemType.VIM.toString());
-//    esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString());
-    return esrSystemInfoObj;
-  }
-  
-  private VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
-    VimAuthInfo vimAuthInfo = new VimAuthInfo();
-    vimAuthInfo.setAuthUrl(authInfo.getServiceUrl());
-    vimAuthInfo.setCloudDomain(authInfo.getCloudDomain());
-    vimAuthInfo.setPassword(authInfo.getPassword());
-    vimAuthInfo.setSslCacert(authInfo.getSslCassert());
-    vimAuthInfo.setSslInsecure(authInfo.getSslInsecure());
-    vimAuthInfo.setUserName(authInfo.getUserName());
-    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);
-    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());
-    vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
-    return vimRegisterInfo;
-  }
+    public VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
+        VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
+        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;
+    }
 }