X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVimManagerWrapper.java;h=260d20986437e1d2d157f8f4d2adf5934b1aa322;hb=2c0e80cac349b7364d5b2b1f0b9650a4cd95ca18;hp=b20116c8786328f6b4912b63aa137dbd772f79ba;hpb=9fccad8f53ef43026a8632bfb6eabc32849a8c46;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 b20116c..260d209 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
@@ -19,7 +19,8 @@ import java.util.ArrayList;
 
 import javax.ws.rs.core.Response;
 
-import org.onap.aai.esr.entity.aai.CloudRegion;
+import org.onap.aai.esr.entity.aai.CloudRegionDetail;
+import org.onap.aai.esr.entity.aai.CloudRegionList;
 import org.onap.aai.esr.entity.rest.VimRegisterInfo;
 import org.onap.aai.esr.entity.rest.VimRegisterResponse;
 import org.onap.aai.esr.externalservice.aai.CloudRegionProxy;
@@ -50,42 +51,65 @@ public class VimManagerWrapper {
   
   public Response registerVim(VimRegisterInfo vimRegisterInfo) {
     LOG.info("Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
-    CloudRegion cloudRegion = new CloudRegion();
+    CloudRegionDetail cloudRegion = new CloudRegionDetail();
     VimRegisterResponse result = new VimRegisterResponse();
     cloudRegion = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
-    String cloud_owner = vimRegisterInfo.getCloudOwner();
-    String cloud_region_id = vimRegisterInfo.getCloudRegionId();
-
+    String cloudOwner = vimRegisterInfo.getCloudOwner();
+    String cloudRegionId = vimRegisterInfo.getCloudRegionId();
     try {
-      CloudRegionProxy.registerVim(cloud_owner, cloud_region_id, cloudRegion);
-      result.setCloudOwner(cloud_owner);
-      result.setCloudRegionId(cloud_region_id);
+      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 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);
 
-  public Response updateVim(VimRegisterInfo vim) {
-    //TODO
-    return Response.ok().build();
+    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 queryVimList() {
-    //TODO
-    ArrayList<VimRegisterInfo> vimList = new ArrayList<VimRegisterInfo>();
-    return Response.ok(vimList).build();
+  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 queryVimById(String cloudOwner, String cloudRegionId) {
     VimRegisterInfo vim = new VimRegisterInfo();
-    CloudRegion cloudRegion = new CloudRegion();
+    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
     try {
       String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
       LOG.info("Response from AAI by query VIM: " + cloudRegionstr);
-      cloudRegion = new Gson().fromJson(cloudRegionstr, CloudRegion.class);
-      vim = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegion);
+      cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class);
+      vim = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);
       return Response.ok(vim).build();
     } catch (Exception e) {
       e.printStackTrace();
@@ -94,6 +118,44 @@ public class VimManagerWrapper {
     
   }
   
+  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);
+    }
+    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());
+    }
+    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;
+    }
+  }
+  
   public Response delVim(String vimId) {
     //TODO
     return Response.noContent().build();