24 files changed, 29 insertions, 29 deletions
diff --git a/vid-automation/src/main/resources/META-INF/aop-ajc.xml b/vid-automation/src/main/resources/META-INF/aop-ajc.xml
index f042540d1..7376e3291 100644
--- a/vid-automation/src/main/resources/META-INF/aop-ajc.xml
+++ b/vid-automation/src/main/resources/META-INF/aop-ajc.xml
@@ -10,7 +10,7 @@
     </aspects>
     <weaver options="-Xset:weaveJavaxPackages=true -warn:none -Xlint:ignore">
         <include within="vid.automation..*"/>
-        <include within="org.opencomp..*"/>
+        <include within="org.onap..*"/>
         <include within="com.att.automation..*"/>
         <include within="com.epam..*"/>
         <include within="org.testng.TestNG"/>
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ChangeManagementRequest.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java
index 273706686..91dd3ff27 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ChangeManagementRequest.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ChangeManagementRequestDetails.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequestDetails.java
index 4e50e10cd..ad0a38153 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ChangeManagementRequestDetails.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequestDetails.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/CloudConfiguration.java b/vid-automation/src/test/java/org/onap/vid/model/mso/CloudConfiguration.java
index 279fda1b7..0200bd6fd 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/CloudConfiguration.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/CloudConfiguration.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 
 public class CloudConfiguration {
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ExceptionResponse.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ExceptionResponse.java
index b7711b57b..6801af2b5 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ExceptionResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ExceptionResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 /**
  * The Class ExceptionResponse.
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ModelInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ModelInfo.java
index c636760eb..183d6dfd3 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ModelInfo.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ModelInfo.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/MsoExceptionResponse.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoExceptionResponse.java
index 4f11f67fa..81b506060 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/MsoExceptionResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoExceptionResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 public class MsoExceptionResponse {
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/MsoResponseWrapper2.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java
index d0487e19c..29fa931d5 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/MsoResponseWrapper2.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/MsoResponseWrapperInterface.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java
index aafa4c339..eb305d2df 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/MsoResponseWrapperInterface.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/OperationalEnvironment.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java
index 66c5b1834..59e0e2f37 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/OperationalEnvironment.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/OperationalEnvironmentList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java
index 9cd0b7ab7..1ff84d3a3 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/OperationalEnvironmentList.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ProxyResponse.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ProxyResponse.java
index b8c387d81..7352d0529 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/ProxyResponse.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ProxyResponse.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelatedInstance.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstance.java
index fad7c32bd..900f628dc 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelatedInstance.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstance.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelatedInstanceList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstanceList.java
index 5e6ccae6d..81e871281 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelatedInstanceList.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstanceList.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelatedToProperty.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java
index 6d012f985..60fff94ab 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelatedToProperty.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 
 import org.codehaus.jackson.annotate.JsonProperty;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/Relationship.java b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java
index 814237db5..a8f0f22de 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/Relationship.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import org.codehaus.jackson.annotate.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelationshipData.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java
index 4fdac42a0..1e6ad2a19 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelationshipData.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 
 import org.codehaus.jackson.annotate.JsonProperty;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelationshipList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java
index e2b5d5ef4..56a077d5a 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RelationshipList.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java
@@ -1,4 +1,4 @@
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import org.codehaus.jackson.annotate.JsonProperty;
 
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RequestDetails.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestDetails.java
index b56a7d985..368350e81 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RequestDetails.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -152,7 +152,7 @@ public class RequestDetails {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#toString()
+     * @see org.onap.vid.domain.mso.RequestDetails#toString()
      */
     @Override
     public String toString() {
@@ -160,7 +160,7 @@ public class RequestDetails {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#getAdditionalProperties()
+     * @see org.onap.vid.domain.mso.RequestDetails#getAdditionalProperties()
      */
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
@@ -168,7 +168,7 @@ public class RequestDetails {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#setAdditionalProperty(java.lang.String, java.lang.Object)
+     * @see org.onap.vid.domain.mso.RequestDetails#setAdditionalProperty(java.lang.String, java.lang.Object)
      */
     @JsonAnySetter
     public void setAdditionalProperty(String name, Object value) {
@@ -176,7 +176,7 @@ public class RequestDetails {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#hashCode()
+     * @see org.onap.vid.domain.mso.RequestDetails#hashCode()
      */
     @Override
     public int hashCode() {
@@ -184,7 +184,7 @@ public class RequestDetails {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.vid.domain.mso.RequestDetails#equals(java.lang.Object)
+     * @see org.onap.vid.domain.mso.RequestDetails#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object other) {
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RequestInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java
index 6a6844bce..d25acbd21 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RequestInfo.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java
@@ -1,5 +1,5 @@
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RequestParameters.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java
index 63157e6e5..d3574d7b5 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RequestParameters.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java
@@ -1,5 +1,5 @@
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RestObject.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java
index 1734d25f4..b91ea410a 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/RestObject.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.MoreObjects;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/SubscriberInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java
index 2f176f775..67cded838 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/SubscriberInfo.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java
@@ -1,5 +1,5 @@
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/vid-automation/src/test/java/org/opencomp/vid/model/mso/UserParam.java b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java
index ab449c2a9..384e45631 100644
--- a/vid-automation/src/test/java/org/opencomp/vid/model/mso/UserParam.java
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java
@@ -1,5 +1,5 @@
 
-package org.opencomp.vid.model.mso;
+package org.onap.vid.model.mso;
 
 import com.fasterxml.jackson.annotation.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;