X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fresource%2FVimManager.java;h=67fcca0d7057e03e85e2a66a2af35e1e6dbf7e87;hb=54c4773879f0a39d463267070679ba3d4022419f;hp=354e3af5743e67377a00bbb165429a170ee97488;hpb=81d6090fdc1ad05afc785368e1a4029858265884;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
index 354e3af..67fcca0 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java
@@ -18,7 +18,6 @@ package org.onap.aai.esr.resource;
 import com.codahale.metrics.annotation.Timed;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.eclipse.jetty.http.HttpStatus;
@@ -48,7 +47,6 @@ public class VimManager {
   /**
    * query all VIM.
    */
-  @Path("")
   @GET
   @ApiOperation(value = "get  all vim ")
   @Produces(MediaType.APPLICATION_JSON)
@@ -61,13 +59,13 @@ public class VimManager {
           response = String.class)})
   @Timed
   public Response queryVimList() {
-    return VimManagerWrapper.getInstance().queryVimList();
+    return VimManagerWrapper.getInstance().queryVimListDetails();
   }
 
   /**
    * query vim by id.
    */
-  @Path("/{vimId}")
+  @Path("/{cloudOwner}/{cloudRegionId}")
   @GET
   @ApiOperation(value = "get vim by id")
   @Produces(MediaType.APPLICATION_JSON)
@@ -79,15 +77,15 @@ 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);
-    return VimManagerWrapper.getInstance().queryVimById(vimId);
+  public Response queryVimById(@PathParam("cloudOwner") String cloudOwner, @PathParam("cloudRegionId") String cloudRegionId) {
+    LOGGER.info("start query vim by cloud owner and cloud region id." + cloudOwner +"," + cloudRegionId);
+    return VimManagerWrapper.getInstance().queryVimById(cloudOwner, cloudRegionId);
   }
   
   /**
    * delete vim by id.
    */
-  @Path("/{vimId}")
+  @Path("/{cloudOwner}/{cloudRegionId}")
   @DELETE
   @ApiOperation(value = "delete a vim")
   @ApiResponses(value = {
@@ -98,16 +96,16 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response delvim(@ApiParam(value = "vim id") @PathParam("vimId") String vimId) {
-    LOGGER.info("start delete vim .id:" + vimId);
-    return VimManagerWrapper.getInstance().delVim(vimId);
+  public Response delvim(@PathParam("cloudOwner") String cloudOwner,@PathParam("cloudRegionId") String cloudRegionId) {
+    LOGGER.info("start delete cloud-owner :" + cloudOwner +", cloud-region-id: " + cloudRegionId);
+    return VimManagerWrapper.getInstance().delVim(cloudOwner, cloudRegionId);
   }
   
   /**
    * update vim by id.
    */
   @PUT
-  @Path("/{vimId}")
+  @Path("/{cloudOwner}/{cloudRegionId}")
   @Consumes(MediaType.APPLICATION_JSON)
   @Produces(MediaType.APPLICATION_JSON)
   @ApiOperation(value = "update a vim")
@@ -119,17 +117,15 @@ 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) VimRegisterInfo vim,
-      @ApiParam(value = "vim id", required = true) @PathParam("vimId") String vimId) {
-    LOGGER.info("start update vim .id:" + vimId + " info:" + ExtsysUtil.objectToString(vim));
-    return VimManagerWrapper.getInstance().updateVim(vim);
+  public Response updatevims(@PathParam("cloudOwner") String cloudOwner, @PathParam("cloudRegionId") String cloudRegionId, VimRegisterInfo vim) {
+    LOGGER.info("start update vim info:" + ExtsysUtil.objectToString(vim));
+    return VimManagerWrapper.getInstance().updateVim(cloudOwner, cloudRegionId, vim);
   }
   
   /**
    * register vim .
    */
   @POST
-  @Path("")
   @Consumes(MediaType.APPLICATION_JSON)
   @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON})
   @ApiOperation(value = "create a vim")
@@ -141,7 +137,7 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response registerVims(@ApiParam(value = "vim", required = true) VimRegisterInfo vim) {
+  public Response registerVims(VimRegisterInfo vim) {
     LOGGER.info("start add vim" + " info:" + ExtsysUtil.objectToString(vim));
     return VimManagerWrapper.getInstance().registerVim(vim);
   }