X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fresource%2FVimManager.java;h=aa7d34dc780a2efdeb54ee04f3799becedd4852f;hp=8dee4c92d1e3ef2dafdc98bef9bf35eb0eff3cbd;hb=d62f39bb2ee31d0e5c9fd0f26934223d9c2a6539;hpb=2c0e80cac349b7364d5b2b1f0b9650a4cd95ca18

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 8dee4c9..aa7d34d 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
@@ -20,6 +20,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+
 import org.eclipse.jetty.http.HttpStatus;
 import org.onap.aai.esr.entity.rest.VimRegisterInfo;
 import org.onap.aai.esr.util.ExtsysUtil;
@@ -38,12 +40,15 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+@SwaggerDefinition
 @Path("/vims")
 @Api(tags = {" vim Management "})
 public class VimManager {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(VimManager.class);
 
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
+  
   /**
    * query all VIM.
    */
@@ -85,7 +90,7 @@ public class VimManager {
   /**
    * delete vim by id.
    */
-  @Path("/{vimId}")
+  @Path("/{cloudOwner}/{cloudRegionId}")
   @DELETE
   @ApiOperation(value = "delete a vim")
   @ApiResponses(value = {
@@ -96,16 +101,16 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response delvim(@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")
@@ -117,9 +122,9 @@ public class VimManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response updatevims(VimRegisterInfo vim, @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);
   }
   
   /**
@@ -138,7 +143,7 @@ public class VimManager {
           response = String.class)})
   @Timed
   public Response registerVims(VimRegisterInfo vim) {
-    LOGGER.info("start add vim" + " info:" + ExtsysUtil.objectToString(vim));
+    LOGGER.info("start add vim" + " info:" + extsysUtil.objectToString(vim));
     return VimManagerWrapper.getInstance().registerVim(vim);
   }
 }