22 files changed, 49 insertions, 52 deletions
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/aai/AaiResponse.java b/vid-automation/src/test/java/org/onap/vid/model/aai/AaiResponse.java
index 3124ca407..389cdd88e 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/aai/AaiResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/aai/AaiResponse.java
@@ -1,7 +1,7 @@
-package org.opencomp.vid.model.aai;
+package org.onap.vid.model.aai;
 
 import com.google.common.base.MoreObjects;
-import org.opencomp.vid.model.mso.ProxyResponse;
+import org.onap.vid.model.mso.ProxyResponse;
 
 /**
  * Created by Oren on 7/10/17.
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/asyncInstantiation/JobAuditStatus.java b/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java
index 254eb9c00..7c1481562 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/asyncInstantiation/JobAuditStatus.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java
@@ -1,11 +1,8 @@
-package org.opencomp.vid.model.asyncInstantiation;
+package org.onap.vid.model.asyncInstantiation;
 
-import com.google.common.collect.ImmutableList;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import vid.automation.test.model.JobStatus;
 
-import java.util.Date;
 import java.util.UUID;
 
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/asyncInstantiation/ServiceInfo.java b/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/ServiceInfo.java
index ee3cd7a77..371aaf81e 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/asyncInstantiation/ServiceInfo.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/ServiceInfo.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.asyncInstantiation;
+package org.onap.vid.model.asyncInstantiation;
 
 
 import vid.automation.test.model.JobStatus;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/category/AddCategoryOptionResponse.java b/vid-automation/src/test/java/org/onap/vid/model/category/AddCategoryOptionResponse.java
index 9cfaec954..eb60b85f0 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/category/AddCategoryOptionResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/category/AddCategoryOptionResponse.java
@@ -1,6 +1,6 @@
-package org.opencomp.vid.model.category;
+package org.onap.vid.model.category;
 
-import org.opencomp.vid.model.workflow.ListOfErrorsResponse;
+import org.onap.vid.model.workflow.ListOfErrorsResponse;
 
 import java.util.List;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/category/AddCategoryOptionsRequest.java b/vid-automation/src/test/java/org/onap/vid/model/category/AddCategoryOptionsRequest.java
index 2c3edfde5..dc12a79a2 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/category/AddCategoryOptionsRequest.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/category/AddCategoryOptionsRequest.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.category;
+package org.onap.vid.model.category;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/category/CategoryParameterOption.java b/vid-automation/src/test/java/org/onap/vid/model/category/CategoryParameterOption.java
index 2aa839247..39e7eb76f 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/category/CategoryParameterOption.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/category/CategoryParameterOption.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.category;
+package org.onap.vid.model.category;
 
 public class CategoryParameterOption {
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/category/CategoryParameterOptionRep.java b/vid-automation/src/test/java/org/onap/vid/model/category/CategoryParameterOptionRep.java
index 27b42e66f..fd554ef6a 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/category/CategoryParameterOptionRep.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/category/CategoryParameterOptionRep.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.category;
+package org.onap.vid.model.category;
 
 public class CategoryParameterOptionRep {
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/category/CategoryParametersResponse.java b/vid-automation/src/test/java/org/onap/vid/model/category/CategoryParametersResponse.java
index 9b9cc8408..721c01e5b 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/category/CategoryParametersResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/category/CategoryParametersResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.category;
+package org.onap.vid.model.category;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/probe/ExternalComponentStatus.java b/vid-automation/src/test/java/org/onap/vid/model/probe/ExternalComponentStatus.java
index 8d548842f..439764945 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/probe/ExternalComponentStatus.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/probe/ExternalComponentStatus.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.probe;
+package org.onap.vid.model.probe;
 
 public class ExternalComponentStatus {
     public enum Component {AAI, MSO}
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/probe/HttpRequestMetadata.java b/vid-automation/src/test/java/org/onap/vid/model/probe/HttpRequestMetadata.java
index 4ab5ae4a8..1443c4660 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/probe/HttpRequestMetadata.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/probe/HttpRequestMetadata.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.probe;
+package org.onap.vid.model.probe;
 
 import org.springframework.http.HttpMethod;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/GetVnfWorkflowRelationRequest.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/GetVnfWorkflowRelationRequest.java
index e2f15ba95..3e831747f 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/GetVnfWorkflowRelationRequest.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/GetVnfWorkflowRelationRequest.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/GetWorkflowsResponse.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/GetWorkflowsResponse.java
index f1005b2aa..cc52017e4 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/GetWorkflowsResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/GetWorkflowsResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import java.util.List;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/ListOfErrorsResponse.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/ListOfErrorsResponse.java
index 60b733fe4..0f38c2f4f 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/ListOfErrorsResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/ListOfErrorsResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfDetails.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfDetails.java
index a7b27356c..7e04dc0d1 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfDetails.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfDetails.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfDetailsWithWorkflows.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfDetailsWithWorkflows.java
index 953e25b77..92d227de9 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfDetailsWithWorkflows.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfDetailsWithWorkflows.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 
 import java.util.List;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfWorkflowRelationAllResponse.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfWorkflowRelationAllResponse.java
index 3f0cc3ef9..2a4f0aa37 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfWorkflowRelationAllResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfWorkflowRelationAllResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import java.util.List;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfWorkflowRelationRequest.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfWorkflowRelationRequest.java
index 86ac2b40c..b9553bcc5 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfWorkflowRelationRequest.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfWorkflowRelationRequest.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfWorkflowRelationResponse.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfWorkflowRelationResponse.java
index fdc57ad17..1badf169a 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/VnfWorkflowRelationResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/VnfWorkflowRelationResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 
 import java.util.List;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/WorkflowsDetail.java b/vid-automation/src/test/java/org/onap/vid/model/workflow/WorkflowsDetail.java
index a67f724c8..609804c68 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/workflow/WorkflowsDetail.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/workflow/WorkflowsDetail.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.workflow;
+package org.onap.vid.model.workflow;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java
index 8b3d244b5..6656a6c6b 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/more/LoggerFormatTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java
@@ -1,24 +1,18 @@
-package org.opencomp.vid.more;
+package org.onap.vid.more;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.lang3.StringUtils;
-import org.opencomp.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
-import org.opencomp.vid.api.BaseApiTest;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
+import org.onap.vid.api.BaseApiTest;
 import org.springframework.web.client.RestTemplate;
-import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import vid.automation.test.services.SimulatorApi;
 
 import java.net.URI;
-import java.time.LocalDate;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/more/RequestIdFilterInstalled.java b/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java
index 637904766..5a0a0f845 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/more/RequestIdFilterInstalled.java
+++ b/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java
@@ -1,12 +1,12 @@
-package org.opencomp.vid.more;
+package org.onap.vid.more;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.opencomp.vid.api.BaseApiTest;
-import org.opencomp.vid.api.OperationalEnvironmentControllerApiTest;
-import org.opencomp.vid.api.ServiceInstanceMsoApiTest;
+import org.onap.vid.api.OperationalEnvironmentControllerApiTest;
+import org.onap.vid.api.BaseApiTest;
+import org.onap.vid.api.ServiceInstanceMsoApiTest;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -21,8 +21,8 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
-import static org.opencomp.vid.api.CategoryParametersApiTest.GET_CATEGORY_PARAMETER_PROPERTIES;
-import static org.opencomp.vid.api.pProbeMsoApiTest.MSO_CREATE_CONFIGURATION;
+import static org.onap.vid.api.CategoryParametersApiTest.GET_CATEGORY_PARAMETER_PROPERTIES;
+import static org.onap.vid.api.pProbeMsoApiTest.MSO_CREATE_CONFIGURATION;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/more/SimulatorLoaderTest.java b/vid-automation/src/test/java/org/onap/vid/more/SimulatorLoaderTest.java
index 2bcf0698f..bc550ae19 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/more/SimulatorLoaderTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/more/SimulatorLoaderTest.java
@@ -1,16 +1,22 @@
-package org.opencomp.vid.more;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BasePreset;
-import org.opencomp.simulator.presetGenerator.presets.aai.*;
-import org.opencomp.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet;
-import org.opencomp.simulator.presetGenerator.presets.ecompportal_att.PresetGetUserGet;
-import org.opencomp.simulator.presetGenerator.presets.mso.PresetActivateServiceInstancePost;
-import org.opencomp.simulator.presetGenerator.presets.mso.PresetDeactivateServiceInstancePost;
-import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost;
-import org.opencomp.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet;
-import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet;
-import org.opencomp.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet;
-import org.opencomp.vid.api.BaseApiTest;
+package org.onap.vid.more;
+
+import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIBadBodyForGetServicesGet;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPNFByRegionErrorPut;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAISearchNodeQueryEmptyResult;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut;
+import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet;
+import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetUserGet;
+import org.onap.simulator.presetGenerator.presets.mso.PresetActivateServiceInstancePost;
+import org.onap.simulator.presetGenerator.presets.mso.PresetDeactivateServiceInstancePost;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet;
+import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet;
+import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet;
+import org.onap.vid.api.BaseApiTest;
 import org.springframework.http.HttpMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;