### Version information
-*Version* : 2.1.0
+*Version* : 3.0.0
### Contact information
|HTTP Code|Description|Schema|
|---|---|---|
|**200**|List of `DCAEService` objects|[InlineResponse2001](#inlineresponse2001)|
-|**502**|Bad response from DCAE controller|[ApiResponseMessage](#apiresponsemessage)|
-|**504**|Failed to connect with DCAE controller|[ApiResponseMessage](#apiresponsemessage)|
#### Consumes
|---|---|---|
|**200**|Single `DCAEService` object|[DCAEService](#dcaeservice)|
|**404**|DCAE service not found|[ApiResponseMessage](#apiresponsemessage)|
-|**502**|Bad response from DCAE controller|[ApiResponseMessage](#apiresponsemessage)|
-|**504**|Failed to connect with DCAE controller|[ApiResponseMessage](#apiresponsemessage)|
#### Consumes
|---|---|---|
|**componentId** <br>*required*|The id format is unique to the source|string|
|**componentLink** <br>*required*|Link to the underlying resource of this component|[Link](#link)|
-|**componentSource** <br>*required*|Specifies the name of the underying source service that is responsible for this components|enum (DCAEController, DMaaPController)|
+|**componentSource** <br>*required*|Specifies the name of the underying source service that is responsible for this components|enum (DMaaPController)|
|**componentType** <br>*required*||string|
|**created** <br>*required*||string(date-time)|
|**location** <br>*optional*|Location information of the component|string|
|Name|Description|Schema|
|---|---|---|
|**componentId** <br>*required*|The id format is unique to the source|string|
-|**componentSource** <br>*required*|Specifies the name of the underying source service that is responsible for this components|enum (DCAEController, DMaaPController)|
+|**componentSource** <br>*required*|Specifies the name of the underying source service that is responsible for this components|enum (DMaaPController)|
|**componentType** <br>*required*||string|
|**shareable** <br>*required*|Used to determine if this component can be shared amongst different DCAE services|integer(int32)|
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>0.1.1</version>
</parent>
<groupId>org.onap.dcaegen2.platform</groupId>
<artifactId>inventory-api</artifactId>
- <version>1.3.0</version>
+ <version>3.0.0</version>
<name>dcaegen2-platform-inventory-api</name>
- <!--internal <version>2.4.0</version>-->
+ <!--internal <version>3.0.0</version>-->
<properties>
<dropwizard.version>1.1.1</dropwizard.version>
<version>1.6.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-testing</artifactId>
+ <version>${dropwizard.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.197</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
@io.swagger.annotations.ApiOperation(value = "", notes = "Get a list of `DCAEService` objects.", response = InlineResponse2001.class, tags = {})
@io.swagger.annotations.ApiResponses(value = {
- @io.swagger.annotations.ApiResponse(code = 200, message = "List of `DCAEService` objects", response = InlineResponse2001.class),
- @io.swagger.annotations.ApiResponse(code = 502, message = "Bad response from DCAE controller", response = ApiResponseMessage.class),
- @io.swagger.annotations.ApiResponse(code = 504, message = "Failed to connect with DCAE controller", response = ApiResponseMessage.class)})
+ @io.swagger.annotations.ApiResponse(code = 200, message = "List of `DCAEService` objects", response = InlineResponse2001.class)
+ })
public Response dcaeServicesGet(
@ApiParam(value = "DCAE service type name") @QueryParam("typeId") String typeId,
@ApiParam(value = "") @QueryParam("vnfId") String vnfId,
@io.swagger.annotations.ApiOperation(value = "", notes = "Get a `DCAEService` object.", response = DCAEService.class, tags = {})
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Single `DCAEService` object", response = DCAEService.class),
- @io.swagger.annotations.ApiResponse(code = 404, message = "DCAE service not found", response = ApiResponseMessage.class),
- @io.swagger.annotations.ApiResponse(code = 502, message = "Bad response from DCAE controller", response = ApiResponseMessage.class),
- @io.swagger.annotations.ApiResponse(code = 504, message = "Failed to connect with DCAE controller", response = ApiResponseMessage.class)})
+ @io.swagger.annotations.ApiResponse(code = 404, message = "DCAE service not found", response = ApiResponseMessage.class)
+ })
public Response dcaeServicesServiceIdGet(
@ApiParam(value = "", required = true) @PathParam("serviceId") String serviceId,
@Context SecurityContext securityContext)
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@ApiModelProperty(value = "Specifies the name of the underying source service that is responsible for this components", required = true,
- allowableValues = "DCAEController, DMaaPController")
+ allowableValues = "DMaaPController")
@JsonProperty("componentSource")
public String getComponentSource() {
return componentSource;
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@ApiModelProperty(value = "Specifies the name of the underying source service that is responsible for this components", required = true,
- allowableValues = "DCAEController, DMaaPController")
+ allowableValues = "DMaaPController")
@JsonProperty("componentSource")
public String getComponentSource() {
return componentSource;
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
package io.swagger.api.factories;
-import org.onap.dcae.inventory.clients.DCAEControllerClient;
import org.onap.dcae.inventory.clients.DatabusControllerClient;
import io.swagger.api.DcaeServicesApiService;
import io.swagger.api.impl.DcaeServicesApiServiceImpl;
public final 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;
//Utility classes, which are a collection of static members, are not meant to be instantiated.
private DcaeServicesApiServiceFactory(){
}
- public static void setDcaeControllerClient(DCAEControllerClient dcaeControllerClient) {
- DcaeServicesApiServiceFactory.dcaeControllerClient = dcaeControllerClient;
- }
-
public static void setDatabusControllerClient(DatabusControllerClient databusControllerClient) {
DcaeServicesApiServiceFactory.databusControllerClient = databusControllerClient;
}
public static DcaeServicesApiService getDcaeServicesApi() {
- return new DcaeServicesApiServiceImpl(dcaeControllerClient, databusControllerClient);
+ return new DcaeServicesApiServiceImpl(databusControllerClient);
}
}
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
package io.swagger.api.impl;
-import org.onap.dcae.inventory.clients.DCAEControllerClient;
import org.onap.dcae.inventory.clients.DatabusControllerClient;
import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO;
import org.onap.dcae.inventory.daos.DCAEServiceTransactionDAO;
import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper;
import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject;
import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
-import org.onap.dcae.inventory.exceptions.DCAEControllerClientException;
import org.onap.dcae.inventory.exceptions.DatabusControllerClientException;
import io.swagger.api.*;
import io.swagger.model.*;
private static final Logger LOG = LoggerFactory.getLogger(DcaeServicesApiServiceImpl.class);
private static final int PAGINATION_PAGE_SIZE = 25;
- private static final String COMPONENT_SOURCE_DCAE_CONTROLLER = "DCAECONTROLLER";
private static final String COMPONENT_SOURCE_DATA_BUS_CONTROLLER = "DMAAPCONTROLLER";
- private final DCAEControllerClient dcaeControllerClient;
private final DatabusControllerClient databusControllerClient;
- public DcaeServicesApiServiceImpl(DCAEControllerClient dcaeControllerClient, DatabusControllerClient databusControllerClient) {
- this.dcaeControllerClient = dcaeControllerClient;
+ public DcaeServicesApiServiceImpl(DatabusControllerClient databusControllerClient) {
this.databusControllerClient = databusControllerClient;
}
// 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.equalsIgnoreCase(sco.getComponentSource())) {
- if (this.dcaeControllerClient != null) {
- try {
- DCAEControllerClient.ServiceInstance serviceInstance
- = this.dcaeControllerClient.getServiceInstance(component.getComponentId());
- component.setStatus(serviceInstance.getStatus());
- // There's no specific location rather its inferred from the AIC 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()), e);
- }
- }
- } else if (COMPONENT_SOURCE_DATA_BUS_CONTROLLER.equalsIgnoreCase(sco.getComponentSource())) {
+ if (COMPONENT_SOURCE_DATA_BUS_CONTROLLER.equalsIgnoreCase(sco.getComponentSource())) {
if (this.databusControllerClient != null) {
try {
if (this.databusControllerClient.isExists(sco.getComponentId())) {
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
import io.dropwizard.configuration.ConfigurationFactoryFactory;
import io.dropwizard.configuration.JsonConfigurationFactory;
import io.dropwizard.configuration.UrlConfigurationSourceProvider;
-import org.onap.dcae.inventory.clients.DCAEControllerClient;
import org.onap.dcae.inventory.clients.DatabusControllerClient;
import org.onap.dcae.inventory.exceptions.mappers.DBIExceptionMapper;
-import org.onap.dcae.inventory.exceptions.mappers.DCAEControllerConnectionExceptionMapper;
-import org.onap.dcae.inventory.exceptions.mappers.DCAEControllerTimeoutExceptionMapper;
import org.onap.dcae.inventory.providers.NotFoundExceptionMapper;
import org.onap.dcae.inventory.daos.InventoryDAOManager;
import com.fasterxml.jackson.databind.module.SimpleModule;
simpleModule.addSerializer(Link.class, new LinkSerializer());
environment.getObjectMapper().registerModule(simpleModule);
- // Setup DCAE controller client
- // Used by the dcae-services API
- if (configuration.getDcaeControllerConnection().getRequired()) {
- 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);
-
- LOG.info("Use of DCAE controller client is required. Turned on.");
- } else {
- LOG.warn("Use of DCAE controller client is *not* required. Turned off.");
- }
-
// Setup Databus controller client
// Used by the dcae-services API
if (configuration.getDatabusControllerConnection().getRequired()) {
}
environment.jersey().register(NotFoundExceptionMapper.class);
- environment.jersey().register(DCAEControllerConnectionExceptionMapper.class);
- environment.jersey().register(DCAEControllerTimeoutExceptionMapper.class);
environment.jersey().register(DBIExceptionMapper.UnableToObtainConnectionExceptionMapper.class);
environment.jersey().register(DBIExceptionMapper.UnableToExecuteStatementExceptionMapper.class);
environment.jersey().register(DBIExceptionMapper.UnableToCreateStatementExceptionMapper.class);
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
*/
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;
-
- @JsonProperty
- private Boolean required = true;
-
- 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 Boolean getRequired() {
- return this.required;
- }
- }
-
public static class DatabusControllerConnectionConfiguration {
@NotEmpty
@JsonProperty
@JsonProperty
private DataSourceFactory database = new DataSourceFactory();
- @NotNull
- @JsonProperty
- private DCAEControllerConnectionConfiguration dcaeControllerConnection = new DCAEControllerConnectionConfiguration();
-
@NotNull
@JsonProperty
private DatabusControllerConnectionConfiguration databusControllerConnection = new DatabusControllerConnectionConfiguration();
return this.database;
}
- public DCAEControllerConnectionConfiguration getDcaeControllerConnection() {
- return this.dcaeControllerConnection;
- }
-
public DatabusControllerConnectionConfiguration getDatabusControllerConnection() {
return databusControllerConnection;
}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * dcae-inventory
- * ================================================================================
- * 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=========================================================
- */
-
-package org.onap.dcae.inventory.clients;
-
-import org.onap.dcae.inventory.InventoryConfiguration;
-import org.onap.dcae.inventory.exceptions.DCAEControllerClientException;
-import org.onap.dcae.inventory.exceptions.DCAEControllerConnectionException;
-import org.onap.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 static final Logger LOG = LoggerFactory.getLogger(DCAEControllerClient.class);
-
- private final Client client;
- private final InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration;
-
- public DCAEControllerClient(Client client,
- InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration) {
- this.client = client;
- this.connectionConfiguration = 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 <dcae controller domain name>: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");
- }
- }
-
-
-
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * dcae-inventory
- * ================================================================================
- * 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=========================================================
- */
-
-package org.onap.dcae.inventory.exceptions.mappers;
-
-import org.onap.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;
- }
-
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * dcae-inventory
- * ================================================================================
- * 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=========================================================
- */
-
-package org.onap.dcae.inventory.exceptions.mappers;
-
-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();
- }
-
-}
"evictionInterval": "10s",
"minIdleTime": "1 minute"
},
- "dcaeControllerConnection": {
- "host": "dcae-controller-hostname",
- "port": 9998,
- "basePath": "resources",
- "user": null,
- "password": null,
- "required": false
- },
"databusControllerConnection": {
"host": "databus-controller-hostname",
"port": 8443,
# the minimum amount of time an connection must sit idle in the pool before it is eligible for eviction
minIdleTime: 1 minute
-dcaeControllerConnection:
- host: dcae-controller-hostname
- port: 9998
- # Apparently this is variable parameter amongst DCAE controller instances
- basePath: resources
- user:
- password:
-
databusControllerConnection:
host: databus-controller-hostname
port: 8443
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 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.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.inventory.exceptions.mappers;
+package io.swagger.api;
-import org.onap.dcae.inventory.exceptions.DCAEControllerTimeoutException;
+import org.junit.Test;
-import javax.ws.rs.core.Response;
+import javax.servlet.ServletException;
+
+import static org.junit.Assert.fail;
/**
- * Created by mhwang on 8/23/16.
+ * Created by mhwang on 3/22/18.
*/
-public class DCAEControllerTimeoutExceptionMapper extends DCAEControllerExceptionMapper<DCAEControllerTimeoutException> {
+public class BootstrapTest {
- @Override
- protected Response.Status getStatus() {
- return Response.Status.GATEWAY_TIMEOUT;
+ @Test
+ public void testNoServletConfig() {
+ try {
+ (new Bootstrap()).init(null);
+ } catch(ServletException e) {
+ fail("This might be a valid failure. Should investigate.");
+ }
}
}
-/*-
+package io.swagger.api;/*-
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 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.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.inventory.exceptions;
+package io.swagger.api.factories;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertNotNull;
/**
- * Created by mhwang on 8/23/16.
+ * Created by mhwang on 3/22/18.
*/
-public class DCAEControllerConnectionException extends RuntimeException {
-
- public DCAEControllerConnectionException(String message) {
- super(message);
- }
+public class DcaeServiceTypesApiServiceFactoryTest {
- public DCAEControllerConnectionException(Throwable e) {
- super(e);
+ @Test
+ public void testGetDcaeServiceTypesApi() {
+ assertNotNull(DcaeServiceTypesApiServiceFactory.getDcaeServiceTypesApi());
}
}
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 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.
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.inventory.exceptions;
+package io.swagger.api.factories;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertNotNull;
/**
- * Created by mhwang on 8/23/16.
+ * Created by mhwang on 3/22/18.
*/
-public class DCAEControllerTimeoutException extends RuntimeException {
-
- public DCAEControllerTimeoutException(String message) {
- super(message);
- }
+public class DcaeServicesApiServiceFactoryTest {
- public DCAEControllerTimeoutException(Throwable e) {
- super(e);
+ @Test
+ public void testGetDcaeServicesApi() {
+ assertNotNull(DcaeServicesApiServiceFactory.getDcaeServicesApi());
}
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ */
+
+package io.swagger.api.factories;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertNotNull;
+
+/**
+ * Created by mhwang on 3/22/18.
+ */
+public class DcaeServicesGroupbyApiServiceFactoryTest {
+
+ @Test
+ public void testGetDcaeServicesGroupbyApi() {
+ assertNotNull(DcaeServicesGroupbyApiServiceFactory.getDcaeServicesGroupbyApi());
+ }
+
+}
-/*-
+package io.swagger.api.impl;/*-
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
import org.onap.dcae.inventory.daos.InventoryDAOManager;
import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject;
-import io.swagger.api.impl.DcaeServiceTypesApiServiceImpl;
import io.swagger.model.DCAEServiceType;
import io.swagger.model.DCAEServiceTypeRequest;
import org.joda.time.DateTime;
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ */
+
+package io.swagger.api.impl;
+
+import com.codahale.metrics.MetricRegistry;
+import io.dropwizard.db.DataSourceFactory;
+import io.dropwizard.jackson.Jackson;
+import io.dropwizard.jdbi.DBIFactory;
+import io.dropwizard.setup.Environment;
+import io.swagger.api.Util;
+import io.swagger.model.DCAEServiceRequest;
+import org.joda.time.DateTime;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.dcae.inventory.clients.DatabusControllerClient;
+import org.onap.dcae.inventory.daos.*;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.skife.jdbi.v2.DBI;
+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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Created by mhwang on 9/25/17.
+ *
+ * This test covers the gap in DcaeServicesApiServiceImplTests - testing the GET query interface
+ * The approach taken here is standing up an H2 in-memory database which is different from the
+ * original test which made an attempt to mock the database calls but ran into an impasse. The
+ * test here was not included in the original class because of conflicting setup operations.
+ */
+@PrepareForTest({InventoryDAOManager.class})
+@RunWith(PowerMockRunner.class)
+public class DcaeServicesApiServiceImplH2Tests {
+
+ private final static Logger LOG = LoggerFactory.getLogger(DcaeServicesApiServiceImplH2Tests.class);
+
+ private DCAEServicesDAO mockServicesDAO = null;
+ private DCAEServiceComponentsDAO mockComponentsDAO = null;
+ private DCAEServicesComponentsMapsDAO mockComponentsMapsDAO = null;
+
+ // https://stackoverflow.com/questions/35825383/how-to-test-jdbi-daos-with-h2-in-memory-database
+ // Caused by: java.lang.ClassNotFoundException: Unable to load class: org.h2.Driver from ClassLoader:sun.misc.Launcher$AppClassLoader@18b4aac2;ClassLoader:sun.misc.Launcher$AppClassLoader@18b4aac2
+ protected DataSourceFactory getDataSourceFactory()
+ {
+ DataSourceFactory dataSourceFactory = new DataSourceFactory();
+ dataSourceFactory.setDriverClass( "org.h2.Driver" );
+ dataSourceFactory.setUrl( "jdbc:h2:mem:testDb" );
+ dataSourceFactory.setUser( "sa" );
+ dataSourceFactory.setPassword( "sa" );
+
+ return dataSourceFactory;
+ }
+
+ @Before
+ public void setUp() {
+ Environment env = new Environment( "test-env", Jackson.newObjectMapper(), null, new MetricRegistry(), null );
+ DBI dbi = new DBIFactory().build( env, getDataSourceFactory(), "test" );
+ mockServicesDAO = dbi.onDemand(DCAEServicesDAO.class);
+ mockComponentsDAO = dbi.onDemand(DCAEServiceComponentsDAO.class);
+ mockComponentsMapsDAO = dbi.onDemand(DCAEServicesComponentsMapsDAO.class);
+
+ // PowerMockito does bytecode magic to mock static methods and use final classes
+ PowerMockito.mockStatic(InventoryDAOManager.class);
+ InventoryDAOManager mockDAOManager = mock(InventoryDAOManager.class);
+
+ when(InventoryDAOManager.getInstance()).thenReturn(mockDAOManager);
+ when(mockDAOManager.getHandle()).thenReturn(dbi.open());
+ }
+
+ @Test
+ public void testDcaeServicesGet () {
+ mockServicesDAO.createTable();
+ mockComponentsDAO.createTable();
+ mockComponentsMapsDAO.createTable();
+
+ DCAEServiceRequest request = new DCAEServiceRequest();
+ request.setTypeId("some-type-id");
+ request.setVnfId("some-vnf-id");
+ request.setVnfType("some-vnf-type");
+ request.setVnfLocation("some-vnf-location");
+ request.setDeploymentRef("some-deployment-ref");
+ DCAEServiceObject so = new DCAEServiceObject("some-service-id", request);
+ mockServicesDAO.insert(so);
+
+ DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
+ String typeId = "some-type-id";
+ String vnfId = "some-vnf-id";
+ String vnfType = "some-vnf-type";
+ String vnfLocation = "some-vnf-location";
+ String componentType = "some-component-type";
+ Boolean shareable = Boolean.TRUE;
+ DateTime created = null;
+ Integer offset = 0;
+ UriInfo uriInfo = new Util.FakeUriInfo();
+ SecurityContext securityContext = null;
+ Response response = api.dcaeServicesGet(typeId, vnfId, vnfType, vnfLocation, componentType, shareable, created,
+ offset, uriInfo, securityContext);
+ assertEquals(response.getStatus(), 200);
+ }
+
+}
-/*-
+package io.swagger.api.impl;/*-
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
*/
import io.swagger.api.NotFoundException;
-import io.swagger.api.impl.DcaeServicesApiServiceImpl;
+import io.swagger.api.Util;
import io.swagger.model.DCAEService;
import io.swagger.model.DCAEServiceRequest;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.dcae.inventory.clients.DCAEControllerClient;
import org.onap.dcae.inventory.clients.DatabusControllerClient;
import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO;
import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO;
fail("Failed to do the reflection trick to test the private method: createDCAEService");
}
- DCAEControllerClient dcc = mock(DCAEControllerClient.class);
DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
- DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
DCAEServiceRequest serviceRequest = new DCAEServiceRequest();
serviceRequest.setTypeId("type-id-abc");
when(mockServicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId)).thenReturn(serviceObject);
when(mockComponentsDAO.getByServiceId(serviceId)).thenReturn(new ArrayList<DCAEServiceComponentObject>());
- DCAEControllerClient dcc = mock(DCAEControllerClient.class);
DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
- DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
UriInfo uriInfo = new Util.FakeUriInfo();
try {
doReturn(null).when(mockQuery.bind(anyString(), any(DateTime.class)));
when(mockQuery.bind(anyString(), anyInt())).thenReturn(null);
- DCAEControllerClient dcc = mock(DCAEControllerClient.class);
DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
- DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
String typeId = "some-type-id";
String vnfId = "some-vnf-id";
Boolean shareable = Boolean.TRUE;
DateTime created = null;
Integer offset = 0;
- UriInfo uriInfo = new Util.FakeUriInfo();
+ UriInfo uriInfo = new io.swagger.api.Util.FakeUriInfo();
SecurityContext securityContext = null;
when(mockQuery.list()).thenReturn(new ArrayList<DCAEServiceObject>());
when(mockTypesDAO.getByTypeIdActiveOnly(serviceRequest.getTypeId())).thenReturn(null);
- DCAEControllerClient dcc = mock(DCAEControllerClient.class);
DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
- DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
UriInfo uriInfo = new Util.FakeUriInfo();
Response response = api.dcaeServicesServiceIdPut(serviceId, serviceRequest, uriInfo, null);
DCAEServiceObject serviceObject = new DCAEServiceObject(serviceId, serviceRequest);
when(mockServicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId)).thenReturn(serviceObject);
- DCAEControllerClient dcc = mock(DCAEControllerClient.class);
DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
- DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
UriInfo uriInfo = new Util.FakeUriInfo();
try {
String serviceId = "service-id-123";
when(mockServicesDAO.getByServiceId(DCAEServiceObject.DCAEServiceStatus.RUNNING, serviceId)).thenReturn(null);
- DCAEControllerClient dcc = mock(DCAEControllerClient.class);
DatabusControllerClient dbcc = mock(DatabusControllerClient.class);
- DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dcc, dbcc);
+ DcaeServicesApiServiceImpl api = new DcaeServicesApiServiceImpl(dbcc);
UriInfo uriInfo = new Util.FakeUriInfo();
try {
-/*-
+package io.swagger.api.impl;/*-
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
* ============LICENSE_END=========================================================
*/
-import io.swagger.api.impl.DcaeServicesGroupbyApiServiceImpl;
+import io.swagger.api.Util;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
DcaeServicesGroupbyApiServiceImpl api = new DcaeServicesGroupbyApiServiceImpl();
String propertyName = "type";
- UriInfo uriInfo = new Util.FakeUriInfo();
+ UriInfo uriInfo = new io.swagger.api.Util.FakeUriInfo();
Handle mockHandle = mock(Handle.class);
when(InventoryDAOManager.getInstance().getHandle()).thenReturn(mockHandle);
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ */
+
+package org.onap.dcae.inventory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.dropwizard.configuration.YamlConfigurationFactory;
+import io.dropwizard.jackson.Jackson;
+import io.dropwizard.jersey.validation.Validators;
+import org.junit.Test;
+
+import javax.validation.Validator;
+import java.io.File;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * Created by mhwang on 3/22/18.
+ */
+public class InventoryConfigurationTest {
+
+ final private ObjectMapper objectMapper = Jackson.newObjectMapper();
+ final private Validator validator = Validators.newValidator();
+ final private YamlConfigurationFactory<InventoryConfiguration> factory
+ = new YamlConfigurationFactory<>(InventoryConfiguration.class, validator, objectMapper, "dw");
+
+ @Test
+ public void testInventoryConfigurationLoad() {
+ try {
+ final File yaml = new File(Thread.currentThread().getContextClassLoader().getResource("config-inventory.yaml").getPath());
+ InventoryConfiguration configuration = factory.build(yaml);
+
+ assertEquals(configuration.getDatabusControllerConnection().getHost(), "databus-controller-hostname");
+ assertEquals((long) configuration.getDatabusControllerConnection().getPort(), 8443);
+ assertEquals(configuration.getDatabusControllerConnection().getRequired(), true);
+
+ assertEquals(configuration.getDataSourceFactory().getUrl(), "jdbc:postgresql://127.0.0.1:5432/dcae_inv");
+ } catch(Exception e) {
+ fail("Failed to load config-inventory");
+ }
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ */
+
+package org.onap.dcae.inventory;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import org.junit.Test;
+
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.UriBuilder;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Created by mhwang on 3/25/18.
+ */
+public class LinkSerializerTest {
+
+ @Test
+ public void testSerialize() {
+ JsonGenerator jg = mock(JsonGenerator.class);
+
+ try {
+ Link link = new Link() {
+ @Override
+ public URI getUri() {
+ try {
+ return new URI("http://localhost/some-title");
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ @Override
+ public UriBuilder getUriBuilder() {
+ return null;
+ }
+
+ @Override
+ public String getRel() {
+ return "self";
+ }
+
+ @Override
+ public List<String> getRels() {
+ return null;
+ }
+
+ @Override
+ public String getTitle() {
+ return "some-title";
+ }
+
+ @Override
+ public String getType() {
+ return null;
+ }
+
+ @Override
+ public Map<String, String> getParams() {
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return null;
+ }
+ };
+ (new LinkSerializer()).serialize(link, jg, null);
+ } catch (Exception e) {
+ fail("Failed to serialze link");
+ }
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ */
+
+package org.onap.dcae.inventory.clients;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.dropwizard.configuration.ConfigurationException;
+import io.dropwizard.configuration.YamlConfigurationFactory;
+import io.dropwizard.jackson.Jackson;
+import io.dropwizard.jersey.validation.Validators;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.dcae.inventory.InventoryConfiguration;
+import org.onap.dcae.inventory.exceptions.DatabusControllerClientException;
+
+import javax.validation.Validator;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+/**
+ * Created by mhwang on 3/22/18.
+ */
+public class DatabusControllerClientTest {
+
+ final private ObjectMapper objectMapper = Jackson.newObjectMapper();
+ final private Validator validator = Validators.newValidator();
+ final private YamlConfigurationFactory<InventoryConfiguration.DatabusControllerConnectionConfiguration> factory
+ = new YamlConfigurationFactory<>(InventoryConfiguration.DatabusControllerConnectionConfiguration.class, validator, objectMapper, "dw");
+
+ private InventoryConfiguration.DatabusControllerConnectionConfiguration configuration = null;
+
+ @Before
+ public void setupClass() throws IOException, ConfigurationException {
+ final File yaml = new File(Thread.currentThread().getContextClassLoader().getResource("config-databus.yaml").getPath());
+ this.configuration = factory.build(yaml);
+ }
+
+ @Test
+ public void testConstructResourceURI() {
+ DatabusControllerClient client = new DatabusControllerClient(null, this.configuration);
+ URI uri = client.constructResourceURI("/some-path");
+ assertEquals(uri.toString(), "https://databus-controller-hostname:8443/some-path");
+ }
+
+ private DatabusControllerClient setupForIsExists(Response mockResponse) {
+ Client mockClient = mock(Client.class);
+ WebTarget mockWebTarget = mock(WebTarget.class);
+ Invocation.Builder mockBuilder = mock(Invocation.Builder.class);
+
+ try {
+ URI uri = new URI("https://databus-controller-hostname:8443/some-component-id");
+ when(mockClient.target(uri)).thenReturn(mockWebTarget);
+ //when(mockClient.target(new URI(any()))).thenReturn(mockWebTarget);
+ } catch(URISyntaxException e) {
+ fail("URI syntax error");
+ }
+
+ when(mockWebTarget.request(MediaType.APPLICATION_JSON_TYPE)).thenReturn(mockBuilder);
+ when(mockBuilder.header(any(), any())).thenReturn(mockBuilder);
+
+ when(mockBuilder.get()).thenReturn(mockResponse);
+ return new DatabusControllerClient(mockClient, this.configuration);
+
+ }
+
+ @Test
+ public void testIsExists() {
+ Response mockResponse = mock(Response.class);
+ when(mockResponse.getStatus()).thenReturn(200);
+ InputStream stream = new ByteArrayInputStream("{}".getBytes(StandardCharsets.UTF_8));
+ when(mockResponse.getEntity()).thenReturn(stream);
+
+ DatabusControllerClient client = setupForIsExists(mockResponse);
+
+ try {
+ assertEquals(client.isExists("some-component-id"), false);
+ } catch(Exception e) {
+ fail("Unexpected exception");
+ }
+ }
+
+ private void testIsExistsErrors(int statusError) {
+ Response mockResponse = mock(Response.class);
+ when(mockResponse.getStatus()).thenReturn(statusError);
+
+ DatabusControllerClient client = setupForIsExists(mockResponse);
+
+ try {
+ client.isExists("some-component-id");
+ fail("This was supposed to be a fail case. Exception not thrown.");
+ } catch(DatabusControllerClientException e) {
+ // Expected exception
+ } catch(Exception e) {
+ fail("Unexpected exception");
+ }
+ }
+
+ @Test
+ public void testIsExists401() {
+ testIsExistsErrors(401);
+ }
+
+ @Test
+ public void testIsExists403() {
+ testIsExistsErrors(403);
+ }
+
+ @Test
+ public void testIsExists500() {
+ testIsExistsErrors(500);
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ */
+
+package org.onap.dcae.inventory.daos;
+
+import com.codahale.metrics.MetricRegistry;
+import io.dropwizard.db.DataSourceFactory;
+import io.dropwizard.jackson.Jackson;
+import io.dropwizard.jdbi.DBIFactory;
+import io.dropwizard.setup.Environment;
+import io.swagger.model.DCAEServiceRequest;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject;
+import org.skife.jdbi.v2.DBI;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Created by mhwang on 3/25/18.
+ */
+public class DCAEServicesDAOTest {
+
+ private DCAEServicesDAO fooDAO;
+
+ // Learned about the H2 approach from here:
+ // https://stackoverflow.com/questions/35825383/how-to-test-jdbi-daos-with-h2-in-memory-database
+ protected DataSourceFactory getDataSourceFactory()
+ {
+ DataSourceFactory dataSourceFactory = new DataSourceFactory();
+ dataSourceFactory.setDriverClass( "org.h2.Driver" );
+ dataSourceFactory.setUrl( "jdbc:h2:mem:testDb" );
+ dataSourceFactory.setUser( "sa" );
+ dataSourceFactory.setPassword( "sa" );
+
+ return dataSourceFactory;
+ }
+
+ @Before
+ public void setUp() {
+ Environment env = new Environment( "test-env", Jackson.newObjectMapper(), null, new MetricRegistry(), null );
+ DBI dbi = new DBIFactory().build( env, getDataSourceFactory(), "test" );
+ fooDAO = dbi.onDemand(DCAEServicesDAO.class);
+ }
+
+ @Test
+ public void testSaveAndGet() {
+ try {
+ fooDAO.createTable();
+ DCAEServiceRequest request = new DCAEServiceRequest();
+ request.setTypeId("some-type-id");
+ request.setVnfId("some-vnf-id");
+ request.setVnfType("some-vnf-type");
+ request.setVnfLocation("some-vnf-location");
+ request.setDeploymentRef("some-deployment-ref");
+ DCAEServiceObject so = new DCAEServiceObject("some-service-id", request);
+ fooDAO.insert(so);
+
+ DCAEServiceObject target = fooDAO.getByServiceId("some-service-id");
+ assertEquals(target.getServiceId(), so.getServiceId());
+ } catch(Exception e) {
+ fail("Failure at some point in this compound test.");
+ }
+ }
+}
* ============LICENSE_START=======================================================
* dcae-inventory
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018 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.
package org.onap.dcae.inventory.exceptions;
+import org.junit.Test;
+
/**
- * Created by mhwang on 5/13/16.
+ * Created by mhwang on 3/26/18.
*/
-public class DCAEControllerClientException extends RuntimeException {
-
- public DCAEControllerClientException(String message) {
- super(message);
- }
+public class DatabusControllerClientExceptionTest {
- public DCAEControllerClientException(Throwable e) {
- super(e);
+ @Test
+ public void testBasicConstructor() {
+ new DatabusControllerClientException(new RuntimeException("Boo"));
}
-
}
* ============LICENSE_END=========================================================
*/
-package org.onap.dcae.inventory.exception.mappers;
+package org.onap.dcae.inventory.exceptions.mappers;
import org.onap.dcae.inventory.daos.InventoryDAOManager;
import org.onap.dcae.inventory.exceptions.mappers.DBIExceptionMapper;
--- /dev/null
+host: databus-controller-hostname
+port: 8443
+mechId: some-mech-id
+password: some-mech-password
--- /dev/null
+# 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: 2
+
+ # the maximum number of connections to keep open
+ maxSize: 8
+
+ initialSize: 2
+
+ # 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
+
+databusControllerConnection:
+ host: databus-controller-hostname
+ port: 8443
+ mechId: some-mech-id
+ password: some-password
+
+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
+
+ # Requests to databus controller were timing out so I bumped it up 4x of default
+ timeout: 5000milliseconds
+ connectionTimeout: 5000milliseconds
+
+server:
+ # requestLog is for those messages you see right when the service handles HTTP requests
+ requestLog:
+ appenders:
+ - type: file
+ currentLogFilename: /opt/logs/DCAE/inventory/audit.log
+ archive: true
+ archivedLogFilenamePattern: /opt/logs/DCAE/inventory/audit-%d.log.gz
+ archivedFileCount: 10
+ - type: console
+
+# Rolling is c.q.l.core.rolling.TimeBasedRollingPolicy
+logging:
+ level: INFO
+ appenders:
+ - type: file
+ currentLogFilename: /opt/logs/DCAE/inventory/audit.log
+ archive: true
+ archivedLogFilenamePattern: /opt/logs/DCAE/inventory/audit-%d.log.gz
+ archivedFileCount: 10
+ - type: console
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
swagger: '2.0'
info:
- version: "2.1.0"
+ version: "3.0.0"
title: DCAE Inventory API
description: |
DCAE Inventory is a web service that provides the following:
description: "List of `DCAEService` objects"
schema:
$ref: "#/definitions/InlineResponse2001"
- 502:
- description: "Bad response from DCAE controller"
- schema:
- $ref: "#/definitions/ApiResponseMessage"
- 504:
- description: "Failed to connect with DCAE controller"
- schema:
- $ref: "#/definitions/ApiResponseMessage"
/dcae-services-groupby/{propertyName}:
get:
summary: ""
description: "Single `DCAEService` object"
schema:
$ref: "#/definitions/DCAEService"
- 502:
- description: "Bad response from DCAE controller"
- schema:
- $ref: "#/definitions/ApiResponseMessage"
404:
description: "DCAE service not found"
schema:
$ref: "#/definitions/ApiResponseMessage"
- 504:
- description: "Failed to connect with DCAE controller"
- schema:
- $ref: "#/definitions/ApiResponseMessage"
put:
summary: ""
description: "Put a new or update an existing `DCAEService` object."
description: "Specifies the name of the underying source service that is responsible\
\ for this components"
enum:
- - "DCAEController"
- "DMaaPController"
shareable:
type: "integer"
# Versioning variables\r
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
# because they are used in Jenkins, whose plug-in doesn't support\r
-major=1\r
-minor=1\r
+major=3\r
+minor=0\r
patch=0\r
base_version=${major}.${minor}.${patch}\r
# Release must be completed with git revision # in Jenkins\r
Code Review / dcaegen2 / platform / inventory-api.git / commitdiff