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%2FVnfmManager.java;h=893b5b543a40d727b77249234902d9aa2e2c61b3;hp=690421e74355a74ab459b6c7616d51bf6c83007e;hb=d62f39bb2ee31d0e5c9fd0f26934223d9c2a6539;hpb=91e4d4835374d407f8a31b61f2cd601a259b13b1

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
index 690421e..893b5b5 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java
@@ -21,8 +21,10 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 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.VnfmRestData;
+import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
 import org.onap.aai.esr.util.ExtsysUtil;
 import org.onap.aai.esr.wrapper.VnfmManagerWrapper;
 import org.slf4j.Logger;
@@ -39,16 +41,18 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+@SwaggerDefinition
 @Path("/vnfms")
 @Api(tags = {" vnfm Management "})
 public class VnfmManager {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(VnfmManager.class);
 
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
+  
   /**
    * query all vnfm.
    */
-  @Path("")
   @GET
   @ApiOperation(value = "get  all vnfm ")
   @Produces(MediaType.APPLICATION_JSON)
@@ -120,9 +124,9 @@ public class VnfmManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response updateVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm,
+  public Response updateVnfm(@ApiParam(value = "vnfm", required = true) VnfmRegisterInfo vnfm,
       @ApiParam(value = "vnfm id", required = true) @PathParam("vnfmId") String vnfmId) {
-    LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + ExtsysUtil.objectToString(vnfm));
+    LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + extsysUtil.objectToString(vnfm));
     return VnfmManagerWrapper.getInstance().updateVnfm(vnfm, vnfmId);
   }
   
@@ -130,7 +134,6 @@ public class VnfmManager {
    * add  vnfm .
    */
   @POST
-  @Path("")
   @Consumes(MediaType.APPLICATION_JSON)
   @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON})
   @ApiOperation(value = "create a vnfm")
@@ -142,7 +145,7 @@ public class VnfmManager {
       @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
           response = String.class)})
   @Timed
-  public Response registerVnfm(@ApiParam(value = "vnfm", required = true) VnfmRestData vnfm) {
+  public Response registerVnfm(@ApiParam(value = "vnfm", required = true) VnfmRegisterInfo vnfm) {
     return VnfmManagerWrapper.getInstance().registerVnfm(vnfm);
   }
 }