55 files changed, 169 insertions, 140 deletions
diff --git a/src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java b/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java
index d8a558c..a317c29 100644
--- a/src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java
+++ b/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,6 +32,7 @@ import java.security.SecureRandom;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.analytics.AveragingRingBuffer;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
diff --git a/src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java b/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java
index 70e9e3c..7304096 100644
--- a/src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java
+++ b/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java
@@ -23,13 +23,14 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import java.security.SecureRandom;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.analytics.HistogramSampler;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
diff --git a/src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java b/src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java
index c5f14e6..9d92d11 100644
--- a/src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java
+++ b/src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import org.junit.Before;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java
index be51f74..f00c2fa 100644
--- a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 
 import static org.junit.Assert.assertEquals;
@@ -10,8 +10,11 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.aai.enums.RestAuthenticationMode;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventorySslConfig;
+import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 public class ActiveInventoryConfigTest {
 
diff --git a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
index e1421c4..6f2b917 100644
--- a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,7 +37,8 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode;
 
 
 public class ActiveInventoryRestConfigTest {
diff --git a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
index 834bbd1..e02a6a7 100644
--- a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,7 +37,8 @@ import org.eclipse.jetty.util.security.Password;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sparky.util.Encryptor;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventorySslConfig;
+import org.onap.aai.sparky.util.Encryptor;
 
 //import com.att.aai.util.EncryptedConfiguration;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
index c9d071f..6a70c67 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -38,9 +38,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.exception.ElasticSearchOperationException;
-
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
 
 import ch.qos.logback.classic.Level;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
index b3abd14..dd04248 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
index db0dc8c..eafef21 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
index 60ac538..8fd0c86 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
index af74485..18dfdc4 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
index 9b6c9f5..40c9b6d 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/BucketEntity.java
index 0a1a133..5a578aa 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/BucketEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHit.java
index 32dc17a..74c00b9 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHit.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 public class ElasticHit {
 
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
index b10532e..4158903 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
index 54c9278..6dd2d11 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
index ea954d9..7bcd318 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
index 4b11f8c..5aec440 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/PayloadEntity.java
index 360abdf..5f5e333 100644
--- a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/PayloadEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 public class PayloadEntity {
 
diff --git a/src/test/java/org/openecomp/sparky/dal/rest/RestClientBuilderTest.java b/src/test/java/org/onap/aai/sparky/dal/rest/RestClientBuilderTest.java
index 80ee21f..4dbcdea 100644
--- a/src/test/java/org/openecomp/sparky/dal/rest/RestClientBuilderTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/rest/RestClientBuilderTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,7 +41,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.sparky.security.SecurityContextFactory;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.security.SecurityContextFactory;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import ch.qos.logback.classic.Level;
diff --git a/src/test/java/org/openecomp/sparky/dal/rest/RestfulDataAccessorTest.java b/src/test/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessorTest.java
index b898d90..0c9967d 100644
--- a/src/test/java/org/openecomp/sparky/dal/rest/RestfulDataAccessorTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessorTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyObject;
@@ -36,6 +36,9 @@ import static org.mockito.Mockito.mock;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import com.sun.jersey.api.client.Client;
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/DocumentEntity.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/DocumentEntity.java
index 6285e9c..4d85bd6 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/DocumentEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/DocumentEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/EntityCountResponse.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/EntityCountResponse.java
index 3940b28..d6e9971 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/EntityCountResponse.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/EntityCountResponse.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationEntity.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationEntity.java
index 3ab5e30..0f1609b 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationEntity.java
@@ -22,12 +22,12 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sparky.dal.elasticsearch.entity.BucketEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.BucketEntity;
 
 public class GroupByAggregationEntity {
   private int totalChartHits;
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
index 4ef3be1..0af4600 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/HitEntity.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/HitEntity.java
index f5036e7..755e903 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/HitEntity.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/HitEntity.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 public class HitEntity {
 
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
index e665bc2..e815e0b 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionResponse.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionResponse.java
index 0e6398f..d3d4a4c 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionResponse.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionResponse.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 public class SearchAbstractionResponse {
   
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchResult.java b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchResult.java
index 992d5b5..e484fa6 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchResult.java
+++ b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchResult.java
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.List;
 
diff --git a/src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java b/src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java
index 9274c30..2a8a945 100644
--- a/src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java
+++ b/src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.inventory;
+package org.onap.aai.sparky.inventory;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sparky.inventory.entity.GeoIndexDocument;
+import org.onap.aai.sparky.inventory.entity.GeoIndexDocument;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
diff --git a/src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java b/src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java
index c387e49..cd4e69e 100644
--- a/src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java
+++ b/src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.security;
+package org.onap.aai.sparky.security;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -35,7 +35,9 @@ import javax.net.ssl.SSLContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sparky.util.LogValidator;
+import org.onap.aai.sparky.security.SecurityContextFactory;
+import org.onap.aai.sparky.security.SecurityContextFactoryImpl;
+import org.onap.aai.sparky.util.LogValidator;
 
 import ch.qos.logback.classic.Level;
 
diff --git a/src/test/java/org/openecomp/sparky/security/portal/TestPortalRestAPIServiceImpl.java b/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java
index a39c19d..815199f 100644
--- a/src/test/java/org/openecomp/sparky/security/portal/TestPortalRestAPIServiceImpl.java
+++ b/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.security.portal;
+package org.onap.aai.sparky.security.portal;
 
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
@@ -51,11 +51,13 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl;
+import org.onap.aai.sparky.security.portal.UserManager;
+import org.onap.aai.sparky.security.portal.config.PortalAuthenticationConfig;
+import org.onap.aai.sparky.security.portal.config.RolesConfig;
 import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.security.portal.config.PortalAuthenticationConfig;
-import org.openecomp.sparky.security.portal.config.RolesConfig;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -184,7 +186,7 @@ public class TestPortalRestAPIServiceImpl {
   public void testGetRoles() throws Exception {
     EcompUser user = new EcompUser();
     user.setLoginId(LOGINID_1);
-    user.setRoles(new HashSet<>(portalApi.getAvailableRoles()));
+    user.setRoles(new HashSet<>(portalApi.getAvailableRoles("")));
 
     portalApi.pushUser(user);
 
@@ -239,7 +241,7 @@ public class TestPortalRestAPIServiceImpl {
     EcompUser user = new EcompUser();
     user.setLoginId(LOGINID_1);
     user.setFirstName("Bob");
-    List<EcompRole> availableRoles = portalApi.getAvailableRoles();
+    List<EcompRole> availableRoles = portalApi.getAvailableRoles("");
     user.setRoles(new LinkedHashSet<EcompRole>(availableRoles));
 
     portalApi.pushUser(user);
@@ -256,7 +258,7 @@ public class TestPortalRestAPIServiceImpl {
     EcompUser user = new EcompUser();
     user.setLoginId(LOGINID_1);
     user.setFirstName("Bob");
-    List<EcompRole> availableRoles = portalApi.getAvailableRoles();
+    List<EcompRole> availableRoles = portalApi.getAvailableRoles("");
     user.setRoles(new LinkedHashSet<EcompRole>(availableRoles));
 
     portalApi.pushUser(user);
diff --git a/src/test/java/org/openecomp/sparky/security/portal/TestUserManager.java b/src/test/java/org/onap/aai/sparky/security/portal/TestUserManager.java
index 1a8a9e9..16669fd 100644
--- a/src/test/java/org/openecomp/sparky/security/portal/TestUserManager.java
+++ b/src/test/java/org/onap/aai/sparky/security/portal/TestUserManager.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.security.portal;
+package org.onap.aai.sparky.security.portal;
 
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
@@ -46,8 +46,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.security.portal.UserManager;
+import org.onap.aai.sparky.util.NodeUtils;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.util.NodeUtils;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import com.google.gson.Gson;
diff --git a/src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java b/src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java
index e52995d..3a1406f 100644
--- a/src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java
+++ b/src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java
@@ -23,11 +23,11 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java b/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java
index 0f03f81..eeebac8 100644
--- a/src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java
+++ b/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -32,8 +32,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.util.LogValidator;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.util.LogValidator;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import ch.qos.logback.classic.Level;
diff --git a/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java b/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java
index e09e08a..523f893 100644
--- a/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
+++ b/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java
@@ -23,20 +23,29 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.synchronizer;
-
-import org.openecomp.sparky.dal.aai.ActiveInventoryAdapter;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.cache.InMemoryEntityCache;
-import org.openecomp.sparky.dal.cache.PersistentEntityCache;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.dal.rest.RestfulDataAccessor;
-import org.openecomp.sparky.synchronizer.SyncController.SyncActions;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
+package org.onap.aai.sparky.synchronizer;
+
+import org.onap.aai.sparky.dal.aai.ActiveInventoryAdapter;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.cache.InMemoryEntityCache;
+import org.onap.aai.sparky.dal.cache.PersistentEntityCache;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
+import org.onap.aai.sparky.synchronizer.AutosuggestionSynchronizer;
+import org.onap.aai.sparky.synchronizer.CrossEntityReferenceSynchronizer;
+import org.onap.aai.sparky.synchronizer.ElasticSearchIndexCleaner;
+import org.onap.aai.sparky.synchronizer.GeoSynchronizer;
+import org.onap.aai.sparky.synchronizer.HistoricalEntitySummarizer;
+import org.onap.aai.sparky.synchronizer.IndexCleaner;
+import org.onap.aai.sparky.synchronizer.IndexIntegrityValidator;
+import org.onap.aai.sparky.synchronizer.SearchableEntitySynchronizer;
+import org.onap.aai.sparky.synchronizer.SyncController;
+import org.onap.aai.sparky.synchronizer.SyncController.SyncActions;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
 import org.slf4j.LoggerFactory;
 
 import ch.qos.logback.classic.Level;
diff --git a/src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java b/src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java
index ec23544..31b425a 100644
--- a/src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java
+++ b/src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.ArrayList;
 import java.util.Deque;
diff --git a/src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java b/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java
index 9709bb8..171c163 100644
--- a/src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java
+++ b/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -32,11 +32,11 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.exception.ElasticSearchOperationException;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 /**
  * The Class ElasticEntitySummarizer.
diff --git a/src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java b/src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java
index dc47713..5e47942 100644
--- a/src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java
+++ b/src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java
@@ -23,13 +23,13 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 /**
  * The Class ElasticGarbageInjector.
diff --git a/src/test/java/org/openecomp/sparky/util/ExceptionHelper.java b/src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java
index 6f647c7..6acb1bf 100644
--- a/src/test/java/org/openecomp/sparky/util/ExceptionHelper.java
+++ b/src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 /**
  * The Class ExceptionHelper.
diff --git a/src/test/java/org/openecomp/sparky/util/HttpServletHelper.java b/src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java
index cf3933a..de90f85 100644
--- a/src/test/java/org/openecomp/sparky/util/HttpServletHelper.java
+++ b/src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.fail;
 
diff --git a/src/test/java/org/openecomp/sparky/util/LogValidator.java b/src/test/java/org/onap/aai/sparky/util/LogValidator.java
index 0771ff1..a16a586 100644
--- a/src/test/java/org/openecomp/sparky/util/LogValidator.java
+++ b/src/test/java/org/onap/aai/sparky/util/LogValidator.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.List;
 
diff --git a/src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java b/src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java
index 6e2406c..ecad636 100644
--- a/src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java
+++ b/src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java
@@ -23,9 +23,9 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
 
 /**
  * The Class ModelLoaderTester.
diff --git a/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java b/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java
index c3c7f7f..0388b1c 100644
--- a/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
+++ b/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -40,7 +40,8 @@ import javax.xml.stream.XMLStreamConstants;
 import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.util.NodeUtils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
diff --git a/src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java b/src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java
index a830175..5c82316 100644
--- a/src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java
+++ b/src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -36,7 +36,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
 
 /**
  * The Class OxmModelLoaderTest.
diff --git a/src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java b/src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java
index dd5d7ca..2d277bd 100644
--- a/src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java
+++ b/src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -8,6 +8,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
+import org.onap.aai.sparky.util.SuggestionsPermutation;
 
 public class SuggestionsPermutationsTest {
 
diff --git a/src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java b/src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java
index 27eb0c0..36b11ed 100644
--- a/src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java
+++ b/src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -36,6 +36,8 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.TreeWalker;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java b/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java
index d976dee..911de51 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import java.io.IOException;
 import java.util.Iterator;
 
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
 
 /**
  * The Class ActiveInventoryNodeTester.
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java
index f9605e8..bbee87c 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyObject;
@@ -35,9 +35,9 @@ import static org.mockito.Mockito.mock;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java
index 41db58c..cae9290 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,8 +31,8 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sparky.viewandinspect.entity.EntityEntry;
-import org.openecomp.sparky.viewandinspect.entity.SearchResponse;
+import org.onap.aai.sparky.viewandinspect.entity.EntityEntry;
+import org.onap.aai.sparky.viewandinspect.entity.SearchResponse;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java
index 9e14735..198bbb3 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -50,38 +50,38 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntityFields;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitsEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestElasticSearchResponse;
-import org.openecomp.sparky.dal.elasticsearch.entity.BucketEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticHitsEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticSearchAggegrationResponse;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticSearchAggregation;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticSearchCountResponse;
-import org.openecomp.sparky.dal.elasticsearch.entity.PayloadEntity;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.sas.config.SearchServiceConfig;
-import org.openecomp.sparky.dal.sas.entity.EntityCountResponse;
-import org.openecomp.sparky.dal.sas.entity.GroupByAggregationResponseEntity;
-import org.openecomp.sparky.dal.sas.entity.SearchAbstractionEntityBuilder;
-import org.openecomp.sparky.search.VnfSearchService;
-import org.openecomp.sparky.search.config.SuggestionConfig;
-import org.openecomp.sparky.suggestivesearch.SuggestionEntity;
-import org.openecomp.sparky.util.ExceptionHelper;
-import org.openecomp.sparky.util.HttpServletHelper;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.entity.QuerySearchEntity;
-import org.openecomp.sparky.viewandinspect.entity.SearchResponse;
-import org.openecomp.sparky.viewandinspect.services.SearchServiceWrapper;
-import org.openecomp.sparky.viewandinspect.servlet.SearchServlet;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntityFields;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitsEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestElasticSearchResponse;
+import org.onap.aai.sparky.dal.elasticsearch.entity.BucketEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticHitsEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticSearchAggegrationResponse;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticSearchAggregation;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticSearchCountResponse;
+import org.onap.aai.sparky.dal.elasticsearch.entity.PayloadEntity;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.sas.config.SearchServiceConfig;
+import org.onap.aai.sparky.dal.sas.entity.EntityCountResponse;
+import org.onap.aai.sparky.dal.sas.entity.GroupByAggregationResponseEntity;
+import org.onap.aai.sparky.dal.sas.entity.SearchAbstractionEntityBuilder;
+import org.onap.aai.sparky.search.VnfSearchService;
+import org.onap.aai.sparky.search.config.SuggestionConfig;
+import org.onap.aai.sparky.suggestivesearch.SuggestionEntity;
+import org.onap.aai.sparky.util.ExceptionHelper;
+import org.onap.aai.sparky.util.HttpServletHelper;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.sparky.viewandinspect.entity.SearchResponse;
+import org.onap.aai.sparky.viewandinspect.services.SearchServiceWrapper;
+import org.onap.aai.sparky.viewandinspect.servlet.SearchServlet;
 import org.slf4j.MDC;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java
index 13088ba..d378c3a 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 /**
  * The Class SearchableGroupsTest.
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java b/src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
index fe3a8f8..41efbab 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
@@ -23,11 +23,11 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
-import org.openecomp.sparky.viewandinspect.services.VisualizationContext;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.services.VisualizationContext;
 
 /**
  * The Class SelfLinkNodeCollectorTester.
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java b/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
index 41ad2c6..0fff1fb 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 
 import static org.junit.Assert.assertEquals;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.sparky.viewandinspect.entity.QuerySearchEntity;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/entity/EntityEntryTest.java b/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java
index 6dfa448..496ceb2 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/entity/EntityEntryTest.java
+++ b/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 
 import static org.junit.Assert.assertEquals;
@@ -34,6 +34,7 @@ import java.security.NoSuchAlgorithmException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.viewandinspect.entity.EntityEntry;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**