X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVimManagerWrapper.java;h=bc7e872dfc8c120df9dbd7de4d24f1f1ea9c2c07;hb=a9c5b27687df9f1d72c58fa64899b6783f6aef5a;hp=260d20986437e1d2d157f8f4d2adf5934b1aa322;hpb=2c0e80cac349b7364d5b2b1f0b9650a4cd95ca18;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index 260d209..bc7e872 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -16,148 +16,202 @@
 package org.onap.aai.esr.wrapper;
 
 import java.util.ArrayList;
-
+import java.util.List;
 import javax.ws.rs.core.Response;
-
 import org.onap.aai.esr.entity.aai.CloudRegionDetail;
 import org.onap.aai.esr.entity.aai.CloudRegionList;
+import org.onap.aai.esr.entity.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.rest.VimRegisterInfo;
 import org.onap.aai.esr.entity.rest.VimRegisterResponse;
+import org.onap.aai.esr.exception.ExceptionUtil;
+import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.externalservice.aai.CloudRegionProxy;
+import org.onap.aai.esr.externalservice.cloud.Tenant;
+import org.onap.aai.esr.externalservice.cloud.VimManagerProxy;
 import org.onap.aai.esr.util.ExtsysUtil;
 import org.onap.aai.esr.util.VimManagerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import com.google.gson.Gson;
 
-
 public class VimManagerWrapper {
 
-  private static VimManagerWrapper vimManagerWrapper;
-  private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
+    private static VimManagerWrapper vimManagerWrapper;
+    private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
+
+    private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
+
+    private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy();
+
+    private static ExtsysUtil extsysUtil = new ExtsysUtil();
 
-  /**
-   * get VimManagerWrapper instance.
-   * @return vim manager wrapper instance
-   */
-  public static VimManagerWrapper getInstance() {
-    if (vimManagerWrapper == null) {
-      vimManagerWrapper = new VimManagerWrapper();
+    /**
+     * get VimManagerWrapper instance.
+     * 
+     * @return vim manager wrapper instance
+     */
+    public static VimManagerWrapper getInstance() {
+        if (vimManagerWrapper == null) {
+            vimManagerWrapper = new VimManagerWrapper(cloudRegionProxy);
+        }
+        return vimManagerWrapper;
     }
-    return vimManagerWrapper;
     
-  }
-  
-  public Response registerVim(VimRegisterInfo vimRegisterInfo) {
-    LOG.info("Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
-    CloudRegionDetail cloudRegion = new CloudRegionDetail();
-    VimRegisterResponse result = new VimRegisterResponse();
-    cloudRegion = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
-    String cloudOwner = vimRegisterInfo.getCloudOwner();
-    String cloudRegionId = vimRegisterInfo.getCloudRegionId();
-    try {
-      CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion);
-      result.setCloudOwner(cloudOwner);
-      result.setCloudRegionId(cloudRegionId);
-      return Response.ok(result).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      return Response.serverError().build();
+    public VimManagerWrapper(CloudRegionProxy cloudRegionProxy) {
+        VimManagerWrapper.cloudRegionProxy = cloudRegionProxy;
     }
-  }
-  public Response updateVim(VimRegisterInfo vimRegisterInfo) {
-    LOG.info("Start update VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
-    String cloudOwner = vimRegisterInfo.getCloudOwner();
-    String cloudRegionId = vimRegisterInfo.getCloudRegionId();
-    String resourceVersion = getResourceVersion(cloudOwner, cloudRegionId);
-    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
-    VimRegisterResponse result = new VimRegisterResponse();
-    cloudRegionDetail = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
-    cloudRegionDetail.setResouceVersion(resourceVersion);
-
-    try {
-      CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
-      result.setCloudOwner(cloudOwner);
-      result.setCloudRegionId(cloudRegionId);
-      return Response.ok(result).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      return Response.serverError().build();
+
+    public Response registerVim(VimRegisterInfo vimRegisterInfo) {
+        LOG.info("Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
+        VimRegisterResponse result = new VimRegisterResponse();
+        CloudRegionDetail cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+        String cloudOwner = vimRegisterInfo.getCloudOwner();
+        String cloudRegionId = vimRegisterInfo.getCloudRegionId();
+        try {
+            cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion);
+            result.setCloudOwner(cloudOwner);
+            result.setCloudRegionId(cloudRegionId);
+            Tenant tenant = new Tenant();
+            tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant());
+            try {
+                VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
+            } catch (ExtsysException e) {
+                LOG.error("Update VIM by Multi-cloud failed !", e);
+            }
+            return Response.ok(result).build();
+        } catch (ExtsysException error) {
+            LOG.error("Register VIM failed !", error);
+            throw ExceptionUtil.buildExceptionResponse(error.getMessage());
+        }
     }
-  }
-  
-  public Response queryVimListDetails() {
-    ArrayList<VimRegisterInfo> vimRegisterInfos = new ArrayList<VimRegisterInfo>();
-    CloudRegionList cloudRegionList = new CloudRegionList();
-    try {
-      String aaiVimList = CloudRegionProxy.qureyVimList();
-      cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class);
-      vimRegisterInfos = getVimDetailList(cloudRegionList);
-      return Response.ok(vimRegisterInfos).build();
-    } catch (Exception error) {
-      LOG.error("Query vim list details failed !" + error.getMessage());
-      return Response.serverError().build();
+
+    public Response updateVim(String cloudOwner, String cloudRegionId, VimRegisterInfo vimRegisterInfo) {
+        LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
+        VimRegisterResponse result = new VimRegisterResponse();
+
+        CloudRegionDetail cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo);
+        try {
+            cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail);
+            result.setCloudOwner(cloudOwner);
+            result.setCloudRegionId(cloudRegionId);
+            return Response.ok(result).build();
+        } catch (ExtsysException e) {
+            LOG.error("Update VIM failed !", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
     }
-    
-  }
-  
-  public Response queryVimById(String cloudOwner, String cloudRegionId) {
-    VimRegisterInfo vim = new VimRegisterInfo();
-    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
-    try {
-      String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
-      LOG.info("Response from AAI by query VIM: " + cloudRegionstr);
-      cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
-      vim = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
-      return Response.ok(vim).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      return Response.serverError().build();
+
+    public Response queryVimListDetails() {
+        List<VimRegisterInfo> vimRegisterInfos = new ArrayList<>();
+        CloudRegionList cloudRegionList = new CloudRegionList();
+        try {
+            String aaiVimList = cloudRegionProxy.qureyVimList();
+            cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class);
+            vimRegisterInfos = getVimDetailList(cloudRegionList);
+            return Response.ok(vimRegisterInfos).build();
+        } catch (ExtsysException error) {
+            LOG.error("Query vim list details failed !", error);
+            return Response.ok(vimRegisterInfos).build();
+        }
+
     }
-    
-  }
-  
-  private ArrayList<VimRegisterInfo> getVimDetailList(CloudRegionList cloudRegionList) {
-    ArrayList<VimRegisterInfo> vimRegisterInfos = new ArrayList<VimRegisterInfo>();
-    VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
-    int cloudRegionNum = cloudRegionList.getCloudRegion().size();
-    for (int i=0; i<cloudRegionNum; i++) {
-      String cloudOwner = cloudRegionList.getCloudRegion().get(i).getCloudOwner();
-      String cloudRegionId = cloudRegionList.getCloudRegion().get(i).getCloudRegionId();
-      vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId);
-      vimRegisterInfos.add(vimRegisterInfo);
+
+    public Response queryVimById(String cloudOwner, String cloudRegionId) {
+        VimRegisterInfo vim = new VimRegisterInfo();
+        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
+        try {
+            String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+            LOG.info("Response from AAI by query VIM: " + cloudRegionstr);
+            cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
+            vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
+            return Response.ok(vim).build();
+        } catch (ExtsysException e) {
+            LOG.error("Query vim details by ID failed !", e);
+            return Response.ok(vim).build();
+        }
+
     }
-    return vimRegisterInfos;
-  }
-  
-  private VimRegisterInfo getVimDetail(String cloudOwner, String cloudRegionId) {
-    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
-    VimRegisterInfo registeredVimInfo = new VimRegisterInfo();
-    try {
-      String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
-      cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
-      registeredVimInfo = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
-    } catch (Exception error) {
-      LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner +", cloud-region-id = "+ cloudRegionId + error.getMessage());
+
+    private List<VimRegisterInfo> getVimDetailList(CloudRegionList cloudRegionList) {
+        List<VimRegisterInfo> vimRegisterInfos = new ArrayList<>();
+        int cloudRegionNum = cloudRegionList.getCloudRegion().size();
+        for (int i = 0; i < cloudRegionNum; i++) {
+            String cloudOwner = cloudRegionList.getCloudRegion().get(i).getCloudOwner();
+            String cloudRegionId = cloudRegionList.getCloudRegion().get(i).getCloudRegionId();
+            VimRegisterInfo vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId);
+            vimRegisterInfos.add(vimRegisterInfo);
+        }
+        return vimRegisterInfos;
     }
-    return registeredVimInfo;
-  }
-  
-  private String getResourceVersion(String cloudOwner, String cloudRegionId) {
-    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
-    try {
-      String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
-      cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
-      return cloudRegionDetail.getResouceVersion();
-    } catch (Exception error) {
-      LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner +", cloud-region-id = "+ cloudRegionId + error.getMessage());
-      return null;
+
+    private VimRegisterInfo getVimDetail(String cloudOwner, String cloudRegionId) {
+        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
+        VimRegisterInfo registeredVimInfo = new VimRegisterInfo();
+        try {
+            String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+            cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
+            registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
+        } catch (ExtsysException error) {
+            LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " + cloudRegionId,
+                    error);
+        }
+        return registeredVimInfo;
+    }
+
+    private CloudRegionDetail getOriginalCloudRegion(String cloudOwner, String cloudRegionId) {
+        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
+        try {
+            String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+            cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
+            return cloudRegionDetail;
+        } catch (ExtsysException error) {
+            LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " + cloudRegionId,
+                    error);
+            return null;
+        }
+    }
+
+    private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) {
+        String cloudOwner = vimRegisterInfo.getCloudOwner();
+        String cloudRegionId = vimRegisterInfo.getCloudRegionId();
+        CloudRegionDetail originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
+        String resourceVersion = originalCloudRegionDetail.getResourceVersion();
+        CloudRegionDetail cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+        if (resourceVersion != null) {
+            cloudRegionDetail.setResourceVersion(resourceVersion);
+            EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+            cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+                    .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());
+            cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+                    .setResouceVersion(originalSystemInfo.getResouceVersion());
+        }
+        return cloudRegionDetail;
+    }
+
+    public Response delVim(String cloudOwner, String cloudRegionId) {
+        CloudRegionDetail cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
+        String resourceVersion = cloudRegionDetail.getResourceVersion();
+        try {
+            cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
+            return Response.noContent().build();
+        } catch (ExtsysException e) {
+            LOG.error("Delete cloud region from A&AI failed! cloud-owner = " + cloudOwner + ", cloud-region-id = "
+                    + cloudRegionId + "resouce-version:" + resourceVersion, e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
+    }
+
+    private CloudRegionDetail queryCloudRegionDetail(String cloudOwner, String cloudRegionId) {
+        CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
+        try {
+            String cloudRegionStr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+            LOG.info("Response from AAI by query cloud region: " + cloudRegionStr);
+            cloudRegionDetail = new Gson().fromJson(cloudRegionStr, CloudRegionDetail.class);
+        } catch (ExtsysException e) {
+            LOG.error("Query EMS detail failed! cloud-owner = " + cloudOwner + ", cloud-region-id = " + cloudRegionId,
+                    e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
+        return cloudRegionDetail;
     }
-  }
-  
-  public Response delVim(String vimId) {
-    //TODO
-    return Response.noContent().build();
-  }
 }