From 16e963509621830d8828054750f9512b535b1948 Mon Sep 17 00:00:00 2001 From: Zi Li Date: Fri, 17 Aug 2018 09:01:21 +0000 Subject: [PATCH] Add the framework for PNF registration function Issue-ID: AAI-1494 Change-Id: I1e10328fbd2efeabe5f9a9f26e7d9b818db88ab1 Signed-off-by: Zi Li --- .../src/main/java/org/onap/aai/esr/ExtsysApp.java | 2 + .../onap/aai/esr/entity/rest/PnfRegisterInfo.java | 20 +++ .../java/org/onap/aai/esr/resource/PnfManager.java | 142 +++++++++++++++++++++ .../onap/aai/esr/wrapper/PnfManagerWrapper.java | 91 +++++++++++++ 4 files changed, 255 insertions(+) create mode 100644 esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/PnfRegisterInfo.java create mode 100644 esr-mgr/src/main/java/org/onap/aai/esr/resource/PnfManager.java create mode 100644 esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java index 401a1b7..290df15 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java @@ -19,6 +19,7 @@ package org.onap.aai.esr; import org.onap.aai.esr.common.MsbConfig; import org.onap.aai.esr.externalservice.msb.MsbHelper; import org.onap.aai.esr.resource.EmsManager; +import org.onap.aai.esr.resource.PnfManager; import org.onap.aai.esr.resource.ServiceTest; import org.onap.aai.esr.resource.ThirdpartySdncManager; import org.onap.aai.esr.resource.VimManager; @@ -57,6 +58,7 @@ public class ExtsysApp extends Application { environment.jersey().register(new ThirdpartySdncManager()); environment.jersey().register(new VimManager()); environment.jersey().register(new VnfmManager()); + environment.jersey().register(new PnfManager()); environment.jersey().register(new ServiceTest()); initSwaggerConfig(environment, configuration); if ("false".equals(configuration.getRegistByHand())) { diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/PnfRegisterInfo.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/PnfRegisterInfo.java new file mode 100644 index 0000000..242cb11 --- /dev/null +++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/PnfRegisterInfo.java @@ -0,0 +1,20 @@ +/** + * Copyright 2018 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onap.aai.esr.entity.rest; + +public class PnfRegisterInfo { + +} diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/PnfManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/PnfManager.java new file mode 100644 index 0000000..15a6935 --- /dev/null +++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/PnfManager.java @@ -0,0 +1,142 @@ +/** + * Copyright 2018 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onap.aai.esr.resource; + +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import org.eclipse.jetty.http.HttpStatus; +import org.onap.aai.esr.entity.rest.PnfRegisterInfo; +import org.onap.aai.esr.util.ExtsysUtil; +import org.onap.aai.esr.wrapper.PnfManagerWrapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +@Path("/pnfs") +@Api(tags = {" PNF Management "}) +public class PnfManager { + + private static final Logger LOGGER = LoggerFactory.getLogger(PnfManager.class); + + private static ExtsysUtil extsysUtil = new ExtsysUtil(); + + /** + * query all pnf. + */ + @GET + @ApiOperation(value = "get all pnf ") + @Produces(MediaType.APPLICATION_JSON) + @ApiResponses(value = { + @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response = String.class), + @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, + message = "Unprocessable MicroServiceInfo Entity ", response = String.class), + @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error", + response = String.class)}) + @Timed + public Response queryPnfList() { + LOGGER.info("start query all pnf!"); + return PnfManagerWrapper.getInstance().queryPnfList(); + } + + /** + * query pnf by id. + */ + @Path("/{pnfId}") + @GET + @ApiOperation(value = "get pnf by id") + @Produces(MediaType.APPLICATION_JSON) + @ApiResponses(value = { + @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response = String.class), + @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, + message = "Unprocessable MicroServiceInfo Entity ", response = String.class), + @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error", + response = String.class)}) + @Timed + public Response queryPnfById(@ApiParam(value = "pnf id") @PathParam("pnfId") String pnfId) { + LOGGER.info("start query pnf by id." + pnfId); + return PnfManagerWrapper.getInstance().queryPnfById(pnfId); + } + + /** + * delete pnf by id. + */ + @Path("/{pnfId}") + @DELETE + @ApiOperation(value = "delete a pnf") + @ApiResponses(value = { + @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response = String.class), + @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, + message = "Unprocessable MicroServiceInfo Entity ", response = String.class), + @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error", + response = String.class)}) + @Timed + public Response delPnf(@ApiParam(value = "pnf id") @PathParam("pnfId") String pnfId) { + LOGGER.info("start delete pnf .id:" + pnfId); + return PnfManagerWrapper.getInstance().delPnf(pnfId); + } + + /** + * update pnf by id. + */ + @PUT + @Path("/{pnfId}") + @Consumes(MediaType.APPLICATION_JSON) + @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON}) + @ApiOperation(value = "update a pnf") + @ApiResponses(value = { + @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response = String.class), + @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, + message = "Unprocessable MicroServiceInfo Entity ", response = String.class), + @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error", + response = String.class)}) + @Timed + public Response updatePnf(@ApiParam(value = "pnf", required = true) PnfRegisterInfo pnf, + @ApiParam(value = "pnf id", required = true) @PathParam("pnfId") String pnfId) { + LOGGER.info("start update pnf .id:" + pnfId + " info:" + extsysUtil.objectToString(pnf)); + return PnfManagerWrapper.getInstance().updatePnf(pnf, pnfId); + } + + /** + * add pnf . + */ + @POST + @Consumes(MediaType.APPLICATION_JSON) + @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON}) + @ApiOperation(value = "create a pnf") + @ApiResponses(value = { + @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response = String.class), + @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, + message = "Unprocessable MicroServiceInfo Entity ", response = String.class), + @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "internal server error", + response = String.class)}) + @Timed + public Response registerPnf(@ApiParam(value = "pnf", required = true) PnfRegisterInfo pnf) { + return PnfManagerWrapper.getInstance().registerPnf(pnf); + } +} diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java new file mode 100644 index 0000000..b363c04 --- /dev/null +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/PnfManagerWrapper.java @@ -0,0 +1,91 @@ +/** + * Copyright 2018 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onap.aai.esr.wrapper; + +import javax.ws.rs.core.Response; +import org.onap.aai.esr.entity.rest.PnfRegisterInfo; +import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PnfManagerWrapper { + private static PnfManagerWrapper pnfManagerWrapper; + private static final Logger LOG = LoggerFactory.getLogger(PnfManagerWrapper.class); + +// private static PnfManagerUtil pnfManagerUtil = new PnfManagerUtil(); + private static ExternalSystemProxy externalSystemProxy = new ExternalSystemProxy(); + + /** + * get PnfManagerWrapper instance. + * + * @return pnf manager wrapper instance + */ + public static PnfManagerWrapper getInstance() { + if (pnfManagerWrapper == null) { + pnfManagerWrapper = new PnfManagerWrapper(externalSystemProxy); + } + return pnfManagerWrapper; + } + + public PnfManagerWrapper(ExternalSystemProxy externalSystemProxy){ + PnfManagerWrapper.externalSystemProxy = externalSystemProxy; + } + + /** + * @return + */ + public Response queryPnfList() { + // TODO Auto-generated method stub + return null; + } + + /** + * @param pnfId + * @return + */ + public Response queryPnfById(String pnfId) { + // TODO Auto-generated method stub + return null; + } + + /** + * @param pnfId + * @return + */ + public Response delPnf(String pnfId) { + // TODO Auto-generated method stub + return null; + } + + /** + * @param pnf + * @param pnfId + * @return + */ + public Response updatePnf(PnfRegisterInfo pnf, String pnfId) { + // TODO Auto-generated method stub + return null; + } + + /** + * @param pnf + * @return + */ + public Response registerPnf(PnfRegisterInfo pnf) { + // TODO Auto-generated method stub + return null; + } +} -- 2.16.6