Define the VIM manage API.

Change-Id: Ied1c9f77071ef01ffc6cab7bd626080695a46c7f
Issue-ID: AAI-251
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
index 15e5198..5e049c4 100644 (file)
--- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
@@ -28,6 +28,7 @@ import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.handle.VimHandler;
 import org.onap.aai.esr.util.ExtsysUtil;
 import org.onap.aai.esr.util.RestResponseUtil;
+import org.onap.aai.esr.wrapper.VimManagerWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,28 +67,8 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response queryvimList() {
-    LOGGER.info("start query all vim!");
-    List<VimData> list;
-    try {
-      list = handler.getAll();
-    } catch (ExtsysException error) {
-      LOGGER.error("query all vim failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    if (list == null || list.size() <= 0) {
-      LOGGER.info("query all vim end.no match condition record");
-      return RestResponseUtil.getSuccessResponse(new ArrayList<VimRestData>());
-    } else {
-      LOGGER.info("query all vim end.size:" + list.size());
-      ArrayList<VimRestData> restList = new ArrayList<VimRestData>();
-      for (int i = 0; i < list.size(); i++) {
-//        restList.add(new VimRestData(list.get(i)));
-        restList.add(new VimRestData());
-      }
-      return RestResponseUtil.getSuccessResponse(restList);
-    }
-
+  public Response queryVimList() {
+    return VimManagerWrapper.getInstance().queryVimList();
   }
 
   /**
@@ -105,23 +86,9 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response queryvimById(@ApiParam(value = "vim id") @PathParam("vimId") String vimId) {
-    LOGGER.info("start query  vim by id." + vimId);
-    List<VimData> list;
-    try {
-      list = handler.getVimById(vimId);
-    } catch (ExtsysException error) {
-      LOGGER.error("query  vim failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    if (list == null || list.size() <= 0) {
-      LOGGER.info("query  vim end.no match condition record");
-      return RestResponseUtil.getSuccessResponse(null);
-    } else {
-      LOGGER.info("query  vim end.info:" + ExtsysUtil.objectToString(list));
-//      return RestResponseUtil.getSuccessResponse(new VimRestData(list.get(0)));
-      return RestResponseUtil.getSuccessResponse(new VimRestData());
-    }
+  public Response queryVimById(@ApiParam(value = "vim id") @PathParam("vimId") String vimId) {
+    LOGGER.info("start query vim by id." + vimId);
+    return VimManagerWrapper.getInstance().queryVimById(vimId);
   }
   
   /**
@@ -140,14 +107,7 @@ public class VimManager {
   @Timed
   public Response delvim(@ApiParam(value = "vim id") @PathParam("vimId") String vimId) {
     LOGGER.info("start delete vim .id:" + vimId);
-    try {
-      handler.delete(vimId);
-    } catch (ExtsysException error) {
-      LOGGER.error("delete vim failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    LOGGER.info(" delete vim end !");
-    return Response.noContent().build();
+    return VimManagerWrapper.getInstance().delVim(vimId);
   }
   
   /**
@@ -166,23 +126,14 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response updatevims(@ApiParam(value = "vim", required = true) VimData vim,
+  public Response updatevims(@ApiParam(value = "vim", required = true) VimRestData vim,
       @ApiParam(value = "vim id", required = true) @PathParam("vimId") String vimId) {
     LOGGER.info("start update vim .id:" + vimId + " info:" + ExtsysUtil.objectToString(vim));
-    VimData newData;
-    try {
-      newData = handler.update(vim, vimId);
-    } catch (ExtsysException error) {
-      LOGGER.error("update vim failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    LOGGER.info(" update vim end !");
-//    return RestResponseUtil.getSuccessResponse(new VimRestData(newData));
-    return RestResponseUtil.getSuccessResponse(new VimRestData());
+    return VimManagerWrapper.getInstance().updateVim(vim);
   }
   
   /**
-   * add vim .
+   * register vim .
    */
   @POST
   @Path("")
@@ -197,17 +148,8 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response addvims(@ApiParam(value = "vim", required = true) VimData vim) {
+  public Response registerVims(@ApiParam(value = "vim", required = true) VimRestData vim) {
     LOGGER.info("start add vim" + " info:" + ExtsysUtil.objectToString(vim));
-    VimData vimData;
-    try {
-      vimData = handler.add(vim);
-    } catch (ExtsysException error) {
-      LOGGER.error("add vim failed.errorMsg:" + error.getErrorMsg());
-      return RestResponseUtil.getErrorResponse(error);
-    }
-    LOGGER.info(" add vim end !");
-//    return RestResponseUtil.getCreateSussceeResponse(new VimRestData(vimData));
-    return RestResponseUtil.getCreateSussceeResponse(new VimRestData());
+    return VimManagerWrapper.getInstance().registerVim(vim);
   }
 }

diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
index 7b4ee8e..842feb2 100644 (file)
--- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
@@ -31,7 +31,7 @@ public class EmsManagerWrapper {
 
   /**
    * get VnfmManagerWrapper instance.
-   * @return vnfm manager wrapper instance
+   * @return ems manager wrapper instance
    */
   public static EmsManagerWrapper getInstance() {
     if (emsManagerWrapper == null) {

diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
new file mode 100644 (file)
index 0000000..75cc4fc
--- /dev/null
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.wrapper;
+
+import java.util.ArrayList;
+
+import javax.ws.rs.core.Response;
+
+import org.onap.aai.esr.entity.rest.RegisterResponse;
+import org.onap.aai.esr.entity.rest.VimRestData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class VimManagerWrapper {
+
+  private static VimManagerWrapper vimManagerWrapper;
+  private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
+
+  /**
+   * get VimManagerWrapper instance.
+   * @return vim manager wrapper instance
+   */
+  public static VimManagerWrapper getInstance() {
+    if (vimManagerWrapper == null) {
+      vimManagerWrapper = new VimManagerWrapper();
+    }
+    return vimManagerWrapper;
+  }
+  
+  public Response registerVim(VimRestData vim) {
+    //TODO
+    RegisterResponse result = null;
+    return Response.ok(result).build();
+  }
+
+  public Response updateVim(VimRestData vim) {
+    //TODO
+    return Response.ok().build();
+  }
+  
+  public Response queryVimList() {
+    //TODO
+    ArrayList<VimRestData> vimList = new ArrayList<VimRestData>();
+    return Response.ok(vimList).build();
+  }
+  
+  public Response queryVimById(String vimId) {
+    VimRestData vim = new VimRestData();
+    //TODO
+    return Response.ok(vim).build();
+  }
+  
+  public Response delVim(String vimId) {
+    //TODO
+    return Response.noContent().build();
+  }
+}