Add unit tests to reach 50% coverage

Ripped out the dcae controller code which is no longer
needed.

Change-Id: I43906edb80bcd5e25445ec2a7175c6748b0ab2ae
Signed-off-by: Michael Hwang <mhwang@research.att.com>
Issue-ID: DCAEGEN2-257

29 files changed, 737 insertions, 512 deletions

diff --git a/src/gen/java/io/swagger/api/DcaeServicesApi.java b/src/gen/java/io/swagger/api/DcaeServicesApi.java
index 55d79f3..4c08cda 100644
--- a/src/gen/java/io/swagger/api/DcaeServicesApi.java
+++ b/src/gen/java/io/swagger/api/DcaeServicesApi.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -99,9 +99,8 @@ public class DcaeServicesApi {
     @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,
@@ -135,9 +134,8 @@ public class DcaeServicesApi {
     @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)
diff --git a/src/gen/java/io/swagger/model/DCAEServiceComponent.java b/src/gen/java/io/swagger/model/DCAEServiceComponent.java
index 6550c76..86d10ae 100644
--- a/src/gen/java/io/swagger/model/DCAEServiceComponent.java
+++ b/src/gen/java/io/swagger/model/DCAEServiceComponent.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -131,7 +131,7 @@ public class DCAEServiceComponent   {
 
 
   @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;
diff --git a/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java b/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java
index f65bf38..64d4127 100644
--- a/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java
+++ b/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -77,7 +77,7 @@ public class DCAEServiceComponentRequest   {
 
 
   @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;
diff --git a/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java b/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java
index 2fda7e7..ba27ada 100644
--- a/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java
+++ b/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -20,7 +20,6 @@
 
 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;
@@ -29,23 +28,18 @@ 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);
     }
 
 }
diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java
index f1219ac..26949af 100644
--- a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java
+++ b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -20,7 +20,6 @@
 
 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;
@@ -29,7 +28,6 @@ import org.onap.dcae.inventory.daos.InventoryDAOManager;
 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.*;
@@ -51,14 +49,11 @@ public class DcaeServicesApiServiceImpl extends DcaeServicesApiService {
 
     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;
     }
 
@@ -90,22 +85,7 @@ public class DcaeServicesApiServiceImpl extends DcaeServicesApiService {
             // 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())) {
diff --git a/src/main/java/org/onap/dcae/inventory/InventoryApplication.java b/src/main/java/org/onap/dcae/inventory/InventoryApplication.java
index 939cfdd..09ee260 100644
--- a/src/main/java/org/onap/dcae/inventory/InventoryApplication.java
+++ b/src/main/java/org/onap/dcae/inventory/InventoryApplication.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -25,11 +25,8 @@ import io.dropwizard.configuration.ConfigurationFactory;
 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;
@@ -144,21 +141,6 @@ public class InventoryApplication extends Application<InventoryConfiguration> {
         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()) {
@@ -177,8 +159,6 @@ public class InventoryApplication extends Application<InventoryConfiguration> {
         }
 
         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);
diff --git a/src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java b/src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java
index 0dacb26..76a525a 100644
--- a/src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java
+++ b/src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java
@@ -2,7 +2,7 @@
  * ============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.
@@ -34,55 +34,6 @@ import javax.validation.constraints.NotNull;
  */
 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
@@ -134,10 +85,6 @@ public class InventoryConfiguration extends Configuration {
 
     @NotNull
     @JsonProperty
-    private DCAEControllerConnectionConfiguration dcaeControllerConnection = new DCAEControllerConnectionConfiguration();
-
-    @NotNull
-    @JsonProperty
     private DatabusControllerConnectionConfiguration databusControllerConnection = new DatabusControllerConnectionConfiguration();
 
     @NotNull
@@ -158,10 +105,6 @@ public class InventoryConfiguration extends Configuration {
         return this.database;
     }
 
-    public DCAEControllerConnectionConfiguration getDcaeControllerConnection() {
-        return this.dcaeControllerConnection;
-    }
-
     public DatabusControllerConnectionConfiguration getDatabusControllerConnection() {
         return databusControllerConnection;
     }
diff --git a/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java b/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java
deleted file mode 100644
index b309cfd..0000000
--- a/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * ============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");
-        }
-    }
-
-    
-
-}
diff --git a/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java
deleted file mode 100644
index e345c6e..0000000
--- a/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============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;
-    }
-
-}
diff --git a/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java
deleted file mode 100644
index 8e4eb3b..0000000
--- a/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============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();
-    }
-
-}
diff --git a/src/main/resources/config.json b/src/main/resources/config.json
index 436a181..89d887a 100644
--- a/src/main/resources/config.json
+++ b/src/main/resources/config.json
@@ -16,14 +16,6 @@
     "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,
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 505eea5..e882be0 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -40,14 +40,6 @@ database:
   # 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
diff --git a/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java b/src/test/java/io/swagger/api/BootstrapTest.java
index 67eb6ca..7c86d8c 100644
--- a/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java
+++ b/src/test/java/io/swagger/api/BootstrapTest.java
@@ -2,14 +2,14 @@
  * ============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.
@@ -18,20 +18,26 @@
  * ============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.");
+        }
     }
 
 }
diff --git a/src/test/java/Util.java b/src/test/java/io/swagger/api/Util.java
index 9607148..8f9e09f 100644
--- a/src/test/java/Util.java
+++ b/src/test/java/io/swagger/api/Util.java
@@ -1,8 +1,8 @@
-/*-
+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.
diff --git a/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerConnectionException.java b/src/test/java/io/swagger/api/factories/DcaeServiceTypesApiServiceFactoryTest.java
index f96ffbe..6b385df 100644
--- a/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerConnectionException.java
+++ b/src/test/java/io/swagger/api/factories/DcaeServiceTypesApiServiceFactoryTest.java
@@ -2,14 +2,14 @@
  * ============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.
@@ -18,19 +18,20 @@
  * ============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());
     }
 
 }
diff --git a/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerTimeoutException.java b/src/test/java/io/swagger/api/factories/DcaeServicesApiServiceFactoryTest.java
index 48f5044..d9c6808 100644
--- a/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerTimeoutException.java
+++ b/src/test/java/io/swagger/api/factories/DcaeServicesApiServiceFactoryTest.java
@@ -2,14 +2,14 @@
  * ============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.
@@ -18,19 +18,20 @@
  * ============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());
     }
 
 }
diff --git a/src/test/java/io/swagger/api/factories/DcaeServicesGroupbyApiServiceFactoryTest.java b/src/test/java/io/swagger/api/factories/DcaeServicesGroupbyApiServiceFactoryTest.java
new file mode 100644
index 0000000..033c8a6
--- /dev/null
+++ b/src/test/java/io/swagger/api/factories/DcaeServicesGroupbyApiServiceFactoryTest.java
@@ -0,0 +1,37 @@
+/*-
+ * ============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());
+    }
+
+}
diff --git a/src/test/java/DcaeServiceTypesApiServiceImplTests.java b/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java
index 3882c53..4a47787 100644
--- a/src/test/java/DcaeServiceTypesApiServiceImplTests.java
+++ b/src/test/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImplTests.java
@@ -1,8 +1,8 @@
-/*-
+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.
@@ -23,7 +23,6 @@ import org.onap.dcae.inventory.daos.DCAEServicesDAO;
 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;
diff --git a/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java
new file mode 100644
index 0000000..0a3b777
--- /dev/null
+++ b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplH2Tests.java
@@ -0,0 +1,132 @@
+/*-
+ * ============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);
+    }
+
+}
diff --git a/src/test/java/DcaeServicesApiServiceImplTests.java b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplTests.java
index 75e3e00..64b7f88 100644
--- a/src/test/java/DcaeServicesApiServiceImplTests.java
+++ b/src/test/java/io/swagger/api/impl/DcaeServicesApiServiceImplTests.java
@@ -1,8 +1,8 @@
-/*-
+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.
@@ -19,13 +19,12 @@
  */
 
 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;
@@ -94,9 +93,8 @@ public class DcaeServicesApiServiceImplTests {
             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");
@@ -124,9 +122,8 @@ public class DcaeServicesApiServiceImplTests {
         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 {
@@ -153,9 +150,8 @@ public class DcaeServicesApiServiceImplTests {
         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";
@@ -165,7 +161,7 @@ public class DcaeServicesApiServiceImplTests {
         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>());
@@ -185,9 +181,8 @@ public class DcaeServicesApiServiceImplTests {
 
         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);
@@ -203,9 +198,8 @@ public class DcaeServicesApiServiceImplTests {
         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 {
@@ -224,9 +218,8 @@ public class DcaeServicesApiServiceImplTests {
         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 {
diff --git a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java b/src/test/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImplTests.java
index 7ca8200..0ae2c3a 100644
--- a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java
+++ b/src/test/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImplTests.java
@@ -1,8 +1,8 @@
-/*-
+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.
@@ -18,7 +18,7 @@
  * ============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;
@@ -70,7 +70,7 @@ public class DcaeServicesGroupbyApiServiceImplTests {
         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);
diff --git a/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java b/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java
new file mode 100644
index 0000000..f9dadb8
--- /dev/null
+++ b/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java
@@ -0,0 +1,61 @@
+/*-
+ * ============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");
+        }
+    }
+
+}
diff --git a/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java b/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java
new file mode 100644
index 0000000..81b0554
--- /dev/null
+++ b/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java
@@ -0,0 +1,97 @@
+/*-
+ * ============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");
+        }
+    }
+
+}
diff --git a/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java b/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java
new file mode 100644
index 0000000..ae2f2ff
--- /dev/null
+++ b/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java
@@ -0,0 +1,146 @@
+/*-
+ * ============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);
+    }
+
+}
diff --git a/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java b/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java
new file mode 100644
index 0000000..af05704
--- /dev/null
+++ b/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java
@@ -0,0 +1,84 @@
+/*-
+ * ============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.");
+        }
+    }
+}
diff --git a/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerClientException.java b/src/test/java/org/onap/dcae/inventory/exceptions/DatabusControllerClientExceptionTest.java
index b549ee1..fcde16e 100644
--- a/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerClientException.java
+++ b/src/test/java/org/onap/dcae/inventory/exceptions/DatabusControllerClientExceptionTest.java
@@ -2,14 +2,14 @@
  * ============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.
@@ -20,17 +20,15 @@
 
 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"));
     }
-
 }
diff --git a/src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapperTests.java
index 7c04295..b0d5ba4 100644
--- a/src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java
+++ b/src/test/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapperTests.java
@@ -18,7 +18,7 @@
  * ============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;
diff --git a/src/test/resources/config-databus.yaml b/src/test/resources/config-databus.yaml
new file mode 100644
index 0000000..f51c869
--- /dev/null
+++ b/src/test/resources/config-databus.yaml
@@ -0,0 +1,4 @@
+host: databus-controller-hostname
+port: 8443
+mechId: some-mech-id
+password: some-mech-password
diff --git a/src/test/resources/config-inventory.yaml b/src/test/resources/config-inventory.yaml
new file mode 100644
index 0000000..3206566
--- /dev/null
+++ b/src/test/resources/config-inventory.yaml
@@ -0,0 +1,88 @@
+# 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