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=b20116c8786328f6b4912b63aa137dbd772f79ba;hb=9fccad8f53ef43026a8632bfb6eabc32849a8c46;hp=b985c20a657ccf38101bc8c92ce7f9feeaee8feb;hpb=81d6090fdc1ad05afc785368e1a4029858265884;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 b985c20..b20116c 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,15 +19,22 @@ import java.util.ArrayList;
 
 import javax.ws.rs.core.Response;
 
-import org.onap.aai.esr.entity.rest.RegisterResponse;
+import org.onap.aai.esr.entity.aai.CloudRegion;
 import org.onap.aai.esr.entity.rest.VimRegisterInfo;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
+import org.onap.aai.esr.entity.rest.VimRegisterResponse;
+import org.onap.aai.esr.externalservice.aai.CloudRegionProxy;
+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 final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
 
   /**
    * get VimManagerWrapper instance.
@@ -38,12 +45,26 @@ public class VimManagerWrapper {
       vimManagerWrapper = new VimManagerWrapper();
     }
     return vimManagerWrapper;
+    
   }
   
-  public Response registerVim(VimRegisterInfo vim) {
-    //TODO
-    RegisterResponse result = null;
-    return Response.ok(result).build();
+  public Response registerVim(VimRegisterInfo vimRegisterInfo) {
+    LOG.info("Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
+    CloudRegion cloudRegion = new CloudRegion();
+    VimRegisterResponse result = new VimRegisterResponse();
+    cloudRegion = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+    String cloud_owner = vimRegisterInfo.getCloudOwner();
+    String cloud_region_id = vimRegisterInfo.getCloudRegionId();
+
+    try {
+      CloudRegionProxy.registerVim(cloud_owner, cloud_region_id, cloudRegion);
+      result.setCloudOwner(cloud_owner);
+      result.setCloudRegionId(cloud_region_id);
+      return Response.ok(result).build();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return Response.serverError().build();
+    }
   }
 
   public Response updateVim(VimRegisterInfo vim) {
@@ -57,10 +78,20 @@ public class VimManagerWrapper {
     return Response.ok(vimList).build();
   }
   
-  public Response queryVimById(String vimId) {
+  public Response queryVimById(String cloudOwner, String cloudRegionId) {
     VimRegisterInfo vim = new VimRegisterInfo();
-    //TODO
-    return Response.ok(vim).build();
+    CloudRegion cloudRegion = new CloudRegion();
+    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);
+      return Response.ok(vim).build();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return Response.serverError().build();
+    }
+    
   }
   
   public Response delVim(String vimId) {