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;
-import org.onap.aai.esr.entity.rest.VimRestData;
+import org.onap.aai.esr.entity.rest.VimRegisterInfo;
import org.onap.aai.esr.util.ExtsysUtil;
import org.onap.aai.esr.wrapper.VimManagerWrapper;
import org.slf4j.Logger;
/**
* query all VIM.
*/
- @Path("")
@GET
@ApiOperation(value = "get all vim ")
@Produces(MediaType.APPLICATION_JSON)
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)
@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 = {
@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")
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- 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));
- 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")
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error",
response = String.class)})
@Timed
- public Response registerVims(@ApiParam(value = "vim", required = true) VimRestData vim) {
+ public Response registerVims(VimRegisterInfo vim) {
LOGGER.info("start add vim" + " info:" + ExtsysUtil.objectToString(vim));
return VimManagerWrapper.getInstance().registerVim(vim);
}