diff options
Diffstat (limited to 'src/main')
37 files changed, 3263 insertions, 0 deletions
diff --git a/src/main/java/io/swagger/api/Bootstrap.java b/src/main/java/io/swagger/api/Bootstrap.java new file mode 100644 index 0000000..71be330 --- /dev/null +++ b/src/main/java/io/swagger/api/Bootstrap.java @@ -0,0 +1,52 @@ +package io.swagger.api; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.jaxrs.config.SwaggerContextService; +import io.swagger.models.*; + +import io.swagger.models.auth.*; + +import javax.servlet.http.HttpServlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + +public class Bootstrap extends HttpServlet { + @Override + public void init(ServletConfig config) throws ServletException { + Info info = new Info() + .title("Swagger Server") + .description("DCAE Inventory is a web service that provides the following:\n\n1. Real-time data on all DCAE services and their components\n2. Comprehensive details on available DCAE service types\n") + .termsOfService("") + .license(new License() + .name("") + .url("")); + + ServletContext context = config.getServletContext(); + Swagger swagger = new Swagger().info(info); + + new SwaggerContextService().withServletConfig(config).updateSwagger(swagger); + } +} diff --git a/src/main/java/io/swagger/api/factories/DcaeServiceTypesApiServiceFactory.java b/src/main/java/io/swagger/api/factories/DcaeServiceTypesApiServiceFactory.java new file mode 100644 index 0000000..ba583b8 --- /dev/null +++ b/src/main/java/io/swagger/api/factories/DcaeServiceTypesApiServiceFactory.java @@ -0,0 +1,38 @@ +package io.swagger.api.factories; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.api.DcaeServiceTypesApiService; +import io.swagger.api.impl.DcaeServiceTypesApiServiceImpl; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z") +public class DcaeServiceTypesApiServiceFactory { + + private final static DcaeServiceTypesApiService service = new DcaeServiceTypesApiServiceImpl(); + + public static DcaeServiceTypesApiService getDcaeServiceTypesApi() + { + return service; + } +} diff --git a/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java b/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java new file mode 100644 index 0000000..6bd06a0 --- /dev/null +++ b/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java @@ -0,0 +1,57 @@ +package io.swagger.api.factories; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.clients.DCAEControllerClient; +import org.openecomp.dcae.inventory.clients.DatabusControllerClient; +import io.swagger.api.DcaeServicesApiService; +import io.swagger.api.impl.DcaeServicesApiServiceImpl; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z") +public class DcaeServicesApiServiceFactory { + + // Yes I agree this code is not great and I blame for Swagger for putting me in this spot. + private static DCAEControllerClient dcaeControllerClient; + private static DatabusControllerClient databusControllerClient; + + public static void setDcaeControllerClient(DCAEControllerClient dcaeControllerClient) { + DcaeServicesApiServiceFactory.dcaeControllerClient = dcaeControllerClient; + } + + public static void setDatabusControllerClient(DatabusControllerClient databusControllerClient) { + DcaeServicesApiServiceFactory.databusControllerClient = databusControllerClient; + } + + public static DcaeServicesApiService getDcaeServicesApi() { + // TODO: Hide these exceptions behind a custom exception. This should be fatal. + if (dcaeControllerClient == null) { + throw new RuntimeException("DCAE controller client not configured"); + } + if (databusControllerClient == null) { + throw new RuntimeException("Databus controller client not configured"); + } + return new DcaeServicesApiServiceImpl(dcaeControllerClient, databusControllerClient); + } + +} diff --git a/src/main/java/io/swagger/api/factories/DcaeServicesGroupbyApiServiceFactory.java b/src/main/java/io/swagger/api/factories/DcaeServicesGroupbyApiServiceFactory.java new file mode 100644 index 0000000..43cdcb6 --- /dev/null +++ b/src/main/java/io/swagger/api/factories/DcaeServicesGroupbyApiServiceFactory.java @@ -0,0 +1,38 @@ +package io.swagger.api.factories; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.api.DcaeServicesGroupbyApiService; +import io.swagger.api.impl.DcaeServicesGroupbyApiServiceImpl; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z") +public class DcaeServicesGroupbyApiServiceFactory { + + private final static DcaeServicesGroupbyApiService service = new DcaeServicesGroupbyApiServiceImpl(); + + public static DcaeServicesGroupbyApiService getDcaeServicesGroupbyApi() + { + return service; + } +} diff --git a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java new file mode 100644 index 0000000..261f52c --- /dev/null +++ b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java @@ -0,0 +1,222 @@ +package io.swagger.api.impl; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO; +import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; +import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import io.swagger.api.*; +import io.swagger.model.*; + +import io.swagger.api.NotFoundException; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.Query; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.core.UriInfo; +import java.util.ArrayList; +import java.util.List; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z") +public class DcaeServiceTypesApiServiceImpl extends DcaeServiceTypesApiService { + + private final static Logger LOG = LoggerFactory.getLogger(DcaeServiceTypesApiServiceImpl.class); + private static int PAGINATION_PAGE_SIZE = 25; + + private DCAEServiceType createDCAEServiceType(DCAEServiceTypeObject serviceTypeObject, UriInfo uriInfo) { + DCAEServiceType serviceType = new DCAEServiceType(); + serviceType.setSelfLink(DcaeServiceTypesApi.buildLinkForGet(uriInfo, "self", serviceTypeObject.getTypeName())); + serviceType.setTypeName(serviceTypeObject.getTypeName()); + serviceType.setOwner(serviceTypeObject.getOwner()); + serviceType.setVnfTypes(serviceTypeObject.getVnfTypes()); + serviceType.setServiceIds(serviceTypeObject.getServiceIds()); + serviceType.setServiceLocations(serviceTypeObject.getServiceLocations()); + serviceType.setBlueprintTemplate(serviceTypeObject.getBlueprintTemplate()); + serviceType.created(serviceTypeObject.getCreated().toDate()); + + return serviceType; + } + + @Override + public Response dcaeServiceTypesGet(String vnfType, String serviceId, String serviceLocation, Integer offset, UriInfo uriInfo, + SecurityContext securityContext) + throws NotFoundException { + List<DCAEServiceTypeObject> serviceTypeObjects = new ArrayList<>(); + + // TODO: Make this variable also a URL parameter. + DateTime createdCutoff = DateTime.now(DateTimeZone.UTC); + + try (Handle jdbiHandle = InventoryDAOManager.getInstance().getHandle()) { + StringBuilder sb = new StringBuilder("select * from dcae_service_types"); + + List<String> whereClauses = new ArrayList<String>(); + + if (vnfType != null) { + whereClauses.add(":vnfType = any(vnf_types)"); + } + + if (serviceId != null) { + whereClauses.add("(:serviceId = any(service_ids) or service_ids = \'{}\' or service_ids is null)"); + } + + if (serviceLocation != null) { + whereClauses.add("(:serviceLocation = any(service_locations) or service_locations = \'{}\' or service_locations is null)"); + } + + whereClauses.add("created < :createdCutoff"); + // We only want the active service types + whereClauses.add("is_active = TRUE"); + + if (!whereClauses.isEmpty()) { + sb.append(" where "); + sb.append(String.join(" and ", whereClauses)); + } + + // Sort by created timestamp - always descending. + sb.append(" order by created desc"); + + Query<DCAEServiceTypeObject> query = jdbiHandle.createQuery(sb.toString()).map(new DCAEServiceTypeObjectMapper()); + + if (vnfType != null) { + query.bind("vnfType", vnfType); + } + + if (serviceId != null) { + query.bind("serviceId", serviceId); + } + + if (serviceLocation != null) { + query.bind("serviceLocation", serviceLocation); + } + + query.bind("createdCutoff", createdCutoff); + + serviceTypeObjects = query.list(); + } + + offset = (offset == null) ? 0 : offset; + + Integer totalCount = serviceTypeObjects.size(); + + // See comment in DcaeServicesApiServiceImpl.java above similar code. + Integer endpoint = Math.min(offset + PAGINATION_PAGE_SIZE, totalCount); + List<DCAEServiceTypeObject> serviceTypeObjectsSliced = serviceTypeObjects.subList(offset, endpoint); + + List<DCAEServiceType> serviceTypes = new ArrayList<>(); + + for (DCAEServiceTypeObject serviceTypeObject : serviceTypeObjectsSliced) { + serviceTypes.add(createDCAEServiceType(serviceTypeObject, uriInfo)); + } + + InlineResponse200 response = new InlineResponse200(); + response.setItems(serviceTypes); + response.setTotalCount(totalCount); + + InlineResponse200Links navigationLinks = new InlineResponse200Links(); + Integer offsetPrev = offset - PAGINATION_PAGE_SIZE; + + if (offsetPrev >= 0) { + navigationLinks.setPreviousLink(DcaeServiceTypesApi.buildLinkForGet(uriInfo, "prev", vnfType, offsetPrev)); + } + + Integer offsetNext = offset + PAGINATION_PAGE_SIZE; + + if (offsetNext < totalCount) { + navigationLinks.setNextLink(DcaeServiceTypesApi.buildLinkForGet(uriInfo, "next", vnfType, offsetNext)); + } + + response.setLinks(navigationLinks); + + return Response.ok().entity(response).build(); + } + + @Override + public Response dcaeServiceTypesTypeNameGet(String typeName, UriInfo uriInfo, SecurityContext securityContext) + throws NotFoundException { + DCAEServiceTypesDAO serviceTypesDAO = InventoryDAOManager.getInstance().getDCAEServiceTypesDAO(); + DCAEServiceTypeObject serviceTypeObject = serviceTypesDAO.getByTypeName(typeName); + + if (serviceTypeObject == null) { + return Response.status(Response.Status.NOT_FOUND).build(); + } + + return Response.ok().entity(createDCAEServiceType(serviceTypeObject, uriInfo)).build(); + } + + @Override + public Response dcaeServiceTypesTypeNamePut(String typeName, DCAEServiceTypeRequest request, UriInfo uriInfo, + SecurityContext securityContext) { + DCAEServiceTypesDAO serviceTypesDAO = InventoryDAOManager.getInstance().getDCAEServiceTypesDAO(); + DCAEServiceTypeObject serviceTypeObject = serviceTypesDAO.getByTypeName(typeName); + + if (serviceTypeObject == null) { + // Create object from request + serviceTypeObject = new DCAEServiceTypeObject(); + serviceTypeObject.setTypeName(typeName); + serviceTypeObject.setOwner(request.getOwner()); + serviceTypeObject.setVnfTypes(request.getVnfTypes()); + serviceTypeObject.setServiceIds(request.getServiceIds()); + serviceTypeObject.setServiceLocations(request.getServiceLocations()); + serviceTypeObject.setBlueprintTemplate(request.getBlueprintTemplate()); + serviceTypeObject.setCreated(DateTime.now(DateTimeZone.UTC)); + + serviceTypesDAO.insertNewerVersion(serviceTypeObject); + + return Response.ok().entity(createDCAEServiceType(serviceTypeObject, uriInfo)).build(); + } + + DCAEServicesDAO servicesDAO = InventoryDAOManager.getInstance().getDCAEServicesDAO(); + Integer count = servicesDAO.countByType(DCAEServiceObject.DCAEServiceStatus.RUNNING, typeName); + + LOG.info(String.format("Checked num DCAE services running: %s, %d", typeName, count)); + + // Allow the updating of an existing DCAE service type IFF there are no running DCAE services for this type + + if (count > 0) { + String message = String.format("DCAE services of type %s are still running: %d", typeName, count); + ApiResponseMessage entity = new ApiResponseMessage(ApiResponseMessage.ERROR, message); + return Response.status(Response.Status.CONFLICT).entity(entity).build(); + } else { + serviceTypeObject.setOwner(request.getOwner()); + serviceTypeObject.setVnfTypes(request.getVnfTypes()); + serviceTypeObject.setServiceIds(request.getServiceIds()); + serviceTypeObject.setServiceLocations(request.getServiceLocations()); + serviceTypeObject.setBlueprintTemplate(request.getBlueprintTemplate()); + serviceTypeObject.setCreated(DateTime.now(DateTimeZone.UTC)); + + InventoryDAOManager.getInstance().getDCAEServiceTypeTransactionDAO().upsert(serviceTypeObject); + + return Response.ok().entity(serviceTypeObject).build(); + } + } + +} diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java new file mode 100644 index 0000000..1861688 --- /dev/null +++ b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java @@ -0,0 +1,400 @@ +package io.swagger.api.impl; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.clients.DCAEControllerClient; +import org.openecomp.dcae.inventory.clients.DatabusControllerClient; +import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO; +import org.openecomp.dcae.inventory.daos.DCAEServiceTransactionDAO; +import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; +import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.openecomp.dcae.inventory.exceptions.DCAEControllerClientException; +import org.openecomp.dcae.inventory.exceptions.DatabusControllerClientException; +import io.swagger.api.*; +import io.swagger.model.*; + +import io.swagger.api.NotFoundException; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.Query; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.core.*; +import javax.ws.rs.core.Link; +import java.util.*; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z") +public class DcaeServicesApiServiceImpl extends DcaeServicesApiService { + + private final static Logger LOG = LoggerFactory.getLogger(DcaeServicesApiServiceImpl.class); + private static int PAGINATION_PAGE_SIZE = 25; + private static String COMPONENT_SOURCE_DCAE_CONTROLLER = "DCAECONTROLLER"; + private static String COMPONENT_SOURCE_DATA_BUS_CONTROLLER = "DMAAPCONTROLLER"; + + private final DCAEControllerClient dcaeControllerClient; + private final DatabusControllerClient databusControllerClient; + + private DCAEService createDCAEService(DCAEServiceObject serviceObject, Collection<DCAEServiceComponentObject> componentObjects, + UriInfo uriInfo) { + // TODO: Complete links: come back and do links for vnf + DCAEService service = new DCAEService(); + service.setServiceId(serviceObject.getServiceId()); + service.setSelfLink(DcaeServicesApi.buildLinkForGet(uriInfo, "self", serviceObject.getServiceId())); + service.setTypeLink(DcaeServiceTypesApi.buildLinkForGet(uriInfo, "type", serviceObject.getTypeName())); + service.setCreated(serviceObject.getCreated().toDate()); + service.setModified(serviceObject.getModified().toDate()); + service.setVnfId(serviceObject.getVnfId()); + //service.setVnfLink(vnfLink); + service.setVnfType(serviceObject.getVnfType()); + service.setVnfLocation(serviceObject.getVnfLocation()); + service.setDeploymentRef(serviceObject.getDeploymentRef()); + + List<DCAEServiceComponent> serviceComponents = new ArrayList<DCAEServiceComponent>(); + + for (DCAEServiceComponentObject sco : componentObjects) { + DCAEServiceComponent component = new DCAEServiceComponent(); + component.setComponentId(sco.getComponentId()); + component.setComponentType(sco.getComponentType()); + component.setComponentSource(sco.getComponentSource()); + component.setShareable(sco.getShareable()); + component.setCreated(sco.getCreated().toDate()); + component.setModified(sco.getModified().toDate()); + + // TODO: When putting together the components fail. Should this be a 500 case? + // For now, this is just logged as a warning. + + if (COMPONENT_SOURCE_DCAE_CONTROLLER.equals(sco.getComponentSource().toUpperCase())) { + try { + DCAEControllerClient.ServiceInstance serviceInstance + = this.dcaeControllerClient.getServiceInstance(component.getComponentId()); + component.setStatus(serviceInstance.getStatus()); + // There's no specific location rather its inferred from the tenant + component.setLocation(this.dcaeControllerClient.getLocation(serviceInstance)); + Link componentLink = Link.fromUri(this.dcaeControllerClient.constructResourceURI(sco.getComponentId())) + .rel("component").title(component.getComponentId()).build(); + component.setComponentLink(componentLink); + } catch (DCAEControllerClientException e) { + LOG.warn(String.format("%s, %s", e.getMessage(), sco.toString())); + } + } else if (COMPONENT_SOURCE_DATA_BUS_CONTROLLER.equals(sco.getComponentSource().toUpperCase())) { + try { + if (this.databusControllerClient.isExists(sco.getComponentId())) { + Link componentLink = Link.fromUri(this.databusControllerClient.constructResourceURI(sco.getComponentId())) + .rel("component").title(component.getComponentId()).build(); + component.setComponentLink(componentLink); + } else { + LOG.warn(String.format("Feed/topic does not exist: %s", sco.getComponentId())); + } + } catch (DatabusControllerClientException e) { + LOG.warn(String.format("%s, %s", e.getMessage(), sco.toString())); + } + } else { + LOG.warn(String.format("Handling unknown component source: %s", sco.getComponentSource())); + } + + serviceComponents.add(component); + } + + service.components(serviceComponents); + + return service; + } + + @Override + public Response dcaeServicesGet(String typeName, String vnfId, String vnfType, String vnfLocation, + String componentType, Boolean shareable, DateTime created, Integer offset, + UriInfo uriInfo, SecurityContext securityContext) { + List<DCAEServiceObject> serviceObjects = new ArrayList<>(); + DateTime createdCutoff = (created == null ? DateTime.now(DateTimeZone.UTC) : created); + + LOG.info(String.format("Create time upper bound cutoff: %s", createdCutoff.toString())); + + // Offset is zero-based index + offset = (offset == null) ? 0 : offset; + LOG.info(String.format("Query offset: %d", offset)); + + try (Handle jdbiHandle = InventoryDAOManager.getInstance().getHandle()) { + // WATCH! There is the use of "distinct" here. + StringBuilder sb = new StringBuilder("select distinct ds.* from dcae_services ds"); + sb.append(" join dcae_services_components_maps m on ds.service_id = m.service_id "); + sb.append(" join dcae_service_components dsc on m.component_id = dsc.component_id"); + + List<String> whereClauses = new ArrayList<String>(); + + if (typeName != null) { + whereClauses.add("ds.type_name = :typeName"); + } + + if (vnfId != null) { + whereClauses.add("ds.vnf_id = :vnfId"); + } + + if (vnfType != null) { + whereClauses.add("ds.vnf_type = :vnfType"); + } + + if (vnfLocation != null) { + whereClauses.add("ds.vnf_location = :vnfLocation"); + } + + if (componentType != null) { + whereClauses.add("dsc.component_type = :componentType"); + } + + if (shareable != null) { + whereClauses.add("dsc.shareable = :shareable"); + } + + whereClauses.add("ds.created < :createdCutoff"); + whereClauses.add("ds.status = :serviceStatus"); + + if (!whereClauses.isEmpty()) { + sb.append(" where "); + sb.append(String.join(" and ", whereClauses)); + } + + // Sort by created timestamp - always descending. + sb.append(" order by created desc"); + + Query<DCAEServiceObject> query = jdbiHandle.createQuery(sb.toString()).map(new DCAEServiceObjectMapper()); + + if (typeName != null) { + query.bind("typeName", typeName); + } + + if (vnfId != null) { + query.bind("vnfId", vnfId); + } + + if (vnfType != null) { + query.bind("vnfType", vnfType); + } + + if (vnfLocation != null) { + query.bind("vnfLocation", vnfLocation); + } + + if (componentType != null) { + query.bind("componentType", componentType); + } + + if (shareable != null) { + // NOTE: That the shareable field in the database is actually an integer. + query.bind("shareable", (shareable ? 1 : 0)); + } + + query.bind("createdCutoff", createdCutoff); + // NOTE: This is hardcoded because service status is only used internally. + query.bind("serviceStatus", DCAEServiceObject.DCAEServiceStatus.RUNNING); + + serviceObjects = query.list(); + } + + // NOTE: Chose to do the pagination via in code here rather than in SQL using LIMIT and OFFSET constraints + // because of the need for the global total number of result items. SQL approach would require two queries. + // Going forward, I think the better approach is using SQL because the resultsets may become very large. + // For now I think this approach is OK and actually we do less SQL querying. + Integer endpoint = Math.min(offset + PAGINATION_PAGE_SIZE, serviceObjects.size()); + List<DCAEServiceObject> serviceObjectsSliced = serviceObjects.subList(offset, endpoint); + + DCAEServiceComponentsDAO componentsDAO = InventoryDAOManager.getInstance().getDCAEServiceComponentsDAO(); + List<DCAEService> services = new ArrayList<DCAEService>(); + + for (DCAEServiceObject so : serviceObjectsSliced) { + List<DCAEServiceComponentObject> components = componentsDAO.getByServiceId(so.getServiceId()); + services.add(createDCAEService(so, components, uriInfo)); + } + + InlineResponse2001 response = new InlineResponse2001(); + response.setItems(services); + response.setTotalCount(serviceObjects.size()); + // TODO: Show the total count of items in this response i.e. local count? + + InlineResponse200Links navigationLinks = new InlineResponse200Links(); + Integer offsetPrev = offset - PAGINATION_PAGE_SIZE; + + if (offsetPrev >= 0) { + navigationLinks.setPreviousLink(DcaeServicesApi.buildLinkForGet(uriInfo, "prev", typeName, vnfId, vnfType, + vnfLocation, componentType, shareable, created, offsetPrev)); + } + + Integer offsetNext = offset + PAGINATION_PAGE_SIZE; + + if (offsetNext < serviceObjects.size()) { + navigationLinks.setNextLink(DcaeServicesApi.buildLinkForGet(uriInfo, "next", typeName, vnfId, vnfType, + vnfLocation, componentType, shareable, created, offsetNext)); + } + + response.setLinks(navigationLinks); + + return Response.ok().entity(response).build(); + } + + @Override + public Response dcaeServicesServiceIdGet(String serviceId, UriInfo uriInfo, SecurityContext securityContext) + throws NotFoundException { + DCAEServicesDAO servicesDAO = InventoryDAOManager.getInstance().getDCAEServicesDAO(); + DCAEServiceComponentsDAO componentsDAO = InventoryDAOManager.getInstance().getDCAEServiceComponentsDAO(); + + DCAEServiceObject serviceObject = servicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId); + + if (serviceObject == null) { + throw new NotFoundException(1, String.format("DCAEService not found: %s", serviceId)); + } + + List<DCAEServiceComponentObject> componentObjects = componentsDAO.getByServiceId(serviceId); + DCAEService service = createDCAEService(serviceObject, componentObjects, uriInfo); + + return Response.ok().entity(service).build(); + } + + @Override + public Response dcaeServicesServiceIdPut(String serviceId, DCAEServiceRequest request, UriInfo uriInfo, + SecurityContext securityContext) { + // Check to make sure that the DCAE service type exists + if (InventoryDAOManager.getInstance().getDCAEServiceTypesDAO().getByTypeName(request.getTypeName()) == null) { + String errorMessage = String.format("DCAE service type does not exist: %s", request.getTypeName()); + ApiResponseMessage message = new ApiResponseMessage(ApiResponseMessage.ERROR, errorMessage); + return Response.status(422).entity(message).build(); + } + + // TODO: Check DCAE service components against source services i.e. DCAE controller and data bus controller + // Possibly refuse to process if that check fails. + + DCAEServicesDAO servicesDAO = InventoryDAOManager.getInstance().getDCAEServicesDAO(); + DCAEServiceComponentsDAO componentsDAO = InventoryDAOManager.getInstance().getDCAEServiceComponentsDAO(); + + // NOTE: 1607 is using Postgres v9.3 which does NOT have the upgrade to the INSERT operation that allows for UPSERTs + // Challenge here is make this entire PUT operation atomic. + // TODO: 1607 we are actually using v9.5 which has the UPSERT. Migrate this code to use the UPSERT. + + // Watch! We have to query for services regardless of status because we need to account for "removed" instances + // that get resurrected. + final DCAEServiceObject serviceObjectFromStore = servicesDAO.getByServiceId(serviceId); + final Map<String, DCAEServiceComponentObject> componentObjectsFromStore = new HashMap<String, DCAEServiceComponentObject>(); + + for (DCAEServiceComponentObject componentObject : componentsDAO.getByServiceId(serviceId)) { + componentObjectsFromStore.put(componentObject.getComponentId(), componentObject); + } + + DateTime modified = DateTime.now(DateTimeZone.UTC); + + DCAEServiceTransactionDAO.DCAEServiceTransactionContext transactionContext + = new DCAEServiceTransactionDAO.DCAEServiceTransactionContext(serviceId, modified); + + // 1) Insert/update for DCAEServiceObject + + DCAEServiceObject serviceObjectToSendBack = serviceObjectFromStore; + + if (serviceObjectFromStore == null) { + serviceObjectToSendBack = new DCAEServiceObject(serviceId, request); + serviceObjectToSendBack.setModified(modified); + transactionContext.setServiceObjectToInsert(serviceObjectToSendBack); + } else { + LOG.info(String.format("DCAEServiceObject already exists - updating: %s, %s", + serviceObjectFromStore.getCreated().toString(), + serviceObjectFromStore.getModified().toString())); + + serviceObjectToSendBack = new DCAEServiceObject(serviceObjectFromStore, request); + serviceObjectToSendBack.setModified(modified); + transactionContext.setServiceObjectToUpdate(serviceObjectToSendBack); + } + + // 2) Insert/update DCAEServiceComponentObjects. Components exist independent of the associated DCAE service. + + Map<String, DCAEServiceComponentObject> componentObjectsToSendBack = new HashMap<String, DCAEServiceComponentObject>(); + + for (DCAEServiceComponentRequest requestComponent : request.getComponents()) { + // Have to query the database rather than checking the result of getting by service id because of the + // independence of components and services. A component may already exist even though from a service + // perspective it is seen as "new". + final DCAEServiceComponentObject coExisting = componentsDAO.getByComponentId(requestComponent.getComponentId()); + DCAEServiceComponentObject coToSendBack = null; + + if (coExisting == null) { + // Add new component + coToSendBack = new DCAEServiceComponentObject(requestComponent); + coToSendBack.setModified(modified); + transactionContext.addComponentObjectToInsert(coToSendBack); + } else { + // TODO: Check if the mutable fields have changed before doing the update. + // Update existing component + coToSendBack = new DCAEServiceComponentObject(coExisting, requestComponent); + coToSendBack.setModified(modified); + transactionContext.addComponentObjectToUpdate(coToSendBack); + } + + if (coToSendBack != null) { + componentObjectsToSendBack.put(coToSendBack.getComponentId(), coToSendBack); + } + } + + // 3) Update relationships: add ones that don't exist, delete ones that do exist but no longer should not + + // Add relationships that didn't exist before + for (String componentId : componentObjectsToSendBack.keySet()) { + if (!componentObjectsFromStore.containsKey(componentId)) { + transactionContext.addMappingsToInsert(componentId); + } + } + + // Remove relationships that have been removed + for (String componentId : componentObjectsFromStore.keySet()) { + if (!componentObjectsToSendBack.containsKey(componentId)) { + transactionContext.addMappingsToDelete(componentId); + } + } + + DCAEServiceTransactionDAO transactionDAO = InventoryDAOManager.getInstance().getDCAEServiceTransactionDAO(); + transactionDAO.insert(transactionContext); + + DCAEService service = createDCAEService(serviceObjectToSendBack, componentObjectsToSendBack.values(), uriInfo); + + return Response.ok().entity(service).build(); + } + + public Response dcaeServicesServiceIdDelete(String serviceId, SecurityContext securityContext) throws NotFoundException { + DCAEServicesDAO servicesDAO = InventoryDAOManager.getInstance().getDCAEServicesDAO(); + + if (servicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId) == null) { + throw new NotFoundException(ApiResponseMessage.ERROR, String.format("DCAE service not found: %s", serviceId)); + } + + servicesDAO.updateStatusByServiceId(DateTime.now(DateTimeZone.UTC), DCAEServiceObject.DCAEServiceStatus.REMOVED, + serviceId); + + return Response.ok().build(); + } + + public DcaeServicesApiServiceImpl(DCAEControllerClient dcaeControllerClient, DatabusControllerClient databusControllerClient) { + this.dcaeControllerClient = dcaeControllerClient; + this.databusControllerClient = databusControllerClient; + } + +} diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java new file mode 100644 index 0000000..10bd7fa --- /dev/null +++ b/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java @@ -0,0 +1,106 @@ +package io.swagger.api.impl; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import io.swagger.api.*; +import io.swagger.model.DCAEServiceGroupByResults; +import io.swagger.model.DCAEServiceGroupByResultsPropertyValues; +import org.skife.jdbi.v2.Handle; + +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; +import javax.ws.rs.core.UriInfo; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z") +public class DcaeServicesGroupbyApiServiceImpl extends DcaeServicesGroupbyApiService { + + @Override + public Response dcaeServicesGroupbyPropertyNameGet(String propertyName, UriInfo uriInfo, SecurityContext securityContext) { + String columnName = ""; + + switch (propertyName) { + case "type": + columnName = "type_name"; + break; + case "vnfLocation": + columnName = "vnf_location"; + break; + case "vnfType": + columnName = "vnf_type"; + break; + default: + return Response.status(Response.Status.BAD_REQUEST).build(); + } + + List<Map<String, Object>> results = new ArrayList<>(); + + try (Handle jdbiHandle = InventoryDAOManager.getInstance().getHandle()) { + StringBuilder sb = new StringBuilder(); + sb.append(String.format("select %s, count(1) as num ", columnName)); + sb.append(" from dcae_services where status = :serviceStatus"); + sb.append(String.format(" group by %s order by count(1) desc", columnName)); + String queryString = sb.toString(); + + // NOTE: This is hardcoded because service status is only used internally. + results = jdbiHandle.createQuery(queryString).bind("serviceStatus", DCAEServiceObject.DCAEServiceStatus.RUNNING) + .list(); + } + + DCAEServiceGroupByResults response = new DCAEServiceGroupByResults(); + response.setPropertyName(propertyName); + + for (Map<String, Object> result : results) { + DCAEServiceGroupByResultsPropertyValues value = new DCAEServiceGroupByResultsPropertyValues(); + value.setCount(((Long) result.get("num")).intValue()); + String propertyValue = (String) result.get(columnName); + value.setPropertyValue(propertyValue); + + switch (propertyName) { + case "type": + value.setDcaeServiceQueryLink(DcaeServicesApi.buildLinkForGetByTypeName(uriInfo, "dcae_services", + propertyValue)); + break; + case "vnfLocation": + value.setDcaeServiceQueryLink(DcaeServicesApi.buildLinkForGetByVnfLocation(uriInfo, "dcae_services", + propertyValue)); + break; + case "vnfType": + value.setDcaeServiceQueryLink(DcaeServicesApi.buildLinkForGetByVnfType(uriInfo, "dcae_services", + propertyValue)); + break; + default: + return Response.status(Response.Status.BAD_REQUEST).build(); + } + + response.getPropertyValues().add(value); + } + + return Response.ok().entity(response).build(); + } +} diff --git a/src/main/java/org/openecomp/dcae/inventory/InventoryApplication.java b/src/main/java/org/openecomp/dcae/inventory/InventoryApplication.java new file mode 100644 index 0000000..9a16331 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/InventoryApplication.java @@ -0,0 +1,144 @@ +package org.openecomp.dcae.inventory; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.clients.DCAEControllerClient; +import org.openecomp.dcae.inventory.clients.DatabusControllerClient; +import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.openecomp.dcae.inventory.dbthings.StringListArgument; +import org.openecomp.dcae.inventory.exceptions.mappers.DCAEControllerConnectionExceptionMapper; +import org.openecomp.dcae.inventory.exceptions.mappers.DCAEControllerTimeoutExceptionMapper; +import org.openecomp.dcae.inventory.providers.NotFoundExceptionMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import io.dropwizard.Application; +import io.dropwizard.client.JerseyClientBuilder; +import io.dropwizard.jdbi.DBIFactory; +import io.dropwizard.setup.Bootstrap; +import io.dropwizard.setup.Environment; +import io.swagger.api.DcaeServiceTypesApi; +import io.swagger.api.DcaeServicesApi; +import io.swagger.api.DcaeServicesGroupbyApi; +import io.swagger.api.factories.DcaeServicesApiServiceFactory; +import io.swagger.jaxrs.config.BeanConfig; +import io.swagger.jaxrs.listing.ApiListingResource; +import io.swagger.jaxrs.listing.SwaggerSerializers; +import io.swagger.models.Contact; +import io.swagger.models.Info; +import org.eclipse.jetty.servlets.CrossOriginFilter; +import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; +import org.skife.jdbi.v2.DBI; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.DispatcherType; +import javax.servlet.FilterRegistration; +import javax.ws.rs.client.Client; +import javax.ws.rs.core.Link; +import java.util.EnumSet; + + +/** + * Created by mhwang on 4/11/16. + */ +public class InventoryApplication extends Application<InventoryConfiguration> { + + static final Logger LOG = LoggerFactory.getLogger(InventoryApplication.class); + + public static void main(String[] args) throws Exception { + new InventoryApplication().run(args); + } + + @Override + public String getName() { + return "dcae-inventory"; + } + + @Override + public void initialize(Bootstrap<InventoryConfiguration> bootstrap) { + // This Info object was lifted from the Swagger generated io.swagger.api.Bootstrap file. Although it was not generated + // correctly. + Info info = new Info().title("DCAE Inventory API").version("0.8.0") + .description("DCAE Inventory is a web service that provides the following:\n\n1. Real-time data on all DCAE services and their components\n2. Comprehensive details on available DCAE service types\n"); + // Swagger/servlet/jax-rs magic! + BeanConfig beanConfig = new BeanConfig(); + beanConfig.setInfo(info); + beanConfig.setResourcePackage("io.swagger.api"); + beanConfig.setScan(true); + } + + @Override + public void run(InventoryConfiguration configuration, Environment environment) { + LOG.info("Starting DCAE inventory application"); + LOG.info(String.format("DB driver properties: %s", configuration.getDataSourceFactory().getProperties().toString())); + final DBIFactory factory = new DBIFactory(); + final DBI jdbi = factory.build(environment, configuration.getDataSourceFactory(), "dcae-database"); + jdbi.registerArgumentFactory(new StringListArgument()); + InventoryDAOManager.getInstance().init(jdbi); + + // Add filter for CORS support for DCAE dashboard + // http://jitterted.com/tidbits/2014/09/12/cors-for-dropwizard-0-7-x/ + // https://gist.github.com/yunspace/07d80a9ac32901f1e149#file-dropwizardjettycrossoriginintegrationtest-java-L11 + FilterRegistration.Dynamic filter = environment.servlets().addFilter("CORSFilter", CrossOriginFilter.class); + filter.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*"); + filter.setInitParameter(CrossOriginFilter.ALLOWED_ORIGINS_PARAM, "*"); + filter.setInitParameter(CrossOriginFilter.ALLOWED_HEADERS_PARAM, "Content-Type,Authorization,X-Requested-With,Content-Length,Accept,Origin"); + filter.setInitParameter(CrossOriginFilter.ALLOWED_METHODS_PARAM, "GET,PUT,POST,DELETE,OPTIONS"); + filter.setInitParameter(CrossOriginFilter.ACCESS_CONTROL_ALLOW_ORIGIN_HEADER, "*"); + + // Want to serialize Link in a way we like + SimpleModule simpleModule = new SimpleModule(); + simpleModule.addSerializer(Link.class, new LinkSerializer()); + environment.getObjectMapper().registerModule(simpleModule); + + // Setup DCAE controller client + // Used by the dcae-services API + final Client clientDCAEController = new JerseyClientBuilder(environment).using(configuration.getJerseyClientConfiguration()) + .build("DCAEControllerClient"); + HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder().build(); + clientDCAEController.register(feature); + final DCAEControllerClient dcaeControllerClient = new DCAEControllerClient(clientDCAEController, configuration.getDcaeControllerConnection()); + DcaeServicesApiServiceFactory.setDcaeControllerClient(dcaeControllerClient); + + // Setup Databus controller client + // Used by the dcae-services API + final Client clientDatabusController = new JerseyClientBuilder(environment).using(configuration.getJerseyClientConfiguration()) + .build("DatabusControllerClient"); + final DatabusControllerClient databusControllerClient = new DatabusControllerClient(clientDatabusController, + configuration.getDatabusControllerConnection()); + DcaeServicesApiServiceFactory.setDatabusControllerClient(databusControllerClient); + + environment.jersey().register(NotFoundExceptionMapper.class); + environment.jersey().register(DCAEControllerConnectionExceptionMapper.class); + environment.jersey().register(DCAEControllerTimeoutExceptionMapper.class); + + environment.jersey().register(new DcaeServicesApi()); + environment.jersey().register(new DcaeServiceTypesApi()); + environment.jersey().register(new DcaeServicesGroupbyApi()); + + // https://github.com/swagger-api/swagger-core/wiki/Swagger-Core-Jersey-2.X-Project-Setup-1.5 + environment.jersey().register(new ApiListingResource()); + environment.jersey().register(new SwaggerSerializers()); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/InventoryConfiguration.java b/src/main/java/org/openecomp/dcae/inventory/InventoryConfiguration.java new file mode 100644 index 0000000..54370ee --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/InventoryConfiguration.java @@ -0,0 +1,146 @@ +package org.openecomp.dcae.inventory; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.dropwizard.Configuration; +import io.dropwizard.client.JerseyClientConfiguration; +import io.dropwizard.db.DataSourceFactory; +import org.hibernate.validator.constraints.NotEmpty; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + +/** + * Created by mhwang on 4/11/16. + */ +public class InventoryConfiguration extends Configuration { + + public static class DCAEControllerConnectionConfiguration { + @NotEmpty + @JsonProperty + private String host; + + @NotNull + @JsonProperty + private Integer port; + + @NotEmpty + @JsonProperty + private String basePath; + + @NotEmpty + @JsonProperty + private String user; + + @NotEmpty + @JsonProperty + private String password; + + public String getHost() { + return this.host; + } + + public Integer getPort() { + return this.port; + } + + public String getBasePath() { + return this.basePath; + } + + public String getUser() { + return this.user; + } + + public String getPassword() { + return this.password; + } + } + + public static class DatabusControllerConnectionConfiguration { + @NotEmpty + @JsonProperty + private String host; + + @NotNull + @JsonProperty + private Integer port; + + public String getHost() { + return host; + } + + public Integer getPort() { + return port; + } + } + + @NotEmpty + private String defaultName = "DCAEInventory"; + + @Valid + @NotNull + @JsonProperty + private DataSourceFactory database = new DataSourceFactory(); + + @NotNull + @JsonProperty + private DCAEControllerConnectionConfiguration dcaeControllerConnection = new DCAEControllerConnectionConfiguration(); + + @NotNull + @JsonProperty + private DatabusControllerConnectionConfiguration databusControllerConnection = new DatabusControllerConnectionConfiguration(); + + @NotNull + @JsonProperty + private JerseyClientConfiguration httpClient = new JerseyClientConfiguration(); + + @JsonProperty + public String getDefaultName() { + return defaultName; + } + + @JsonProperty + public void setDefaultName(String name) { + this.defaultName = name; + } + + public DataSourceFactory getDataSourceFactory() { + return this.database; + } + + public DCAEControllerConnectionConfiguration getDcaeControllerConnection() { + return this.dcaeControllerConnection; + } + + public DatabusControllerConnectionConfiguration getDatabusControllerConnection() { + return databusControllerConnection; + } + + public JerseyClientConfiguration getJerseyClientConfiguration() { + return httpClient; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/LinkSerializer.java b/src/main/java/org/openecomp/dcae/inventory/LinkSerializer.java new file mode 100644 index 0000000..8cf07db --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/LinkSerializer.java @@ -0,0 +1,55 @@ +package org.openecomp.dcae.inventory; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import javax.ws.rs.core.Link; +import java.io.IOException; + +/** + * Lifted from + * http://stackoverflow.com/questions/26989004/how-to-serialize-declarative-links-jersey-with-jackson + * + * Created by mhwang on 5/10/16. + */ +public class LinkSerializer extends JsonSerializer<Link> { + + @Override + public void serialize(Link link, JsonGenerator jg, SerializerProvider sp) throws IOException { + jg.writeStartObject(); + + if (link.getTitle() != null) { + jg.writeStringField("title", link.getTitle()); + } + + jg.writeStringField("rel", link.getRel()); + jg.writeStringField("href", link.getUri().toString()); + jg.writeEndObject(); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/clients/DCAEControllerClient.java b/src/main/java/org/openecomp/dcae/inventory/clients/DCAEControllerClient.java new file mode 100644 index 0000000..23e05fd --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/clients/DCAEControllerClient.java @@ -0,0 +1,225 @@ +package org.openecomp.dcae.inventory.clients; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.InventoryConfiguration; +import org.openecomp.dcae.inventory.exceptions.DCAEControllerClientException; +import org.openecomp.dcae.inventory.exceptions.DCAEControllerConnectionException; +import org.openecomp.dcae.inventory.exceptions.DCAEControllerTimeoutException; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.ws.rs.ProcessingException; +import javax.ws.rs.client.Client; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; + +import static org.glassfish.jersey.client.authentication.HttpAuthenticationFeature.*; + +/** + * Created by mhwang on 5/12/16. + */ +public class DCAEControllerClient { + + /** + * Used for JSON objects of the form: + * "hostService": {"$ref": "/services/vm-docker-host-2/instances/mtl2"} + */ + public static class Reference { + + @JsonProperty("$ref") + private String ref; + + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + + } + + /** + * Used for the JSON objects returned from /services/{service id}/instances/{instance id} + * calls. + */ + @JsonIgnoreProperties(ignoreUnknown = true) + public static class ServiceInstance { + + @JsonProperty("status") + private String status; + + /** + * Property points to the Docker host this Docker container runs on. + * This service instance is an application to be run as a Docker container if this value is not null. + */ + @JsonProperty("hostService") + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private Reference hostService; + + /** + * Property points to the CDAP cluster this CDAP application is deployed on. + * This service instance is a CDAP application if this value is not null. + */ + @JsonProperty("clusterService") + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private Reference clusterService; + + /** + * Property points to the location resource that this instance is associated with. + * This property is not null when the service instance is a "pure" VM. + */ + @JsonProperty("location") + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private Reference location; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Reference getHostService() { + return hostService; + } + + public void setHostService(Reference hostService) { + this.hostService = hostService; + } + + public Reference getClusterService() { + return clusterService; + } + + public void setClusterService(Reference clusterService) { + this.clusterService = clusterService; + } + + public Reference getLocation() { + return location; + } + + public void setLocation(Reference location) { + this.location = location; + } + + } + + private final static Logger LOG = LoggerFactory.getLogger(DCAEControllerClient.class); + + private final Client client; + private final InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration; + + public URI constructResourceURI(String resourcePath) { + // TODO: Better way to construct this? + + // Make sure that the resource path has a "/" because the UriBuilder sucks and doesn't do it for us. + if (resourcePath.charAt(0) != '/') { + resourcePath = (new StringBuilder("/")).append(resourcePath).toString(); + } + + StringBuilder actualPath = new StringBuilder("/"); + actualPath.append(this.connectionConfiguration.getBasePath()); + actualPath.append(resourcePath); + + return UriBuilder.fromPath(actualPath.toString()).scheme("http").host(this.connectionConfiguration.getHost()) + .port(this.connectionConfiguration.getPort()).build(); + } + + public ServiceInstance getServiceInstance(String componentId) throws DCAEControllerClientException { + URI uri = constructResourceURI(componentId); + Response response = null; + + try { + response = client.target(uri).request(MediaType.APPLICATION_JSON_TYPE) + .header("Content-Type", "application/json") + .property(HTTP_AUTHENTICATION_BASIC_USERNAME, connectionConfiguration.getUser()) + .property(HTTP_AUTHENTICATION_BASIC_PASSWORD, connectionConfiguration.getPassword()).get(); + } catch (ProcessingException e) { + // Apparently the exceptions are wrapped which is not ideal because many different types of errors are embedded + // in single exception. TODO: May want to come back to split up the errors. + // Example: + // javax.ws.rs.ProcessingException: org.apache.http.conn.ConnectTimeoutException: Connect to aaa.bbb.ccc:9998 + String message = "Connecting with DCAE controller probably timed out"; + LOG.error(message, e); + String exceptionMessage = String.format("%s: %s", message, e.getMessage()); + throw new DCAEControllerTimeoutException(exceptionMessage); + } catch (Exception e) { + String message = "Unexpected connection issue with DCAE controller"; + LOG.error(message, e); + String exceptionMessage = String.format("%s: %s", message, e.getMessage()); + throw new DCAEControllerConnectionException(exceptionMessage); + } + + if (LOG.isDebugEnabled()) { + LOG.debug(String.format("Received response from DCAE controller: %d", response.getStatus())); + } + + if (response.getStatus() == 200) { + ObjectMapper om = new ObjectMapper(); + + try { + return om.readValue((InputStream) response.getEntity(), ServiceInstance.class); + } catch (IOException e) { + throw new DCAEControllerClientException(e); + } + } + + throw new DCAEControllerClientException(String.format("Unexpected error from DCAE controller: %d", response.getStatus())); + } + + public String getLocation(ServiceInstance serviceInstance) { + if (serviceInstance.getLocation() != null) { + return serviceInstance.getLocation().getRef(); + } else if (serviceInstance.getClusterService() != null) { + // Drill down: Location is on the underlying CDAP cluster service instance + String cdapClusterRef = serviceInstance.getClusterService().getRef(); + return getLocation(getServiceInstance(cdapClusterRef)); + } else if (serviceInstance.getHostService() != null) { + // Drill down: Location is on the underlying Docker host service instance + String dockerHostRef = serviceInstance.getHostService().getRef(); + return getLocation(getServiceInstance(dockerHostRef)); + } else { + throw new DCAEControllerClientException("No valid location for service instance"); + } + } + + public DCAEControllerClient(Client client, + InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration) { + this.client = client; + this.connectionConfiguration = connectionConfiguration; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/clients/DatabusControllerClient.java b/src/main/java/org/openecomp/dcae/inventory/clients/DatabusControllerClient.java new file mode 100644 index 0000000..ac3bbf1 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/clients/DatabusControllerClient.java @@ -0,0 +1,89 @@ +package org.openecomp.dcae.inventory.clients; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.InventoryConfiguration; +import org.openecomp.dcae.inventory.exceptions.DatabusControllerClientException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import javax.ws.rs.client.Client; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.Map; + +/** + * Created by mhwang on 5/25/16. + */ +public class DatabusControllerClient { + + private final Client client; + private final InventoryConfiguration.DatabusControllerConnectionConfiguration connectionConfiguration; + + public URI constructResourceURI(String resourcePath) { + // Make sure that the resource path has a "/" because the UriBuilder sucks and doesn't do it for us. + if (resourcePath.charAt(0) != '/') { + resourcePath = (new StringBuilder("/")).append(resourcePath).toString(); + } + + return UriBuilder.fromPath(resourcePath.toString()).scheme("http").host(this.connectionConfiguration.getHost()) + .port(this.connectionConfiguration.getPort()).build(); + } + + // TODO: Actually model the JSON objects so that they can be returned to be used for providing useful information + // and thus change this to a "get". + public boolean isExists(String componentId) throws DatabusControllerClientException { + URI uri = constructResourceURI(componentId); + + Response response = client.target(uri).request(MediaType.APPLICATION_JSON_TYPE) + .header("Content-Type", "application/json").get(); + + if (response.getStatus() == 200) { + ObjectMapper om = new ObjectMapper(); + + try { + Map<String, Object> entity = om.readValue((InputStream) response.getEntity(), + new TypeReference<Map<String, Object>>() {}); + + return (entity != null && entity.size() > 0) ? true : false; + } catch (IOException e) { + throw new DatabusControllerClientException(e); + } + } + + throw new DatabusControllerClientException(String.format("Unexpected error from databus controller: %d", + response.getStatus())); + } + + public DatabusControllerClient(Client client, + InventoryConfiguration.DatabusControllerConnectionConfiguration connectionConfiguration) { + this.client = client; + this.connectionConfiguration = connectionConfiguration; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceComponentsDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceComponentsDAO.java new file mode 100644 index 0000000..d1b5ec0 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceComponentsDAO.java @@ -0,0 +1,65 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceComponentObjectMapper; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.skife.jdbi.v2.sqlobject.Bind; +import org.skife.jdbi.v2.sqlobject.BindBean; +import org.skife.jdbi.v2.sqlobject.SqlQuery; +import org.skife.jdbi.v2.sqlobject.SqlUpdate; +import org.skife.jdbi.v2.sqlobject.customizers.Mapper; + +import java.util.List; + +/** + * Created by mhwang on 4/19/16. + */ +public interface DCAEServiceComponentsDAO extends InventoryDAO { + + @SqlQuery("select exists (select * from information_schema.tables where table_name = \'dcae_service_components\')") + Boolean checkIfTableExists(); + + @SqlUpdate("create table dcae_service_components (component_id varchar not null primary key, component_type varchar not null, " + + "component_source varchar not null, shareable integer default 0, created timestamp not null, modified timestamp not null)") + void createTable(); + + @SqlUpdate("insert into dcae_service_components (component_id, component_type, component_source, shareable, created, modified) " + + "values (:componentId, :componentType, :componentSource, :shareable, :created, :modified)") + void insert(@BindBean DCAEServiceComponentObject componentObject); + + @SqlUpdate("update dcae_service_components set component_type = :componentType, component_source = :componentSource, " + + "shareable = :shareable, modified = :modified where component_id = :componentId") + void update(@BindBean DCAEServiceComponentObject componentObject); + + @Mapper(DCAEServiceComponentObjectMapper.class) + @SqlQuery("select c.* from dcae_services_components_maps m join dcae_service_components c " + + "on m.component_id = c.component_id where m.service_id = :it") + List<DCAEServiceComponentObject> getByServiceId(@Bind String serviceId); + + @Mapper(DCAEServiceComponentObjectMapper.class) + @SqlQuery("select c.* from dcae_service_components c where c.component_id = :it") + DCAEServiceComponentObject getByComponentId(@Bind String componentId); + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTransactionDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTransactionDAO.java new file mode 100644 index 0000000..dc3d6b3 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTransactionDAO.java @@ -0,0 +1,161 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.joda.time.DateTime; +import org.skife.jdbi.v2.sqlobject.CreateSqlObject; +import org.skife.jdbi.v2.sqlobject.Transaction; + +import java.util.ArrayList; +import java.util.List; + +/** + * This is based-off of this blog post. + * http://manikandan-k.github.io/2015/05/10/Transactions_in_jdbi.html + * + * Created by mhwang on 4/21/16. + */ +public abstract class DCAEServiceTransactionDAO { + + public static class DCAEServiceTransactionContext { + + private final String serviceId; + private final DateTime modified; + private DCAEServiceObject serviceObjectToInsert; + private DCAEServiceObject serviceObjectToUpdate; + private List<DCAEServiceComponentObject> componentObjectsToInsert; + private List<DCAEServiceComponentObject> componentObjectsToUpdate; + private List<String> mappingsToInsert; + private List<String> mappingsToDelete; + + public String getServiceId() { + return serviceId; + } + + public DateTime getModified() { + return modified; + } + + public DCAEServiceObject getServiceObjectToInsert() { + return serviceObjectToInsert; + } + + public void setServiceObjectToInsert(DCAEServiceObject serviceObjectToInsert) { + this.serviceObjectToInsert = serviceObjectToInsert; + } + + public DCAEServiceObject getServiceObjectToUpdate() { + return serviceObjectToUpdate; + } + + public void setServiceObjectToUpdate(DCAEServiceObject serviceObjectToUpdate) { + this.serviceObjectToUpdate = serviceObjectToUpdate; + } + + public List<DCAEServiceComponentObject> getComponentObjectsToInsert() { + return componentObjectsToInsert; + } + + public List<DCAEServiceComponentObject> addComponentObjectToInsert(DCAEServiceComponentObject componentObject) { + this.componentObjectsToInsert.add(componentObject); + return this.componentObjectsToInsert; + } + + public List<DCAEServiceComponentObject> getComponentObjectsToUpdate() { + return componentObjectsToUpdate; + } + + public List<DCAEServiceComponentObject> addComponentObjectToUpdate(DCAEServiceComponentObject componentObject) { + this.componentObjectsToUpdate.add(componentObject); + return this.componentObjectsToUpdate; + } + + public List<String> getMappingsToInsert() { + return mappingsToInsert; + } + + public List<String> addMappingsToInsert(String componentId) { + this.mappingsToInsert.add(componentId); + return this.mappingsToInsert; + } + + public List<String> getMappingsToDelete() { + return mappingsToDelete; + } + + public List<String> addMappingsToDelete(String componentId) { + this.mappingsToDelete.add(componentId); + return this.mappingsToDelete; + } + + public DCAEServiceTransactionContext(String serviceId, DateTime modified) { + this.serviceId = serviceId; + this.modified = modified; + this.componentObjectsToInsert = new ArrayList<>(); + this.componentObjectsToUpdate = new ArrayList<>(); + this.mappingsToInsert = new ArrayList<>(); + this.mappingsToDelete = new ArrayList<>(); + } + + } + + @CreateSqlObject + abstract DCAEServicesDAO getServicesDAO(); + + @CreateSqlObject + abstract DCAEServicesComponentsMapsDAO getServicesComponentsMappingDAO(); + + @CreateSqlObject + abstract DCAEServiceComponentsDAO getComponentsDAO(); + + @Transaction + public void insert(DCAEServiceTransactionContext context) { + if (context.getServiceObjectToInsert() != null) { + this.getServicesDAO().insert(context.getServiceObjectToInsert()); + } + + if (context.getServiceObjectToUpdate() != null) { + this.getServicesDAO().update(context.getServiceObjectToUpdate()); + } + + for (DCAEServiceComponentObject sco : context.getComponentObjectsToInsert()) { + this.getComponentsDAO().insert(sco); + } + + for (DCAEServiceComponentObject sco : context.getComponentObjectsToUpdate()) { + this.getComponentsDAO().update(sco); + } + + for (String componentId : context.getMappingsToInsert()) { + this.getServicesComponentsMappingDAO().insert(context.getServiceId(), componentId, context.getModified()); + } + + for (String componentId : context.getMappingsToDelete()) { + this.getServicesComponentsMappingDAO().delete(context.serviceId, componentId); + } + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypeTransactionDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypeTransactionDAO.java new file mode 100644 index 0000000..c3c65e2 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypeTransactionDAO.java @@ -0,0 +1,43 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import org.skife.jdbi.v2.sqlobject.CreateSqlObject; + +/** + * Created by mhwang on 5/19/16. + */ +public abstract class DCAEServiceTypeTransactionDAO { + + @CreateSqlObject + abstract DCAEServiceTypesDAO getServiceTypesDAO(); + + public void upsert(DCAEServiceTypeObject newerVersion) { + // Order of operation is important here! + this.getServiceTypesDAO().deactivateExisting(newerVersion.getTypeName()); + this.getServiceTypesDAO().insertNewerVersion(newerVersion); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypesDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypesDAO.java new file mode 100644 index 0000000..5c961f9 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypesDAO.java @@ -0,0 +1,68 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import org.skife.jdbi.v2.sqlobject.Bind; +import org.skife.jdbi.v2.sqlobject.BindBean; +import org.skife.jdbi.v2.sqlobject.SqlQuery; +import org.skife.jdbi.v2.sqlobject.SqlUpdate; +import org.skife.jdbi.v2.sqlobject.customizers.Mapper; + +/** + * DCAE service type records are treated immutable. Newer versions are added with the flag "is_active" set to TRUE. + * The responsibility of managing the active version on the caller of this DAO. + * + * Currently the "is_active" flag is hidden to the application except in this DAO. + * + * Created by mhwang on 4/19/16. + */ +public interface DCAEServiceTypesDAO extends InventoryDAO { + + @SqlQuery("select exists (select * from information_schema.tables where table_name = \'dcae_service_types\')") + Boolean checkIfTableExists(); + + /** + * Note that service_ids and service_locations are nullable fields. This might not be the right decision but because + * the resource model allows for nulls, thought it should consistent. + */ + @SqlUpdate("create table dcae_service_types (type_name varchar not null, owner varchar not null," + + "vnf_types varchar[] not null, service_ids varchar[], service_locations varchar[], blueprint_template text not null, " + + "created timestamp not null, is_active boolean not null, constraint pk_type_created primary key (type_name, created))") + void createTable(); + + @SqlUpdate("insert into dcae_service_types(type_name, owner, vnf_types, service_ids, service_locations, " + + "blueprint_template, created, is_active) values (:typeName, :owner, :vnfTypes, :serviceIds, :serviceLocations, " + + ":blueprintTemplate, :created, TRUE)") + void insertNewerVersion(@BindBean DCAEServiceTypeObject serviceObject); + + @SqlUpdate("update dcae_service_types set is_active = FALSE where type_name = :typeName and is_active = TRUE") + void deactivateExisting(@Bind("typeName") String typeName); + + @Mapper(DCAEServiceTypeObjectMapper.class) + @SqlQuery("select * from dcae_service_types where is_active = TRUE and type_name = :it") + DCAEServiceTypeObject getByTypeName(@Bind String typeName); + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java new file mode 100644 index 0000000..405476d --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java @@ -0,0 +1,53 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.joda.time.DateTime; +import org.skife.jdbi.v2.sqlobject.Bind; +import org.skife.jdbi.v2.sqlobject.SqlQuery; +import org.skife.jdbi.v2.sqlobject.SqlUpdate; + +/** + * This class manages the joining table called "dcae_services_components_maps" which maps the many-to-many relationship + * between DCAE services and DCAE service components. + * + * Created by mhwang on 4/19/16. + */ +public interface DCAEServicesComponentsMapsDAO extends InventoryDAO { + + @SqlQuery("select exists (select * from information_schema.tables where table_name = \'dcae_services_components_maps\')") + Boolean checkIfTableExists(); + + @SqlUpdate("create table dcae_services_components_maps (service_id varchar not null references dcae_services (service_id), " + + "component_id varchar not null references dcae_service_components (component_id), " + + "created timestamp not null, primary key (service_id, component_id))") + void createTable(); + + @SqlUpdate("insert into dcae_services_components_maps (service_id, component_id, created) values (:serviceId, :componentId, :created)") + void insert(@Bind("serviceId") String serviceId, @Bind("componentId") String componentId, @Bind("created") DateTime created); + + @SqlUpdate("delete from dcae_services_components_maps where service_id = :serviceId and component_id = :componentId") + void delete(@Bind("serviceId") String serviceId, @Bind("componentId") String componentId); + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesDAO.java new file mode 100644 index 0000000..e40b8b5 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesDAO.java @@ -0,0 +1,77 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.joda.time.DateTime; +import org.skife.jdbi.v2.sqlobject.Bind; +import org.skife.jdbi.v2.sqlobject.BindBean; +import org.skife.jdbi.v2.sqlobject.SqlQuery; +import org.skife.jdbi.v2.sqlobject.SqlUpdate; +import org.skife.jdbi.v2.sqlobject.customizers.Mapper; +import org.skife.jdbi.v2.util.IntegerMapper; + + +/** + * Created by mhwang on 4/19/16. + */ +public interface DCAEServicesDAO extends InventoryDAO { + + @SqlQuery("select exists (select * from information_schema.tables where table_name = \'dcae_services\')") + Boolean checkIfTableExists(); + + @SqlUpdate("create table dcae_services (service_id varchar not null primary key, type_name varchar not null, " + + "vnf_id varchar not null, vnf_type varchar not null, vnf_location varchar not null, deployment_ref varchar, " + + "created timestamp not null, modified timestamp not null, status varchar not null)") + void createTable(); + + @SqlUpdate("insert into dcae_services(service_id, type_name, vnf_id, vnf_type, vnf_location, deployment_ref, " + + "created, modified, status) values (:serviceId, :typeName, :vnfId, :vnfType, :vnfLocation, :deploymentRef, " + + ":created, :modified, :status)") + void insert(@BindBean DCAEServiceObject serviceObject); + + @SqlUpdate("update dcae_services set type_name = :typeName, vnf_id = :vnfId, vnf_type = :vnfType, " + + "vnf_location = :vnfLocation, deployment_ref = :deploymentRef, modified = :modified, status = :status " + + "where service_id = :serviceId") + void update(@BindBean DCAEServiceObject serviceObject); + + @Mapper(DCAEServiceObjectMapper.class) + @SqlQuery("select * from dcae_services where status = :status and service_id = :serviceId") + DCAEServiceObject getByServiceId(@Bind("status") DCAEServiceObject.DCAEServiceStatus status, @Bind("serviceId") String serviceId); + + @Mapper(DCAEServiceObjectMapper.class) + @SqlQuery("select * from dcae_services where service_id = :serviceId") + DCAEServiceObject getByServiceId(@Bind("serviceId") String serviceId); + + @SqlUpdate("update dcae_services set modified = :modified, status = :status where service_id = :serviceId") + void updateStatusByServiceId(@Bind("modified") DateTime modified, + @Bind("status") DCAEServiceObject.DCAEServiceStatus status, + @Bind("serviceId") String serviceId); + + @Mapper(IntegerMapper.class) + @SqlQuery("select count(1) from dcae_services where status = :status and type_name = :typeName") + Integer countByType(@Bind("status") DCAEServiceObject.DCAEServiceStatus status, @Bind("typeName") String typeName); + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAO.java b/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAO.java new file mode 100644 index 0000000..6205d2c --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAO.java @@ -0,0 +1,32 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +/** + * Created by mhwang on 4/19/16. + */ +public interface InventoryDAO { + Boolean checkIfTableExists(); + void createTable(); +} diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAOManager.java b/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAOManager.java new file mode 100644 index 0000000..fd4d2eb --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAOManager.java @@ -0,0 +1,122 @@ +package org.openecomp.dcae.inventory.daos; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.skife.jdbi.v2.DBI; +import org.skife.jdbi.v2.Handle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.List; + +/** + * Reluctantly made this into a singleton in order to have access to the DAOs in the request handling code. Didn't + * want to change the interface on the handlers because they are generated by Swagger and I wanted to flexibility + * to swap in changes easily. This meant sacrificing dependency injection which is preferred. + * + * Created by mhwang on 4/19/16. + */ +public final class InventoryDAOManager { + + private static InventoryDAOManager instance; + + public static InventoryDAOManager getInstance() { + if (instance == null) { + instance = new InventoryDAOManager(); + } + + return instance; + } + + private final static Logger LOG = LoggerFactory.getLogger(InventoryDAOManager.class); + // WATCH! Table creation order matters where mapping tables refer to other tables for foreign keys. + private final static List<Class> DAO_CLASSES = Arrays.asList(DCAEServiceTypesDAO.class, DCAEServicesDAO.class, + DCAEServiceComponentsDAO.class, DCAEServicesComponentsMapsDAO.class); + + private DBI jdbi; + + private InventoryDAOManager() { + } + + public void init(DBI jdbi) { + this.jdbi = jdbi; + + for (Class<? extends InventoryDAO> daoClass : DAO_CLASSES) { + final InventoryDAO dao = jdbi.onDemand(daoClass); + + if (dao.checkIfTableExists()) { + LOG.info(String.format("Sql table exists: %s", daoClass.getSimpleName())); + } else { + dao.createTable(); + LOG.info(String.format("Sql table created: %s", daoClass.getSimpleName())); + } + } + } + + private InventoryDAO getDAO(Class<? extends InventoryDAO> klass) { + if (jdbi == null) { + throw new RuntimeException("InventoryDAOManager has not been initialized!"); + } + + // Using this approach to constructing the DAO, the client is not responsible for closing the handle. + // http://jdbi.org/sql_object_overview/ + // > In this case we do not need to (and in fact shouldn’t) ever take action to close the handle the sql object uses. + return jdbi.onDemand(klass); + } + + public DCAEServicesDAO getDCAEServicesDAO() { + return (DCAEServicesDAO) this.getDAO(DCAEServicesDAO.class); + } + + public DCAEServiceComponentsDAO getDCAEServiceComponentsDAO() { + return (DCAEServiceComponentsDAO) this.getDAO(DCAEServiceComponentsDAO.class); + } + + public DCAEServicesComponentsMapsDAO getDCAEServicesComponentsDAO() { + return (DCAEServicesComponentsMapsDAO) this.getDAO(DCAEServicesComponentsMapsDAO.class); + } + + public DCAEServiceTransactionDAO getDCAEServiceTransactionDAO() { + return jdbi.onDemand(DCAEServiceTransactionDAO.class); + } + + public DCAEServiceTypeTransactionDAO getDCAEServiceTypeTransactionDAO() { + return jdbi.onDemand(DCAEServiceTypeTransactionDAO.class); + } + + public DCAEServiceTypesDAO getDCAEServiceTypesDAO() { + return (DCAEServiceTypesDAO) this.getDAO(DCAEServiceTypesDAO.class); + } + + /** + * Must close the handle that is returned here. It is AutoCloseable so just use it as a try-with-resource. + * + * @return + */ + public Handle getHandle() { + return this.jdbi.open(); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/StringListArgument.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/StringListArgument.java new file mode 100644 index 0000000..11c77fd --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/StringListArgument.java @@ -0,0 +1,60 @@ +package org.openecomp.dcae.inventory.dbthings; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.skife.jdbi.v2.StatementContext; +import org.skife.jdbi.v2.tweak.Argument; +import org.skife.jdbi.v2.tweak.ArgumentFactory; + +import java.sql.Array; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.List; + +/** + * This class if needed for jdbi queries to be able to properly bind List<String> objects. + * + * http://stackoverflow.com/questions/33062516/insert-2d-array-into-postresql-db-using-jdbi + * + * Created by mhwang on 5/4/16. + */ +public class StringListArgument implements ArgumentFactory<List<String>> { + + @Override + public boolean accepts(Class<?> expectedType, Object value, StatementContext statementContext) { + return value != null && List.class.isAssignableFrom(value.getClass()); + } + + @Override + public Argument build(Class<?> expectedType, List<String> value, StatementContext statementContext) { + return new Argument() { + @Override + public void apply(int position, PreparedStatement statement, StatementContext ctx) throws SQLException { + Array values = statement.getConnection().createArrayOf("varchar", value.toArray()); + statement.setArray(position, values); + } + }; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java new file mode 100644 index 0000000..ee0602f --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java @@ -0,0 +1,51 @@ +package org.openecomp.dcae.inventory.dbthings.mappers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.joda.time.DateTime; +import org.skife.jdbi.v2.StatementContext; +import org.skife.jdbi.v2.tweak.ResultSetMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * Created by mhwang on 4/19/16. + */ +public class DCAEServiceComponentObjectMapper implements ResultSetMapper<DCAEServiceComponentObject> { + + @Override + public DCAEServiceComponentObject map(int i, ResultSet resultSet, StatementContext statementContext) throws SQLException { + DCAEServiceComponentObject object = new DCAEServiceComponentObject(); + object.setComponentId(resultSet.getString("component_id")); + object.setComponentType(resultSet.getString("component_type")); + object.setComponentSource(resultSet.getString("component_source")); + object.setShareable(resultSet.getInt("shareable")); + object.setCreated(new DateTime(resultSet.getTimestamp("created"))); + object.setModified(new DateTime(resultSet.getTimestamp("modified"))); + return object; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java new file mode 100644 index 0000000..7cff043 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java @@ -0,0 +1,54 @@ +package org.openecomp.dcae.inventory.dbthings.mappers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.joda.time.DateTime; +import org.skife.jdbi.v2.StatementContext; +import org.skife.jdbi.v2.tweak.ResultSetMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * Created by mhwang on 4/19/16. + */ +public class DCAEServiceObjectMapper implements ResultSetMapper<DCAEServiceObject> { + + @Override + public DCAEServiceObject map(int i, ResultSet resultSet, StatementContext statementContext) throws SQLException { + DCAEServiceObject object = new DCAEServiceObject(); + object.setServiceId(resultSet.getString("service_id")); + object.setTypeName(resultSet.getString("type_name")); + object.setVnfId(resultSet.getString("vnf_id")); + object.setVnfType(resultSet.getString("vnf_type")); + object.setVnfLocation(resultSet.getString("vnf_location")); + object.setDeploymentRef(resultSet.getString("deployment_ref")); + object.setCreated(new DateTime(resultSet.getTimestamp("created"))); + object.setModified(new DateTime(resultSet.getTimestamp("modified"))); + object.setStatus(DCAEServiceObject.DCAEServiceStatus.valueOf(resultSet.getString("status"))); + return object; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java new file mode 100644 index 0000000..bbd9903 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java @@ -0,0 +1,68 @@ +package org.openecomp.dcae.inventory.dbthings.mappers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import org.joda.time.DateTime; +import org.skife.jdbi.v2.StatementContext; +import org.skife.jdbi.v2.tweak.ResultSetMapper; + +import java.sql.Array; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Arrays; + +/** + * Created by mhwang on 5/3/16. + */ +public class DCAEServiceTypeObjectMapper implements ResultSetMapper<DCAEServiceTypeObject> { + + @Override + public DCAEServiceTypeObject map(int i, ResultSet resultSet, StatementContext statementContext) throws SQLException { + DCAEServiceTypeObject object = new DCAEServiceTypeObject(); + object.setTypeName(resultSet.getString("type_name")); + object.setOwner(resultSet.getString("owner")); + String[] vnfTypes = (String[]) resultSet.getArray("vnf_types").getArray(); + object.setVnfTypes(Arrays.asList(vnfTypes)); + + Array serviceIdsArray = resultSet.getArray("service_ids"); + + if (serviceIdsArray != null) { + String[] serviceIds = (String[]) serviceIdsArray.getArray(); + object.setServiceIds(Arrays.asList(serviceIds)); + } + + Array serviceLocationsArray = resultSet.getArray("service_locations"); + + if (serviceLocationsArray != null) { + String[] serviceLocations = (String[]) serviceLocationsArray.getArray(); + object.setServiceLocations(Arrays.asList(serviceLocations)); + } + + object.setBlueprintTemplate(resultSet.getString("blueprint_template")); + object.setCreated(new DateTime(resultSet.getTimestamp("created"))); + return object; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java new file mode 100644 index 0000000..f7b783e --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java @@ -0,0 +1,149 @@ +package org.openecomp.dcae.inventory.dbthings.models; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.model.DCAEServiceComponentRequest; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; + +/** + * Created by mhwang on 4/19/16. + */ +public class DCAEServiceComponentObject { + + private String componentId = null; + private DateTime created = null; + private DateTime modified = null; + private String componentType = null; + private String componentSource = null; + private Integer shareable = null; + + public String getComponentId() { + return componentId; + } + + public void setComponentId(String componentId) { + this.componentId = componentId; + } + + public DateTime getCreated() { + return created; + } + + public void setCreated(DateTime created) { + this.created = created; + } + + public DateTime getModified() { + return modified; + } + + public void setModified(DateTime modified) { + this.modified = modified; + } + + public String getComponentType() { + return componentType; + } + + public void setComponentType(String componentType) { + this.componentType = componentType; + } + + public String getComponentSource() { + return componentSource; + } + + public void setComponentSource(String componentSource) { + this.componentSource = componentSource; + } + + public Integer getShareable() { + return shareable; + } + + public void setShareable(Integer shareable) { + this.shareable = shareable; + } + + public DCAEServiceComponentObject() { + } + + /** + * Intended to be used for inserts - new objects. + * + * @param request + */ + public DCAEServiceComponentObject(DCAEServiceComponentRequest request) { + DateTime now = DateTime.now(DateTimeZone.UTC); + this.setComponentId(request.getComponentId()); + this.setComponentType(request.getComponentType()); + this.setComponentSource(request.getComponentSource()); + this.setCreated(now); + this.setModified(now); + this.setShareable(request.getShareable()); + } + + /** + * Intended to be used for updates - some fields should not be updated. + * + * @param source + * @param updateRequest + */ + public DCAEServiceComponentObject(DCAEServiceComponentObject source, DCAEServiceComponentRequest updateRequest) { + // Immutable fields + this.setComponentId(source.getComponentId()); + this.setCreated(source.getCreated()); + + // Mutable fields + this.setComponentType(updateRequest.getComponentType()); + this.setComponentSource(updateRequest.getComponentSource()); + this.setShareable(updateRequest.getShareable()); + this.setModified(DateTime.now(DateTimeZone.UTC)); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class DCAEServiceComponentObject {\n"); + + sb.append(" componentId: ").append(toIndentedString(componentId)).append("\n"); + sb.append(" componentType: ").append(toIndentedString(componentType)).append("\n"); + sb.append(" componentSource: ").append(toIndentedString(componentSource)).append("\n"); + sb.append(" shareable: ").append(toIndentedString(shareable)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObject.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObject.java new file mode 100644 index 0000000..5defd46 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObject.java @@ -0,0 +1,171 @@ +package org.openecomp.dcae.inventory.dbthings.models; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.model.DCAEServiceRequest; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; + +/** + * Created by mhwang on 4/19/16. + */ +public class DCAEServiceObject { + + public static enum DCAEServiceStatus { + RUNNING, + REMOVED + } + + private String serviceId = null; + private String typeName = null; + private DateTime created = null; + private DateTime modified = null; + private String vnfId = null; + private String vnfType = null; + private String vnfLocation = null; + private String deploymentRef = null; + + // These properties are meant to be used internally in the service only + private DCAEServiceStatus status = null; + + public String getServiceId() { + return serviceId; + } + + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public DateTime getCreated() { + return created; + } + + public void setCreated(DateTime created) { + this.created = created; + } + + public DateTime getModified() { + return modified; + } + + public void setModified(DateTime modified) { + this.modified = modified; + } + + public DCAEServiceStatus getStatus() { + return status; + } + + public void setStatus(DCAEServiceStatus status) { + this.status = status; + } + + public String getVnfId() { + return vnfId; + } + + public void setVnfId(String vnfId) { + this.vnfId = vnfId; + } + + public String getVnfType() { + return vnfType; + } + + public void setVnfType(String vnfType) { + this.vnfType = vnfType; + } + + public String getVnfLocation() { + return vnfLocation; + } + + public void setVnfLocation(String vnfLocation) { + this.vnfLocation = vnfLocation; + } + + public String getDeploymentRef() { + return deploymentRef; + } + + public void setDeploymentRef(String deploymentRef) { + this.deploymentRef = deploymentRef; + } + + public DCAEServiceObject() { + } + + // TODO: Move the constructors functionality below out into the actual handlers. + + /** + * Intended to be used for inserts - new objects. + * + * @param serviceId + * @param request + */ + public DCAEServiceObject(String serviceId, DCAEServiceRequest request) { + DateTime now = DateTime.now(DateTimeZone.UTC); + this.setServiceId(serviceId); + this.setTypeName(request.getTypeName()); + this.setVnfId(request.getVnfId()); + this.setVnfType(request.getVnfType()); + this.setVnfLocation(request.getVnfLocation()); + this.setDeploymentRef(request.getDeploymentRef()); + this.setCreated(now); + this.setModified(now); + // Assumption here is that you are here from the PUT which means that the service is RUNNING. + this.setStatus(DCAEServiceStatus.RUNNING); + } + + /** + * Intended to be used for updates - some fields should not be updated. + * + * @param source + * @param updateRequest + */ + public DCAEServiceObject(DCAEServiceObject source, DCAEServiceRequest updateRequest) { + // Immutable fields + this.setServiceId(source.getServiceId()); + this.setCreated(source.getCreated()); + + // Mutable fields + this.setTypeName(updateRequest.getTypeName()); + this.setVnfId(updateRequest.getVnfId()); + this.setVnfType(updateRequest.getVnfType()); + this.setVnfLocation(updateRequest.getVnfLocation()); + this.setDeploymentRef(updateRequest.getDeploymentRef()); + this.setModified(DateTime.now(DateTimeZone.UTC)); + // Assumption here is that you are here from the PUT which means that the service is RUNNING. + this.setStatus(DCAEServiceStatus.RUNNING); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java b/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java new file mode 100644 index 0000000..1213207 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java @@ -0,0 +1,101 @@ +package org.openecomp.dcae.inventory.dbthings.models; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.joda.time.DateTime; + +import java.util.List; + +/** + * POJO representation of a record in dcae_service_types table. + * + * Created by mhwang on 5/3/16. + */ +public class DCAEServiceTypeObject { + + private String typeName = null; + private String owner = null; + private List<String> vnfTypes = null; + private List<String> serviceIds = null; + private List<String> serviceLocations = null; + private String blueprintTemplate = null; + private DateTime created = null; + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getOwner() { + return owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + public List<String> getVnfTypes() { + return vnfTypes; + } + + public void setVnfTypes(List<String> vnfTypes) { + this.vnfTypes = vnfTypes; + } + + public List<String> getServiceIds() { + return serviceIds; + } + + public void setServiceIds(List<String> serviceIds) { + this.serviceIds = serviceIds; + } + + public List<String> getServiceLocations() { + return serviceLocations; + } + + public void setServiceLocations(List<String> serviceLocations) { + this.serviceLocations = serviceLocations; + } + + public String getBlueprintTemplate() { + return blueprintTemplate; + } + + public void setBlueprintTemplate(String blueprintTemplate) { + this.blueprintTemplate = blueprintTemplate; + } + + public DateTime getCreated() { + return created; + } + + public void setCreated(DateTime created) { + this.created = created; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerClientException.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerClientException.java new file mode 100644 index 0000000..5fde36b --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerClientException.java @@ -0,0 +1,39 @@ +package org.openecomp.dcae.inventory.exceptions; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +/** + * Created by mhwang on 5/13/16. + */ +public class DCAEControllerClientException extends RuntimeException { + + public DCAEControllerClientException(String message) { + super(message); + } + + public DCAEControllerClientException(Throwable e) { + super(e); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerConnectionException.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerConnectionException.java new file mode 100644 index 0000000..b901915 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerConnectionException.java @@ -0,0 +1,39 @@ +package org.openecomp.dcae.inventory.exceptions; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +/** + * Created by mhwang on 8/23/16. + */ +public class DCAEControllerConnectionException extends RuntimeException { + + public DCAEControllerConnectionException(String message) { + super(message); + } + + public DCAEControllerConnectionException(Throwable e) { + super(e); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerTimeoutException.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerTimeoutException.java new file mode 100644 index 0000000..5d76de6 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerTimeoutException.java @@ -0,0 +1,39 @@ +package org.openecomp.dcae.inventory.exceptions; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +/** + * Created by mhwang on 8/23/16. + */ +public class DCAEControllerTimeoutException extends RuntimeException { + + public DCAEControllerTimeoutException(String message) { + super(message); + } + + public DCAEControllerTimeoutException(Throwable e) { + super(e); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DatabusControllerClientException.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/DatabusControllerClientException.java new file mode 100644 index 0000000..dbc3e3b --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/DatabusControllerClientException.java @@ -0,0 +1,39 @@ +package org.openecomp.dcae.inventory.exceptions; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +/** + * Created by mhwang on 5/25/16. + */ +public class DatabusControllerClientException extends RuntimeException { + + public DatabusControllerClientException(String message) { + super(message); + } + + public DatabusControllerClientException(Throwable e) { + super(e); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java new file mode 100644 index 0000000..f5efd77 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java @@ -0,0 +1,40 @@ +package org.openecomp.dcae.inventory.exceptions.mappers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.exceptions.DCAEControllerConnectionException; + +import javax.ws.rs.core.Response; + +/** + * Created by mhwang on 8/23/16. + */ +public class DCAEControllerConnectionExceptionMapper extends DCAEControllerExceptionMapper<DCAEControllerConnectionException> { + + @Override + protected Response.Status getStatus() { + return Response.Status.BAD_GATEWAY; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java new file mode 100644 index 0000000..5647b75 --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java @@ -0,0 +1,44 @@ +package org.openecomp.dcae.inventory.exceptions.mappers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.api.ApiResponseMessage; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + +/** + * Created by mhwang on 8/23/16. + */ +public abstract class DCAEControllerExceptionMapper<T extends RuntimeException> implements ExceptionMapper<T> { + + abstract protected Response.Status getStatus(); + + @Override + public Response toResponse(T e) { + ApiResponseMessage response = new ApiResponseMessage(ApiResponseMessage.ERROR, e.getMessage()); + return Response.status(this.getStatus()).entity(response).build(); + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java b/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java new file mode 100644 index 0000000..2b850ff --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java @@ -0,0 +1,40 @@ +package org.openecomp.dcae.inventory.exceptions.mappers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import org.openecomp.dcae.inventory.exceptions.DCAEControllerTimeoutException; + +import javax.ws.rs.core.Response; + +/** + * Created by mhwang on 8/23/16. + */ +public class DCAEControllerTimeoutExceptionMapper extends DCAEControllerExceptionMapper<DCAEControllerTimeoutException> { + + @Override + protected Response.Status getStatus() { + return Response.Status.GATEWAY_TIMEOUT; + } + +} diff --git a/src/main/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapper.java b/src/main/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapper.java new file mode 100644 index 0000000..ce5a55a --- /dev/null +++ b/src/main/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapper.java @@ -0,0 +1,43 @@ +package org.openecomp.dcae.inventory.providers; + +/* + * ============LICENSE_START========================================== + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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. + * ============LICENSE_END============================================ + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + * + */ + +import io.swagger.api.ApiResponseMessage; +import io.swagger.api.NotFoundException; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + +/** + * Created by mhwang on 5/18/16. + */ +public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundException> { + + @Override + public Response toResponse(NotFoundException e) { + ApiResponseMessage entity = new ApiResponseMessage(e.getCode(), e.getMessage()); + return Response.status(Response.Status.NOT_FOUND).entity(entity).build(); + } + +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..bb5e513 --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,66 @@ +# The database config was lifted from https://dropwizard.github.io/dropwizard/0.7.1/docs/manual/jdbi.html +database: + # the name of your JDBC driver + driverClass: org.postgresql.Driver + + # the username + user: postgres + + # the password + password: test123 + + # the JDBC URL + # TODO: Probably want to programmatically set the database name. + url: jdbc:postgresql://127.0.0.1:5432/dcae_inv + + # any properties specific to your JDBC driver: + properties: + charSet: UTF-8 + + # the maximum amount of time to wait on an empty pool before throwing an exception + maxWaitForConnection: 1s + + # the SQL query to run when validating a connection's liveness + validationQuery: "/* MyService Health Check */ SELECT 1" + + # the minimum number of connections to keep open + minSize: 8 + + # the maximum number of connections to keep open + maxSize: 32 + + # whether or not idle connections should be validated + checkConnectionWhileIdle: false + + # the amount of time to sleep between runs of the idle connection validation, abandoned cleaner and idle pool resizing + evictionInterval: 10s + + # the minimum amount of time an connection must sit idle in the pool before it is eligible for eviction + minIdleTime: 1 minute + +dcaeControllerConnection: + host: + port: 9998 + # Apparently this is variable parameter amongst DCAE controller instances + basePath: resources + user: + password: + +databusControllerConnection: + host: + port: 8080 + +httpClient: + # The minimum number of threads to use for asynchronous calls. + minThreads: 1 + + # The maximum number of threads to use for asynchronous calls. + maxThreads: 128 + + # If true, the client will automatically decode response entities + # with gzip content encoding. + gzipEnabled: false + + # If true, the client will encode request entities with gzip + # content encoding. (Requires gzipEnabled to be true). + gzipEnabledForRequests: false diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..9e3f5bc --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START=========== + dcae-inventory + ================================== + Copyright (C) 2016 AT&T + ================================== + This code is licensed under the Apache License, Version 2.0; you may + not use this code for any purpose except in compliance with the Apache + License. You may obtain a copy of the License at + http://www.att.com/legal/openecomp.html + ============LICENSE_END=========== + --> + +<configuration> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern> + </layout> + </appender> + + <logger name="com" level="INFO"/> + + <root level="debug"> + <appender-ref ref="STDOUT" /> + </root> +</configuration> |