20 files changed, 67 insertions, 59 deletions
diff --git a/dcae-analytics-aai/pom.xml b/dcae-analytics-aai/pom.xml
index bd3d59a..14e89ca 100644
--- a/dcae-analytics-aai/pom.xml
+++ b/dcae-analytics-aai/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dcae-analytics</artifactId>
         <groupId>org.onap.dcaegen2.analytics.tca</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.2.1-SNAPSHOT</version>
     </parent>
 
 
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.onap.dcaegen2.analytics.tca</groupId>
             <artifactId>dcae-analytics-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
 
         <!-- APACHE CLIENT -->
@@ -85,6 +85,7 @@
 
 
         <!-- JACKSON JSON -->
+        <!--
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -97,12 +98,13 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+        -->
 
         <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>org.onap.dcaegen2.analytics.tca</groupId>
             <artifactId>dcae-analytics-test</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/AAIClientFactory.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/AAIClientFactory.java
index 0a8d4ca..79322ef 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/AAIClientFactory.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/AAIClientFactory.java
@@ -18,15 +18,15 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai;
+package org.onap.dcae.apod.analytics.aai;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
-import org.openecomp.dcae.apod.analytics.aai.module.AnalyticsAAIModule;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIEnrichmentClient;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIEnrichmentClientFactory;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.module.AnalyticsAAIModule;
+import org.onap.dcae.apod.analytics.aai.service.AAIEnrichmentClient;
+import org.onap.dcae.apod.analytics.aai.service.AAIEnrichmentClientFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/domain/config/AAIEnrichmentConfig.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/domain/config/AAIEnrichmentConfig.java
index 19c284f..4fba3dd 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/domain/config/AAIEnrichmentConfig.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/domain/config/AAIEnrichmentConfig.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.domain.config;
+package org.onap.dcae.apod.analytics.aai.domain.config;
 
 import java.io.Serializable;
 
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfig.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfig.java
index 37190a0..3e64364 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfig.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfig.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.domain.config;
+package org.onap.dcae.apod.analytics.aai.domain.config;
 
 import com.google.common.base.Objects;
 
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfigBuilder.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfigBuilder.java
index 3df0050..ea5d591 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfigBuilder.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/domain/config/AAIHttpClientConfigBuilder.java
@@ -18,9 +18,9 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.domain.config;
+package org.onap.dcae.apod.analytics.aai.domain.config;
 
-import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
+import org.onap.dcae.apod.analytics.common.AnalyticsConstants;
 
 import java.io.Serializable;
 import java.net.URL;
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/module/AnalyticsAAIModule.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/module/AnalyticsAAIModule.java
index 9074798..dfaf3f3 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/module/AnalyticsAAIModule.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/module/AnalyticsAAIModule.java
@@ -18,16 +18,16 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.module;
+package org.onap.dcae.apod.analytics.aai.module;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIEnrichmentClient;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIEnrichmentClientFactory;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIEnrichmentClientImpl;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIHttpClient;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIHttpClientFactory;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIHttpClientImpl;
+import org.onap.dcae.apod.analytics.aai.service.AAIEnrichmentClient;
+import org.onap.dcae.apod.analytics.aai.service.AAIEnrichmentClientFactory;
+import org.onap.dcae.apod.analytics.aai.service.AAIEnrichmentClientImpl;
+import org.onap.dcae.apod.analytics.aai.service.AAIHttpClient;
+import org.onap.dcae.apod.analytics.aai.service.AAIHttpClientFactory;
+import org.onap.dcae.apod.analytics.aai.service.AAIHttpClientImpl;
 
 /**
  * <p>
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClient.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClient.java
index 8813cdf..dc2d877 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClient.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClient.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
 import java.util.Map;
 
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClientFactory.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClientFactory.java
index bd4a4f2..b0fe5b3 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClientFactory.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClientFactory.java
@@ -18,9 +18,9 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
 
 /**
  * Factory to initialize instance of {@link AAIEnrichmentClient} for Guice DI injection purposes.
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClientImpl.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClientImpl.java
index 229ab17..b154005 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClientImpl.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClientImpl.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
 import com.google.common.base.Optional;
 import com.google.inject.Inject;
@@ -31,8 +31,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
-import org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.common.utils.HTTPUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClient.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClient.java
index a4adad9..3ceff5f 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClient.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClient.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
 import org.apache.http.impl.client.CloseableHttpClient;
 
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClientFactory.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClientFactory.java
index e977639..ba04734 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClientFactory.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClientFactory.java
@@ -18,9 +18,9 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
 
 /**
  * Factory to initialize instance of {@link AAIHttpClient} for Guice DI injection purposes.
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClientImpl.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClientImpl.java
index 34631b1..e13117b 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClientImpl.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClientImpl.java
@@ -18,11 +18,13 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHeaders;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
@@ -34,17 +36,20 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
+import org.apache.http.message.BasicHeader;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
-import org.openecomp.dcae.apod.analytics.aai.utils.ssl.AlwaysTrustingTrustStrategy;
-import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.utils.ssl.AlwaysTrustingTrustStrategy;
+import org.onap.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -108,13 +113,14 @@ public class AAIHttpClientImpl implements AAIHttpClient {
         final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
 
         if (aaiUserName != null) {
-            final String aaiHost = aaiHttpClientConfig.getAaiHost();
-            final Integer aaiHostPortNumber = aaiHttpClientConfig.getAaiHostPortNumber();
+            // add basic authentication header
+            LOG.info("Setting A&AI authentication headers with username: {}", aaiUserName);
             final String aaiUserPassword = aaiHttpClientConfig.getAaiUserPassword();
-            LOG.info("Setting A&AI host credentials for AAI Host: {}", aaiHost);
-            final AuthScope aaiHostPortAuthScope = new AuthScope(aaiHost, aaiHostPortNumber);
-            final Credentials aaiCredentials = new UsernamePasswordCredentials(aaiUserName, aaiUserPassword);
-            credentialsProvider.setCredentials(aaiHostPortAuthScope, aaiCredentials);
+            final String auth = aaiUserName + ":" + aaiUserPassword;
+            final byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(Charset.forName("US-ASCII")));
+            final String authHeader = "Basic " + new String(encodedAuth);
+            final BasicHeader basicAuthHeader = new BasicHeader(HttpHeaders.AUTHORIZATION, authHeader);
+            httpClientBuilder.setDefaultHeaders(Arrays.asList(basicAuthHeader));
         } else {
             LOG.warn("A&AI userName not present. No credentials set for A&AI authentication");
         }
diff --git a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/utils/ssl/AlwaysTrustingTrustStrategy.java b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/utils/ssl/AlwaysTrustingTrustStrategy.java
index b11680b..1898412 100644
--- a/dcae-analytics-aai/src/main/java/org/openecomp/dcae/apod/analytics/aai/utils/ssl/AlwaysTrustingTrustStrategy.java
+++ b/dcae-analytics-aai/src/main/java/org/onap/dcae/apod/analytics/aai/utils/ssl/AlwaysTrustingTrustStrategy.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.utils.ssl;
+package org.onap.dcae.apod.analytics.aai.utils.ssl;
 
 import org.apache.http.ssl.TrustStrategy;
 
diff --git a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/BaseAnalyticsAAIGuiceUnitTest.java b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/BaseAnalyticsAAIGuiceUnitTest.java
index 8c18a74..bf48fed 100644
--- a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/BaseAnalyticsAAIGuiceUnitTest.java
+++ b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/BaseAnalyticsAAIGuiceUnitTest.java
@@ -18,10 +18,10 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai;
+package org.onap.dcae.apod.analytics.aai;
 
 import org.junit.runner.RunWith;
-import org.openecomp.dcae.apod.analytics.test.runner.GuiceJUnitRunner;
+import org.onap.dcae.apod.analytics.test.runner.GuiceJUnitRunner;
 
 /**
  * @author Rajiv Singla . Creation Date: 10/20/2016.
diff --git a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/BaseAnalyticsAAIUnitTest.java b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/BaseAnalyticsAAIUnitTest.java
index 955b5b1..61fe227 100644
--- a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/BaseAnalyticsAAIUnitTest.java
+++ b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/BaseAnalyticsAAIUnitTest.java
@@ -18,11 +18,11 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai;
+package org.onap.dcae.apod.analytics.aai;
 
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfigBuilder;
-import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfigBuilder;
+import org.onap.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/it/AAIClientFactoryIT.java b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/it/AAIClientFactoryIT.java
index 5ebca27..3ec7d14 100644
--- a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/it/AAIClientFactoryIT.java
+++ b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/it/AAIClientFactoryIT.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.it;
+package org.onap.dcae.apod.analytics.aai.it;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.aai.AAIClientFactory;
-import org.openecomp.dcae.apod.analytics.aai.service.AAIEnrichmentClient;
+import org.onap.dcae.apod.analytics.aai.AAIClientFactory;
+import org.onap.dcae.apod.analytics.aai.service.AAIEnrichmentClient;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/it/BaseAnalyticsAAIIT.java b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/it/BaseAnalyticsAAIIT.java
index 8f54f77..fbc6cd4 100644
--- a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/it/BaseAnalyticsAAIIT.java
+++ b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/it/BaseAnalyticsAAIIT.java
@@ -18,11 +18,11 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.it;
+package org.onap.dcae.apod.analytics.aai.it;
 
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfigBuilder;
-import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfigBuilder;
+import org.onap.dcae.apod.analytics.test.BaseDCAEAnalyticsIT;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClientImplTest.java b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClientImplTest.java
index 0fbd0e7..6278af6 100644
--- a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/service/AAIEnrichmentClientImplTest.java
+++ b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/service/AAIEnrichmentClientImplTest.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
@@ -30,8 +30,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.aai.BaseAnalyticsAAIUnitTest;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.BaseAnalyticsAAIUnitTest;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
diff --git a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClientImplTest.java b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClientImplTest.java
index 0bb7307..c073a6c 100644
--- a/dcae-analytics-aai/src/test/java/org/openecomp/dcae/apod/analytics/aai/service/AAIHttpClientImplTest.java
+++ b/dcae-analytics-aai/src/test/java/org/onap/dcae/apod/analytics/aai/service/AAIHttpClientImplTest.java
@@ -18,7 +18,7 @@
  *  ============================LICENSE_END===========================================
  */
 
-package org.openecomp.dcae.apod.analytics.aai.service;
+package org.onap.dcae.apod.analytics.aai.service;
 
 import org.apache.http.HttpHost;
 import org.apache.http.config.ConnectionConfig;
@@ -33,8 +33,8 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
 import org.junit.Assert;
 import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.aai.BaseAnalyticsAAIUnitTest;
-import org.openecomp.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
+import org.onap.dcae.apod.analytics.aai.BaseAnalyticsAAIUnitTest;
+import org.onap.dcae.apod.analytics.aai.domain.config.AAIHttpClientConfig;
 import sun.security.ssl.SSLContextImpl;
 import sun.security.ssl.SSLSocketFactoryImpl;
 
diff --git a/dcae-analytics-aai/src/test/resources/logback-test.xml b/dcae-analytics-aai/src/test/resources/logback-test.xml
index f4ba1aa..896da06 100644
--- a/dcae-analytics-aai/src/test/resources/logback-test.xml
+++ b/dcae-analytics-aai/src/test/resources/logback-test.xml
@@ -40,7 +40,7 @@
 
     <logger name="org.apache.twill" level="WARN"/>
     <logger name="co.cask.cdap" level="INFO"/>
-    <logger name="org.openecomp.dcae.apod.analytics" level="DEBUG"/>
+    <logger name="org.onap.dcae.apod.analytics" level="DEBUG"/>
 
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>