Change method objectToString to un-static.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / resource / VimManager.java

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..75fc10b 100644 (file)
--- 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
@@ -44,6 +44,8 @@ public class VimManager {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(VimManager.class);
 
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
+  
   /**
    * query all VIM.
    */
@@ -85,7 +87,7 @@ public class VimManager {
   /**
    * delete vim by id.
    */
-  @Path("/{vimId}")
+  @Path("/{cloudOwner}/{cloudRegionId}")
   @DELETE
   @ApiOperation(value = "delete a vim")
   @ApiResponses(value = {
@@ -96,16 +98,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 +119,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 +140,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);
   }
 }