Add sdc startup in IT

Rework the java packages so that we use onap now + fix the folders written outside of the target folder

Issue-ID: SDC-3232
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I23c2bad4bee6b766cfacc2c544e1431aed4cd608

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/AttSdcTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/AttSdcTest.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/AttSdcTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/AttSdcTest.java
index b3373ee..db6212e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/AttSdcTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/AttSdcTest.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.junit.*;
 import org.junit.rules.TestName;
 import org.junit.rules.TestWatcher;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.rules.MyTestWatcher;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.rules.MyTestWatcher;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java
index 8c238ce..e9986db 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java
@@ -18,14 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import com.aventstack.extentreports.ExtentTest;
 import com.aventstack.extentreports.Status;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,6 +35,14 @@ import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
@@ -43,20 +50,12 @@ import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CatalogRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestContext;
 import org.testng.ITestResult;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentInstanceBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentInstanceBaseTest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentInstanceBaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentInstanceBaseTest.java
index 678ebc4..d82f52e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ComponentInstanceBaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentInstanceBaseTest.java
@@ -18,25 +18,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.junit.rules.TestName;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.testng.Assert;
+package org.onap.sdc.backend.ci.tests.api;
 
 import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.testng.Assert;
 
 import static org.testng.AssertJUnit.*;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java
index 194966d..02fe121 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentManager.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 import com.aventstack.extentreports.ExtentReports;
 import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
 import com.aventstack.extentreports.reporter.ExtentXReporter;
 import com.aventstack.extentreports.reporter.configuration.Protocol;
 import com.aventstack.extentreports.reporter.configuration.Theme;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
-import org.openecomp.sdc.ci.tests.utils.rest.AutomationUtils;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
+import org.onap.sdc.backend.ci.tests.utils.rest.AutomationUtils;
 import org.testng.ITestContext;
 
 import java.io.File;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestActions.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentTestActions.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestActions.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentTestActions.java
index 5cb5a5b..e0f7927 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestActions.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentTestActions.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 import com.aventstack.extentreports.ExtentTest;
 import com.aventstack.extentreports.Status;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestManager.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentTestManager.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestManager.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentTestManager.java
index 810f6a6..a3fc563 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/ExtentTestManager.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentTestManager.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 import com.aventstack.extentreports.ExtentReports;
 import com.aventstack.extentreports.ExtentTest;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/SomeInterface.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/SomeInterface.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/SomeInterface.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/SomeInterface.java
index ce679a9..729e7b1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/SomeInterface.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/SomeInterface.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 import com.aventstack.extentreports.ExtentTest;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/Urls.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/Urls.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/Urls.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/Urls.java
index 956d9b1..583c7a4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/api/Urls.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/Urls.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.api;
+package org.onap.sdc.backend.ci.tests.api;
 
 
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 public interface Urls {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/capability/CapabilitiesTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/capability/CapabilitiesTest.java
similarity index 92%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/capability/CapabilitiesTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/capability/CapabilitiesTest.java
index 179c1c2..f606f2c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/capability/CapabilitiesTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/capability/CapabilitiesTest.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.capability;
+package org.onap.sdc.backend.ci.tests.capability;
 
 import fj.data.Either;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CapabilityRestUtils;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.CapabilityDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CapabilityRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.CapabilityDetails;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -43,8 +43,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.getResourceObject;
-import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.getServiceObject;
+import static org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils.getResourceObject;
+import static org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils.getServiceObject;
 import static org.testng.AssertJUnit.fail;
 
 public class CapabilitiesTest extends ComponentBaseTest {
@@ -109,7 +109,7 @@ public class CapabilitiesTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "updateCapabilityOnServiceTest")
     public void getCapabilityFromServiceTest() throws Exception {
-        Service serviceObject = getServiceObject(service.getUniqueId());
+        Service serviceObject = AtomicOperationUtils.getServiceObject(service.getUniqueId());
 
         List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = serviceObject.getCapabilities()
                 .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
@@ -122,7 +122,7 @@ public class CapabilitiesTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "getCapabilityFromServiceTest")
     public void deleteCapabilityFromServiceTest() throws Exception {
-        Service serviceObject = getServiceObject(service.getUniqueId());
+        Service serviceObject = AtomicOperationUtils.getServiceObject(service.getUniqueId());
 
         List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = serviceObject.getCapabilities()
                 .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
@@ -196,7 +196,7 @@ public class CapabilitiesTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "updateCapabilityOnVfTest")
     public void getCapabilityFromVfTest() throws Exception {
-        Resource resourceObject = getResourceObject(resource.getUniqueId());
+        Resource resourceObject = AtomicOperationUtils.getResourceObject(resource.getUniqueId());
 
         List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = resourceObject.getCapabilities()
                 .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
@@ -209,7 +209,7 @@ public class CapabilitiesTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "getCapabilityFromVfTest")
     public void deleteCapabilityFromVfTest() throws Exception {
-        Resource resourceObject = getResourceObject(resource.getUniqueId());
+        Resource resourceObject = AtomicOperationUtils.getResourceObject(resource.getUniqueId());
 
         List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = resourceObject.getCapabilities()
                 .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
@@ -284,7 +284,7 @@ public class CapabilitiesTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "updateCapabilityOnPnfTest")
     public void getCapabilityFromPnfTest() throws Exception {
-        Resource pnfResourceObject = getResourceObject(pnfResource.getUniqueId());
+        Resource pnfResourceObject = AtomicOperationUtils.getResourceObject(pnfResource.getUniqueId());
 
         List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = pnfResourceObject.getCapabilities()
                 .values().stream().flatMap(Collection::stream).collect(Collectors.toList());
@@ -297,7 +297,7 @@ public class CapabilitiesTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "getCapabilityFromPnfTest")
     public void deleteCapabilityFromPnfTest() throws Exception {
-        Resource pnfResourceObject = getResourceObject(pnfResource.getUniqueId());
+        Resource pnfResourceObject = AtomicOperationUtils.getResourceObject(pnfResource.getUniqueId());
 
         List<org.openecomp.sdc.be.model.CapabilityDefinition> capabilityDefinitionList = pnfResourceObject.getCapabilities()
                 .values().stream().flatMap(Collection::stream).collect(Collectors.toList());

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/Config.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/Config.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/Config.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/Config.java
index f25f16d..f8368bd 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/Config.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/Config.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.config;
+package org.onap.sdc.backend.ci.tests.config;
 
 import org.yaml.snakeyaml.Yaml;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/InvokedMethodListener.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/InvokedMethodListener.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/InvokedMethodListener.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/InvokedMethodListener.java
index bfed5dc..5e743c2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/InvokedMethodListener.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/InvokedMethodListener.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.config;
+package org.onap.sdc.backend.ci.tests.config;
 
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/UserCredentialsFromFile.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/UserCredentialsFromFile.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/UserCredentialsFromFile.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/UserCredentialsFromFile.java
index 9dbe929..9d3f155 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/config/UserCredentialsFromFile.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/config/UserCredentialsFromFile.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.config;
+package org.onap.sdc.backend.ci.tests.config;
 
-import org.openecomp.sdc.ci.tests.datatypes.UserCredentials;
-import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.onap.sdc.backend.ci.tests.datatypes.UserCredentials;
+import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/data/providers/OnboardingDataProviders.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/data/providers/OnboardingDataProviders.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java
index a2f39b3..5b6ecbf 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/data/providers/OnboardingDataProviders.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java
@@ -17,7 +17,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.data.providers;
+package org.onap.sdc.backend.ci.tests.data.providers;
 
 import static org.testng.Assert.fail;
 
@@ -27,9 +27,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
-import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
-import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.XnfTypeEnum;
+import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
+import org.onap.sdc.backend.ci.tests.utils.general.OnboardingUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.DataProvider;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactAssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactAssetStructure.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactAssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactAssetStructure.java
index 37f6243..2262ca6 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactAssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactAssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class ArtifactAssetStructure {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java
index 4217a0e..2fdb396 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ArtifactReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.model.HeatParameterDefinition;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/AssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/AssetStructure.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/AssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/AssetStructure.java
index 8820b05..9f1121f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/AssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/AssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class AssetStructure {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CapabilityDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/CapabilityDetails.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CapabilityDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/CapabilityDetails.java
index bbed28b..00492ef 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CapabilityDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/CapabilityDetails.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentInstanceReqDetails.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentInstanceReqDetails.java
index b276850..3392a74 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentInstanceReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentInstanceReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.List;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java
index 36c9fc8..cff2ea8 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ComponentReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CsarArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/CsarArtifacts.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CsarArtifacts.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/CsarArtifacts.java
index f337976..8658d81 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/CsarArtifacts.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/CsarArtifacts.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class CsarArtifacts {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/DistributionMonitorObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/DistributionMonitorObject.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/DistributionMonitorObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/DistributionMonitorObject.java
index 7dfbcd4..a35ad0f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/DistributionMonitorObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/DistributionMonitorObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class DistributionMonitorObject {
        

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/GroupHeatMetaDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/GroupHeatMetaDefinition.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/GroupHeatMetaDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/GroupHeatMetaDefinition.java
index 5ebb260..c60e33e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/GroupHeatMetaDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/GroupHeatMetaDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
index 8803302..5dc30e4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/HeatMetaFirstLevelDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class HeatMetaFirstLevelDefinition {
        

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ImportReqDetails.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ImportReqDetails.java
index d877150..a42da88 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ImportReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ImportReqDetails.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.*;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingData.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/LicensingData.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingData.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/LicensingData.java
index 788d609..858313b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingData.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/LicensingData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 import java.util.List;
 
 public class LicensingData {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingVersion.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/LicensingVersion.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingVersion.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/LicensingVersion.java
index 073bdac..cd45d52 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/LicensingVersion.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/LicensingVersion.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class LicensingVersion {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ProductReqDetails.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ProductReqDetails.java
index 61d923e..c5aecd8 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ProductReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ProductReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyHeatMetaDefinition.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyHeatMetaDefinition.java
index 5c9083d..1ffe56d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyHeatMetaDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class PropertyHeatMetaDefinition {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyObject.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyObject.java
index b969d4d..9adda47 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java
index 6408688..1fbdbb2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/PropertyReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/RequirementDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/RequirementDetails.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/RequirementDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/RequirementDetails.java
index a720786..b44c415 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/RequirementDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/RequirementDetails.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class RequirementDetails {
     private String capability;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceAssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceAssetStructure.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceAssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceAssetStructure.java
index 62f5e0c..a256137 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceAssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceAssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class ResourceAssetStructure extends AssetStructure {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceDetailedAssetStructure.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceDetailedAssetStructure.java
index b521b4b..5498884 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceDetailedAssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.List;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceExternalReqDetails.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceExternalReqDetails.java
index 5a968fd..2d9ba2c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceExternalReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceInstanceAssetStructure.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceInstanceAssetStructure.java
index 6a69120..39d42b2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceInstanceAssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.List;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceReqDetails.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceReqDetails.java
index cfb7845..d285c0b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java
index 78408bd..706da45 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ResourceRespJavaObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceAssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceAssetStructure.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceAssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceAssetStructure.java
index 015d228..211e714 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceAssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceAssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class ServiceAssetStructure extends AssetStructure {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceDetailedAssetStructure.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceDetailedAssetStructure.java
index cc283a3..6eb7817 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceDetailedAssetStructure.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.List;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDistributionStatus.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceDistributionStatus.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDistributionStatus.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceDistributionStatus.java
index fa80999..3aa5a05 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceDistributionStatus.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceDistributionStatus.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class ServiceDistributionStatus {
        

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceFilterDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceFilterDetails.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceFilterDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceFilterDetails.java
index caeae85..c5be625 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceFilterDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceFilterDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class ServiceFilterDetails {
     private String servicePropertyName;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceReqDetails.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceReqDetails.java
index 85e7cf6..9c8199e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceReqDetails.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ServiceInstantiationType;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceInstantiationType;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceRespJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceRespJavaObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java
index 7bec221..c7d9caa 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/ServiceRespJavaObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.ArrayList;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/TypeHeatMetaDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/TypeHeatMetaDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/TypeHeatMetaDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/TypeHeatMetaDefinition.java
index d0f0292..b30e3ed 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/TypeHeatMetaDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/TypeHeatMetaDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import java.util.List;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/UserCredentials.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/UserCredentials.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/UserCredentials.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/UserCredentials.java
index 2de8725..693cfb7 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/UserCredentials.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/UserCredentials.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import org.openecomp.sdc.be.model.User;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorLicenseModel.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorLicenseModel.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorLicenseModel.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorLicenseModel.java
index 4ed0e83..4e49f0c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorLicenseModel.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorLicenseModel.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObject.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObject.java
index 96308b3..4aa30ec 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class VendorSoftwareProductObject extends VendorSoftwareProductObjectReqDetails {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
index d69f14f..918d126 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes;
+package org.onap.sdc.backend.ci.tests.datatypes;
 
 public class VendorSoftwareProductObjectReqDetails {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java
index 17be933..5271fed 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ArtifactTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AssocType.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AssocType.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AssocType.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AssocType.java
index 82e9a36..bd68990 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AssocType.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AssocType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum AssocType {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AuditEnum.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AuditEnum.java
index a713d50..5836276 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AuditEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum AuditEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditJsonKeysEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
index 308ea5c..911878d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/AuditJsonKeysEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum AuditJsonKeysEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CircleSize.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/CircleSize.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CircleSize.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/CircleSize.java
index 82142db..8615fd7 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CircleSize.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/CircleSize.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum CircleSize {
     VF(),

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ComponentType.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ComponentType.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ComponentType.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ComponentType.java
index 3d242e8..109b9eb 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ComponentType.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ComponentType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum ComponentType {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CvfcTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/CvfcTypeEnum.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CvfcTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/CvfcTypeEnum.java
index 0e623aa..daf0f0c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/CvfcTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/CvfcTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum CvfcTypeEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
index 7042a95..95dc764 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/DistributionNotificationStatusEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum DistributionNotificationStatusEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ErrorInfo.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ErrorInfo.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ErrorInfo.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ErrorInfo.java
index 2d5075e..a87d303 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ErrorInfo.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ErrorInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public class ErrorInfo {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
index 6bfbd8a..33d249d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/EsIndexTypeIdToDelete.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public class EsIndexTypeIdToDelete {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ExceptionEnumType.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ExceptionEnumType.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ExceptionEnumType.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ExceptionEnumType.java
index 59d1dec..357fd78 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ExceptionEnumType.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ExceptionEnumType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum ExceptionEnumType {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/GroupPropertyEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/GroupPropertyEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/GroupPropertyEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/GroupPropertyEnum.java
index 24538b7..5d1aa32 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/GroupPropertyEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/GroupPropertyEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ImportTestTypesEnum.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ImportTestTypesEnum.java
index ed71faa..159ba74 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ImportTestTypesEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ImportTestTypesEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/LifeCycleStatesEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
index 7c330a3..f8b902a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/LifeCycleStatesEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum LifeCycleStatesEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
index 5889243..9e7270e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryResourceArtifactTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
index b73d5a8..ee3e3db 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/MandatoryServiceArtifactTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum MandatoryServiceArtifactTypeEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/NormativeTypesEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/NormativeTypesEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/NormativeTypesEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/NormativeTypesEnum.java
index 389b962..f8a1329 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/NormativeTypesEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/NormativeTypesEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum NormativeTypesEnum {
        ROOT("tosca.nodes.Root", "root"), COMPUTE("tosca.nodes.Compute", "compute"), BLOCK_STORAGE("tosca.nodes.BlockStorage", "blockStorage"), CONTAINER_APPLICATION("tosca.nodes.Container.Application", "containerApplication"), 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/OriginTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/OriginTypeEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/OriginTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/OriginTypeEnum.java
index d85a496..5941391 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/OriginTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/OriginTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/PropertyTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/PropertyTypeEnum.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/PropertyTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/PropertyTypeEnum.java
index b5550fc..18ff347 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/PropertyTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/PropertyTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ResourceCategoryEnum.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ResourceCategoryEnum.java
index 1ba6c5c..1c39626 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ResourceCategoryEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ResourceCategoryEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import java.util.Random;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/RespJsonKeysEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/RespJsonKeysEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/RespJsonKeysEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/RespJsonKeysEnum.java
index a977e38..691edd8 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/RespJsonKeysEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/RespJsonKeysEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum RespJsonKeysEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/SearchCriteriaEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/SearchCriteriaEnum.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/SearchCriteriaEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/SearchCriteriaEnum.java
index f26423a..dc04408 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/SearchCriteriaEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/SearchCriteriaEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
index 4cfcc8a..7844cf2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceApiArtifactEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum ServiceApiArtifactEnum {
        CONFIGURATION("Configuration".toLowerCase()), INSTANTIATION("Instantiation".toLowerCase()), MONITORING("Monitoring".toLowerCase()), REPORTING("Reporting".toLowerCase()), LOGGING("Logging".toLowerCase()), TESTING("Testing".toLowerCase());

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceCategoriesEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
index 959315a..58918c3 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceCategoriesEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import java.util.Random;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceInstantiationType.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceInstantiationType.java
index bba2fe6..2ebce72 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ServiceInstantiationType.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ServiceInstantiationType.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum ServiceInstantiationType {
        A_LA_CARTE("A-la-carte"), MACRO("Macro");

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ToscaKeysEnum.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ToscaKeysEnum.java
index 24adc49..57acf19 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/ToscaKeysEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/ToscaKeysEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum ToscaKeysEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/UserRoleEnum.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/UserRoleEnum.java
index 65c7f9e..c26f891 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/UserRoleEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/UserRoleEnum.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.openecomp.sdc.ci.tests.config.UserCredentialsFromFile;
-import org.openecomp.sdc.ci.tests.datatypes.UserCredentials;
+import org.onap.sdc.backend.ci.tests.config.UserCredentialsFromFile;
+import org.onap.sdc.backend.ci.tests.datatypes.UserCredentials;
 
 @Getter
 public enum UserRoleEnum {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/XnfTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/XnfTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java
index db94817..88f6b6c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/enums/XnfTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.enums;
+package org.onap.sdc.backend.ci.tests.datatypes.enums;
 
 public enum XnfTypeEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedArtifactAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
index 344f353..583242b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedArtifactAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
index 0d6a5f3..782d1f6 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedAuthenticationAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedAuthenticationAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedCategoryAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
index b11f7f5..463ae6d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedCategoryAudit {
        String action;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
index 4b135f6..e245454 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedDistDownloadAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedDistDownloadAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
index 1414742..7e74180 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedEcomConsumerAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedEcomConsumerAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedExternalAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedExternalAudit.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedExternalAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedExternalAudit.java
index bc15a0e..ecd4106 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedExternalAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedExternalAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedExternalAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
index 561b92a..288950a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedGetUserListAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedGetUserListAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGroupingAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
index b481cb7..28fa36c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedGroupingAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedGroupingAudit {
        String action;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedProductAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedProductAudit.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedProductAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedProductAudit.java
index 40b86fa..9450787 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedProductAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedProductAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedProductAudit {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
index 59ca7bb..328e077 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedResourceAuditJavaObject {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
index 2bc8625..3289a74 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedUserCRUDAudit.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.expected;
+package org.onap.sdc.backend.ci.tests.datatypes.expected;
 
 public class ExpectedUserCRUDAudit {
        String action;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderData.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HeaderData.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderData.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HeaderData.java
index 2c23b08..3006ddf 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderData.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HeaderData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.http;
+package org.onap.sdc.backend.ci.tests.datatypes.http;
 
 public class HeaderData {
        String contentMd5;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderValue.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HeaderValue.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderValue.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HeaderValue.java
index 4a2ad9a..b2f4617 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HeaderValue.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HeaderValue.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.http;
+package org.onap.sdc.backend.ci.tests.datatypes.http;
 
 public enum HeaderValue {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HttpHeaderEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HttpHeaderEnum.java
index cd3beee..b1fc3e5 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HttpHeaderEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.http;
+package org.onap.sdc.backend.ci.tests.datatypes.http;
 
 public enum HttpHeaderEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HttpRequest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HttpRequest.java
index 9983eb6..f6eb5d6 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/HttpRequest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.http;
+package org.onap.sdc.backend.ci.tests.datatypes.http;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -39,7 +39,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/MustHeaders.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/MustHeaders.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/MustHeaders.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/MustHeaders.java
index 6937608..2af55e2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/MustHeaders.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/MustHeaders.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.http;
+package org.onap.sdc.backend.ci.tests.datatypes.http;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/RestResponse.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/RestResponse.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/RestResponse.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/RestResponse.java
index f11d35a..1cdcac0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/datatypes/http/RestResponse.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/http/RestResponse.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.datatypes.http;
+package org.onap.sdc.backend.ci.tests.datatypes.http;
 
 import java.util.List;
 import java.util.Map;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
index bcd00a1..f30614f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/TODO/ImportCapabilityTypeCITest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.TODO;
+package org.onap.sdc.backend.ci.tests.execute.TODO;
 
 import fj.data.Either;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -28,11 +28,11 @@ import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.DbUtils.JanusGraphState;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils.JanusGraphState;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/DownloadComponentArt.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/DownloadComponentArt.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/DownloadComponentArt.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/DownloadComponentArt.java
index 53b8c31..0197c5f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/DownloadComponentArt.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/DownloadComponentArt.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.artifacts;
+package org.onap.sdc.backend.ci.tests.execute.artifacts;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
@@ -43,30 +43,31 @@ import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Decoder;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ServiceValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.utils.Decoder;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ServiceValidationUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.util.GeneralUtility;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/HeatEnvArtifact.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/HeatEnvArtifact.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/HeatEnvArtifact.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/HeatEnvArtifact.java
index fb70788..28356d2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/HeatEnvArtifact.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/HeatEnvArtifact.java
@@ -18,31 +18,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.artifacts;
+package org.onap.sdc.backend.ci.tests.execute.artifacts;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ServiceInstantiationType;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceInstantiationType;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.testng.annotations.Test;
 import org.yaml.snakeyaml.Yaml;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -65,7 +64,7 @@ public class HeatEnvArtifact extends ComponentBaseTest {
                Resource certifiedResource = ResponseParser.parseToObjectUsingMapper(certifyState.getResponse(), Resource.class);
 
                ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(
-                               "ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(), 
+                               "ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(),
                                ServiceInstantiationType.A_LA_CARTE.getValue());
 
                // 2 create service

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/PlaceHolderValidations.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/PlaceHolderValidations.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/PlaceHolderValidations.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/PlaceHolderValidations.java
index e7d2240..41aaa40 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/PlaceHolderValidations.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/PlaceHolderValidations.java
@@ -18,40 +18,39 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.artifacts;
+package org.onap.sdc.backend.ci.tests.execute.artifacts;
 
 //import static org.junit.Assert.assertTrue;
 
 import fj.data.Either;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.general.FileUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 import static org.testng.AssertJUnit.*;
 
 public class PlaceHolderValidations extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
similarity index 87%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
index 00a304a..442efe0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/artifacts/ValidateHeatArtFieldsTypes.java
@@ -18,28 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.artifacts;
+package org.onap.sdc.backend.ci.tests.execute.artifacts;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.RespJsonKeysEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.RespJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.ArtifactValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.ArtifactValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
similarity index 90%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
index 75e0639..26873b3 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/attribute/ComponentInstanceAttributeTest.java
@@ -18,23 +18,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.attribute;
+package org.onap.sdc.backend.ci.tests.execute.attribute;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
 import org.testng.annotations.Test;
 
 import java.io.File;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CatalogDataApiTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/CatalogDataApiTest.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CatalogDataApiTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/CatalogDataApiTest.java
index 871cf71..8fbeb27 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CatalogDataApiTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/CatalogDataApiTest.java
@@ -18,39 +18,39 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.category;
+package org.onap.sdc.backend.ci.tests.execute.category;
 
 import com.google.gson.Gson;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.CatalogRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.AssertJUnit;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 public class CatalogDataApiTest extends ComponentBaseTest {
 
        protected Config config = Config.instance();

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CategoriesBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/CategoriesBaseTest.java
similarity index 89%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CategoriesBaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/CategoriesBaseTest.java
index 7708894..01de74b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/CategoriesBaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/CategoriesBaseTest.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.category;
+package org.onap.sdc.backend.ci.tests.execute.category;
 
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 
 public abstract class CategoriesBaseTest extends ComponentBaseTest {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/GroupingTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/GroupingTest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/GroupingTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/GroupingTest.java
index ba5c939..f958078 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/GroupingTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/GroupingTest.java
@@ -18,31 +18,31 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.category;
+package org.onap.sdc.backend.ci.tests.execute.category;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedCategoryAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.CategoryValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedCategoryAudit;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.CategoryValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.SkipException;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.*;
+import static org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils.*;
 import static org.testng.AssertJUnit.assertEquals;
 
 public class GroupingTest extends CategoriesBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/SubCategoriesTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/SubCategoriesTest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/SubCategoriesTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/SubCategoriesTest.java
index 0099e98..0d8c7b0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/category/SubCategoriesTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/category/SubCategoriesTest.java
@@ -18,33 +18,33 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.category;
+package org.onap.sdc.backend.ci.tests.execute.category;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedCategoryAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.CategoryValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedCategoryAudit;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.CategoryValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.*;
+import static org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils.*;
 import static org.testng.AssertJUnit.assertEquals;
 
 public class SubCategoriesTest extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ArtifactFromCsar.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ArtifactFromCsar.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ArtifactFromCsar.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ArtifactFromCsar.java
index 7a69d37..4d5847c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ArtifactFromCsar.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ArtifactFromCsar.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.devCI;
+package org.onap.sdc.backend.ci.tests.execute.devCI;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.utils.CsarParserUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.GroupHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.TypeHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.utils.CsarParserUtils;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
similarity index 85%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
index 08c2169..0f40aa5 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ImportCsarValidateArtifacts.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.devCI;
+package org.onap.sdc.backend.ci.tests.execute.devCI;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.validation.CsarValidationUtils;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.CsarValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ToscaGroupInsideVF.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ToscaGroupInsideVF.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ToscaGroupInsideVF.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ToscaGroupInsideVF.java
index 77a222a..56fcda9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/ToscaGroupInsideVF.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/ToscaGroupInsideVF.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.devCI;
+package org.onap.sdc.backend.ci.tests.execute.devCI;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/test1.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/test1.java
similarity index 87%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/test1.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/test1.java
index bc80545..3d8e4b1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/devCI/test1.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/devCI/test1.java
@@ -18,28 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.devCI;
+package org.onap.sdc.backend.ci.tests.execute.devCI;
 
 import fj.data.Either;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.validation.DistributionValidationUtils;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.DistributionValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 public class test1 extends ComponentBaseTest{
 
        @Rule 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/AuthanticationTests.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/distribution/AuthanticationTests.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/AuthanticationTests.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/distribution/AuthanticationTests.java
index 032bbcc..67e4885 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/AuthanticationTests.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/distribution/AuthanticationTests.java
@@ -18,27 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.distribution;
+package org.onap.sdc.backend.ci.tests.execute.distribution;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedAuthenticationAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ConsumerRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedAuthenticationAudit;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ConsumerRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.testng.AssertJUnit;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
index 0164500..2ba64b3 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/distribution/DistributionDownloadArtifactTest.java
@@ -18,33 +18,39 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.distribution;
+package org.onap.sdc.backend.ci.tests.execute.distribution;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipInputStream;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedDistDownloadAudit;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedDistDownloadAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.common.util.ValidationUtils;
@@ -52,13 +58,6 @@ import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipInputStream;
-
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/externalapi/DownloadArtifactsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/externalapi/DownloadArtifactsTest.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/externalapi/DownloadArtifactsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/externalapi/DownloadArtifactsTest.java
index 8ed75c8..474ca59 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/externalapi/DownloadArtifactsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/externalapi/DownloadArtifactsTest.java
@@ -18,36 +18,37 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.externalapi;
+package org.onap.sdc.backend.ci.tests.execute.externalapi;
 
 import com.google.gson.Gson;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import static org.testng.AssertJUnit.*;
 
 public class DownloadArtifactsTest extends ComponentBaseTest {
@@ -245,7 +246,7 @@ public class DownloadArtifactsTest extends ComponentBaseTest {
        }
 
        private Component getComponentAndValidateRIs(ComponentReqDetails componentDetails, int numberOfRIs,
-                       int numberOfRelations) throws IOException, Exception {
+                                                 int numberOfRelations) throws IOException, Exception {
 
                RestResponse getResponse = null;
                Component component = null;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/FeProxyTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/general/FeProxyTest.java
similarity index 78%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/FeProxyTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/general/FeProxyTest.java
index a9426f9..4a252f4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/FeProxyTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/general/FeProxyTest.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.general;
+package org.onap.sdc.backend.ci.tests.execute.general;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/UuidTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/general/UuidTest.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/UuidTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/general/UuidTest.java
index ab42a40..6b8129a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/general/UuidTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/general/UuidTest.java
@@ -18,15 +18,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.general;
+package org.onap.sdc.backend.ci.tests.execute.general;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.rest.CatalogRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
similarity index 79%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
index 4110586..334f2a4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/globaltypes/InterfaceLifecycleTypesTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.execute.globaltypes;
+package org.onap.sdc.backend.ci.tests.execute.globaltypes;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,14 +22,14 @@ import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.junit.Rule;
 import org.junit.rules.TestName;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/groups/GroupsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/groups/GroupsTest.java
similarity index 92%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/groups/GroupsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/groups/GroupsTest.java
index dbafec1..d93f661 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/groups/GroupsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/groups/GroupsTest.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.groups;
+package org.onap.sdc.backend.ci.tests.execute.groups;
 
 import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ComponentInstanceRestUtils;
 import org.testng.annotations.Test;
 import org.testng.collections.Lists;
 
@@ -45,7 +45,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import static org.junit.Assert.*;
-import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.*;
+import static org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils.*;
 import static org.testng.Assert.assertNull;
 
 public class GroupsTest extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/CsarUtilsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/CsarUtilsTest.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/CsarUtilsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/CsarUtilsTest.java
index e16ebf7..8d1dbaf 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/CsarUtilsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/CsarUtilsTest.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.imports;
+package org.onap.sdc.backend.ci.tests.execute.imports;
 
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.openecomp.sdc.common.util.YamlToObjectConverter;
 import org.testng.annotations.Test;
 import org.yaml.snakeyaml.Yaml;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ExportToscaTest.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ExportToscaTest.java
index c455f6f..7950f70 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ExportToscaTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ExportToscaTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.imports;
+package org.onap.sdc.backend.ci.tests.execute.imports;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParser;
@@ -26,20 +26,22 @@ import com.google.gson.reflect.TypeToken;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ImportReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.validation.BaseValidationUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.testng.annotations.Test;
 import org.yaml.snakeyaml.Yaml;
@@ -250,7 +252,7 @@ public class ExportToscaTest extends ComponentBaseTest {
                RestResponse checkinState = LifecycleRestUtils.changeComponentState(createdResource, sdncModifierDetails, LifeCycleStatesEnum.CHECKIN);
                BaseRestUtils.checkSuccess(checkinState);
                ServiceReqDetails serviceDetails = ElementFactory.getDefaultService(
-                               "ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(), 
+                               "ciNewtestservice1", ServiceCategoriesEnum.MOBILITY, sdncModifierDetails.getUserId(),
                                ServiceInstantiationType.A_LA_CARTE.getValue());
                
                //2 create service

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportGenericResourceCITest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ImportGenericResourceCITest.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportGenericResourceCITest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ImportGenericResourceCITest.java
index cc2aa53..76d4841 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportGenericResourceCITest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ImportGenericResourceCITest.java
@@ -18,10 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.imports;
+package org.onap.sdc.backend.ci.tests.execute.imports;
 
 import com.google.gson.Gson;
 import fj.data.Either;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.Map.Entry;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -34,35 +40,28 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.TODO.ImportCapabilityTypeCITest;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ImportRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.execute.TODO.ImportCapabilityTypeCITest;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ImportRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.Map.Entry;
-
 import static org.testng.AssertJUnit.*;
 
 public class ImportGenericResourceCITest extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
index 0e1e59c..67bfe00 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/imports/ImportToscaCapabilitiesWithProperties.java
@@ -18,25 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.imports;
+package org.onap.sdc.backend.ci.tests.execute.imports;
 
 import com.google.gson.Gson;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ImportReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.Test;
 
 import java.io.IOException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/inputs/InputsApiTests.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/inputs/InputsApiTests.java
index 292e478..8915fca 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/inputs/InputsApiTests.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/inputs/InputsApiTests.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.inputs;
+package org.onap.sdc.backend.ci.tests.execute.inputs;
 
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -42,6 +42,10 @@ import fj.data.Either;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.validation.BaseValidationUtils;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
@@ -55,21 +59,17 @@ import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.InputsRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.InputsRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.PropertyRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
index 764a147..ec3bf92 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/interfaceoperation/InterfaceOperationsTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.interfaceoperation;
+package org.onap.sdc.backend.ci.tests.execute.interfaceoperation;
 
 import static org.testng.AssertJUnit.fail;
 
@@ -32,6 +32,8 @@ import fj.data.Either;
 import org.apache.commons.collections4.CollectionUtils;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
 import org.openecomp.sdc.be.datatypes.elements.OperationOutputDefinition;
@@ -44,15 +46,13 @@ import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.InterfaceOperationsRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.InterfaceOperationsRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/lifecycle/LCSbaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/lifecycle/LCSbaseTest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/lifecycle/LCSbaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/lifecycle/LCSbaseTest.java
index 8712795..598ab5f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/lifecycle/LCSbaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/lifecycle/LCSbaseTest.java
@@ -18,25 +18,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.lifecycle;
+package org.onap.sdc.backend.ci.tests.execute.lifecycle;
 
 
-import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.ArtifactUtils;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.testng.annotations.BeforeMethod;
 
 import java.io.IOException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductBaseTest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductBaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductBaseTest.java
index 80ad348..a027ea9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductBaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductBaseTest.java
@@ -18,29 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.BeforeMethod;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.PRODUCT_COMPONENT_TYPE;
+import static org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils.PRODUCT_COMPONENT_TYPE;
 
 public abstract class ProductBaseTest extends ComponentBaseTest {
        User productStrategistUser1;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckinTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCheckinTest.java
similarity index 92%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckinTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCheckinTest.java
index 94027bd..9f354fb 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckinTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCheckinTest.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.AuditJsonKeysEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.enums.AuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ProductValidationUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckoutTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCheckoutTest.java
similarity index 90%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckoutTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCheckoutTest.java
index 36458d0..90c1fa1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCheckoutTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCheckoutTest.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ProductValidationUtils;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCreateWithValidationsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCreateWithValidationsTest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCreateWithValidationsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCreateWithValidationsTest.java
index 705e396..2fdc49d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductCreateWithValidationsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductCreateWithValidationsTest.java
@@ -18,28 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.ProductReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ProductValidationUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductGetFollowedTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductGetFollowedTest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductGetFollowedTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductGetFollowedTest.java
index a63c30e..04d70e8 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductGetFollowedTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductGetFollowedTest.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Product;
-import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.ProductReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.ProductValidationUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductLifecycleTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductLifecycleTest.java
similarity index 81%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductLifecycleTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductLifecycleTest.java
index 61f93c7..be7680c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductLifecycleTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductLifecycleTest.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Product;
-import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.datatypes.ProductReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.BeforeMethod;
 
 import static org.testng.AssertJUnit.assertEquals;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductTestBase.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductTestBase.java
similarity index 90%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductTestBase.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductTestBase.java
index 7584078..51d9cf9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductTestBase.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductTestBase.java
@@ -18,24 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 
 import org.junit.Before;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.ArtifactUtils;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 
 import java.io.IOException;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductToscaYamlGenerationTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
index 0c74f25..0892af7 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductToscaYamlGenerationTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import com.google.gson.Gson;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
-import org.openecomp.sdc.ci.tests.utils.Decoder;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.Decoder;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductUndoCheckoutTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductUndoCheckoutTest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductUndoCheckoutTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductUndoCheckoutTest.java
index 4bd1dff..ab5d7d0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/product/ProductUndoCheckoutTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/product/ProductUndoCheckoutTest.java
@@ -18,23 +18,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.product;
+package org.onap.sdc.backend.ci.tests.execute.product;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ProductValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ProductValidationUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/AdditionalInformationServletTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/AdditionalInformationServletTest.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/AdditionalInformationServletTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/AdditionalInformationServletTest.java
index d745e36..2e1d750 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/AdditionalInformationServletTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/AdditionalInformationServletTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.property;
+package org.onap.sdc.backend.ci.tests.execute.property;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -26,6 +26,13 @@ import com.google.gson.reflect.TypeToken;
 import org.json.simple.parser.JSONParser;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
@@ -33,24 +40,18 @@ import org.openecomp.sdc.be.model.PropertyConstraint;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
-
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/ComponentInstancePropertyTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/ComponentInstancePropertyTest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/ComponentInstancePropertyTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/ComponentInstancePropertyTest.java
index 7c0d0e3..451c977 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/ComponentInstancePropertyTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/ComponentInstancePropertyTest.java
@@ -18,32 +18,32 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.property;
+package org.onap.sdc.backend.ci.tests.execute.property;
 
 import fj.data.Either;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.PropertyRestUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.testng.AssertJUnit.assertTrue;
 
 // open bug for this class: DE199108 - closed, DE199741

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/PropertyApisTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/PropertyApisTest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/PropertyApisTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/PropertyApisTest.java
index a705db7..9364b5b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/property/PropertyApisTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/property/PropertyApisTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.property;
+package org.onap.sdc.backend.ci.tests.execute.property;
 
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -37,25 +37,25 @@ import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.preRequisites.SimpleOneRsrcOneServiceTest;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.UserRestUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.preRequisites.SimpleOneRsrcOneServiceTest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.PropertyRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.UserRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CheckGetResource.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/CheckGetResource.java
similarity index 86%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CheckGetResource.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/CheckGetResource.java
index 6bae08b..71dc9ac 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CheckGetResource.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/CheckGetResource.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import fj.data.Either;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.openecomp.sdc.common.util.SerializationUtils;
 
 public class CheckGetResource {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CreateResourceApiTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/CreateResourceApiTest.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CreateResourceApiTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/CreateResourceApiTest.java
index 2e6c9f9..a3d86ae 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/CreateResourceApiTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/CreateResourceApiTest.java
@@ -18,41 +18,40 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import com.google.gson.Gson;
+import java.util.*;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ResourceValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
-import java.util.*;
-
-import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_SUCCESS;
+import static org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_SUCCESS;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/GetAllResourceVersions.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/GetAllResourceVersions.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/GetAllResourceVersions.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/GetAllResourceVersions.java
index 77c5c3b..6a7a142 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/GetAllResourceVersions.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/GetAllResourceVersions.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.AssertJUnit;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ResourceApiTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/ResourceApiTest.java
similarity index 92%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ResourceApiTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/ResourceApiTest.java
index 2902206..9fec22f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ResourceApiTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/ResourceApiTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import com.google.gson.Gson;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -31,24 +31,24 @@ import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.CatalogRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.ResourceValidationUtils;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SampleDataProvider.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/SampleDataProvider.java
similarity index 89%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SampleDataProvider.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/SampleDataProvider.java
index 8b8c653..49db798 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SampleDataProvider.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/SampleDataProvider.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
 import org.testng.ITestContext;
 import org.testng.annotations.DataProvider;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SimultaneousApiTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/SimultaneousApiTest.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SimultaneousApiTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/SimultaneousApiTest.java
index e9a996c..4332432 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/SimultaneousApiTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/SimultaneousApiTest.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.Test;
 
 import java.util.concurrent.CountDownLatch;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/UpdateResourceMetadataTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/UpdateResourceMetadataTest.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/UpdateResourceMetadataTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/UpdateResourceMetadataTest.java
index a204954..0bb2a26 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/UpdateResourceMetadataTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/UpdateResourceMetadataTest.java
@@ -18,35 +18,38 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import com.google.gson.Gson;
+import java.io.FileNotFoundException;
+import java.util.*;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ResourceValidationUtils;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,9 +57,6 @@ import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.FileNotFoundException;
-import java.util.*;
-
 import static org.testng.AssertJUnit.*;
 
 public class UpdateResourceMetadataTest extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
index 0ac667a..538630e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/VFResourceInstanceNameCRUD.java
@@ -18,33 +18,34 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import com.google.gson.Gson;
 import fj.data.Either;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ValidateExtendedVfData.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/ValidateExtendedVfData.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ValidateExtendedVfData.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/ValidateExtendedVfData.java
index 13b3413..d9d1004 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/resource/ValidateExtendedVfData.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/resource/ValidateExtendedVfData.java
@@ -18,32 +18,31 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.resource;
+package org.onap.sdc.backend.ci.tests.execute.resource;
 
 import fj.data.Either;
+import java.util.List;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.List;
-
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetAllServiceVersions.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/service/GetAllServiceVersions.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetAllServiceVersions.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/service/GetAllServiceVersions.java
index aa20d7f..222ec09 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetAllServiceVersions.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/service/GetAllServiceVersions.java
@@ -18,31 +18,31 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.service;
+package org.onap.sdc.backend.ci.tests.execute.service;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetComponentAuditApiTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/service/GetComponentAuditApiTest.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetComponentAuditApiTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/service/GetComponentAuditApiTest.java
index 42045f0..ca255b3 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/service/GetComponentAuditApiTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/service/GetComponentAuditApiTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.service;
+package org.onap.sdc.backend.ci.tests.execute.service;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -26,26 +26,26 @@ import fj.data.Either;
 import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.general.FileUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 import org.openecomp.sdc.common.datastructure.Wrapper;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/user/ActivateDeActivateDeleteUser.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
index 4196fa7..b80285b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/execute/user/ActivateDeActivateDeleteUser.java
@@ -18,37 +18,38 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.execute.user;
+package org.onap.sdc.backend.ci.tests.execute.user;
 
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ResourceValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedUserCRUDAudit;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.users.UserResponseMessageEnum;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.Convertor;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ResourceValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.UserValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceRespJavaObject;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedUserCRUDAudit;
+import org.onap.sdc.backend.ci.tests.users.UserResponseMessageEnum;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.Convertor;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.UserValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.AssertJUnit;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/ComplexResourceBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/ComplexResourceBaseTest.java
similarity index 90%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/ComplexResourceBaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/ComplexResourceBaseTest.java
index 7ad9024..1940b2f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/ComplexResourceBaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/ComplexResourceBaseTest.java
@@ -18,27 +18,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.preRequisites;
+package org.onap.sdc.backend.ci.tests.preRequisites;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
 import org.testng.annotations.BeforeMethod;
-
 import java.io.IOException;
 
 import static org.testng.AssertJUnit.*;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/DownloadArtifactBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/DownloadArtifactBaseTest.java
similarity index 83%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/DownloadArtifactBaseTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/DownloadArtifactBaseTest.java
index 13b0dff..76a9d2f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/DownloadArtifactBaseTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/DownloadArtifactBaseTest.java
@@ -18,31 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.preRequisites;
+package org.onap.sdc.backend.ci.tests.preRequisites;
 
-
-import org.junit.rules.TestName;
+import java.io.IOException;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
-import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.ArtifactUtils;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeMethod;
 
-import java.io.IOException;
-
 public class DownloadArtifactBaseTest extends ComponentBaseTest {
 
        protected ResourceReqDetails downloadResourceDetails;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
similarity index 76%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
index 9363b8c..44f6fc1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/preRequisites/SimpleOneRsrcOneServiceTest.java
@@ -18,24 +18,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.preRequisites;
+package org.onap.sdc.backend.ci.tests.preRequisites;
 
 
-import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.ArtifactUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.ArtifactUtils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.testng.annotations.BeforeMethod;
 
 import java.io.IOException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/requirements/RequirementsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/requirements/RequirementsTest.java
similarity index 81%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/requirements/RequirementsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/requirements/RequirementsTest.java
index e96a41a..9aec572 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/requirements/RequirementsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/requirements/RequirementsTest.java
@@ -14,23 +14,24 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.requirements;
+package org.onap.sdc.backend.ci.tests.requirements;
 
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.RequirementsUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.openecomp.sdc.be.model.RequirementDefinition;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.RequirementDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.RequirementsUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.RequirementDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -39,7 +40,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.getServiceObject;
+import static org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils.getServiceObject;
 
 public class RequirementsTest extends ComponentBaseTest {
     @Rule
@@ -80,7 +81,7 @@ public class RequirementsTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "updateRequirementTest")
     public void getRequirementTest() throws Exception {
-        Service service = getServiceObject(component.getUniqueId());
+        Service service = AtomicOperationUtils.getServiceObject(component.getUniqueId());
 
         List<RequirementDefinition> requirementDefinitionList = service.getRequirements().values()
                 .stream().flatMap(Collection::stream).collect(Collectors.toList());
@@ -93,7 +94,7 @@ public class RequirementsTest extends ComponentBaseTest {
 
     @Test(dependsOnMethods = "getRequirementTest")
     public void deleteRequirementTest() throws Exception {
-        Service service = getServiceObject(component.getUniqueId());
+        Service service = AtomicOperationUtils.getServiceObject(component.getUniqueId());
 
         List<RequirementDefinition> requirementDefinitionList = service.getRequirements().values()
                 .stream().flatMap(Collection::stream).collect(Collectors.toList());

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/rules/MyTestWatcher.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/rules/MyTestWatcher.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/rules/MyTestWatcher.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/rules/MyTestWatcher.java
index bb2d2d5..f743d81 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/rules/MyTestWatcher.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/rules/MyTestWatcher.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.rules;
+package org.onap.sdc.backend.ci.tests.rules;
 
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
-import org.openecomp.sdc.ci.tests.api.AttSdcTest;
+import org.onap.sdc.backend.ci.tests.api.AttSdcTest;
 
 public class MyTestWatcher extends TestWatcher {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/CrudE2E.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/CrudE2E.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/CrudE2E.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/CrudE2E.java
index 0690bde..bedce3e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/CrudE2E.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/CrudE2E.java
@@ -18,29 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.sanity;
+package org.onap.sdc.backend.ci.tests.sanity;
 
 import fj.data.Either;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class CrudE2E extends ComponentBaseTest {
        private static Logger log = LoggerFactory.getLogger(CrudE2E.class.getName());
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/MultipleResourceUpdate.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/MultipleResourceUpdate.java
similarity index 89%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/MultipleResourceUpdate.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/MultipleResourceUpdate.java
index 2a72494..829d7d1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/MultipleResourceUpdate.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/MultipleResourceUpdate.java
@@ -18,26 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.sanity;
+package org.onap.sdc.backend.ci.tests.sanity;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.testng.AssertJUnit.assertTrue;
 
 public class MultipleResourceUpdate extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/Onboard.java
similarity index 86%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/Onboard.java
index 5dc07fa..da2d9f7 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/sanity/Onboard.java
@@ -18,30 +18,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.sanity;
+package org.onap.sdc.backend.ci.tests.sanity;
 
 
 import com.aventstack.extentreports.Status;
 import fj.data.Either;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.data.providers.OnboardingDataProviders;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.VendorSoftwareProductObject;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.general.OnboardingUtillViaApis;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.ExtentTestActions;
-import org.openecomp.sdc.ci.tests.data.providers.OnboardingDataProviders;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.VendorSoftwareProductObject;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtillViaApis;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.ExtentTestActions;
 import org.testng.annotations.*;
 
 public class Onboard extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/servicefilter/ServiceFilterTests.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/servicefilter/ServiceFilterTests.java
similarity index 84%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/servicefilter/ServiceFilterTests.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/servicefilter/ServiceFilterTests.java
index 6c42449..c6b2b98 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/servicefilter/ServiceFilterTests.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/servicefilter/ServiceFilterTests.java
@@ -18,30 +18,30 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.servicefilter;
+package org.onap.sdc.backend.ci.tests.servicefilter;
 
 import java.util.Collections;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceFilterDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceFilterDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ComponentInstanceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.LifecycleRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceFilterUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ComponentInstanceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.LifecycleRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.PropertyRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceFilterUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ParametersDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ParametersDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ParametersDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ParametersDefinition.java
index dbdaff3..b8aa764 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ParametersDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ParametersDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 public class ParametersDefinition {
        

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
index 968e8dc..33c32ee 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaAnnotationsTypesDefinition.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
-import org.openecomp.sdc.ci.tests.datatypes.enums.ToscaKeysEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ToscaKeysEnum;
 import org.yaml.snakeyaml.TypeDescription;
 
 import java.util.HashMap;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
index 76c0c86..ce9cc23 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaCapabilitiesNodeTemplatesDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 public class ToscaCapabilitiesNodeTemplatesDefinition {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaDefinition.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaDefinition.java
index 5bbb71b..764d6fb 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
index adab3fa..dfac759 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaGroupPropertyDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
index a536578..89f9c96 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaGroupsTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaImportsDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
index c4324bd..1c8d0aa 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaImportsDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
index 4242e48..6154058 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaInputsAnnotation.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
index 3f0bac0..ac6d6f5 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaInputsTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import com.google.gson.annotations.SerializedName;
 import org.yaml.snakeyaml.TypeDescription;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
index ceba7ad..1f0d7ab 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
index 442656e..aaa5747 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaNodeTemplatesTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
index b9d200a..19d88ac 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaNodeTypesDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
index b370dd3..bac23a4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaOutputsTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.Map;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaParameterConstants.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaParameterConstants.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaParameterConstants.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaParameterConstants.java
index 32ccbe3..d724c0f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaParameterConstants.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaParameterConstants.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 public interface ToscaParameterConstants {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
index 7ac3e87..a3a12a4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaPoliciesTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.Map;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
index 881f7f5..34bf414 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaRelationshipTemplatesTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.Map;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
index bd9f0f0..76bbaf4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaRequirementsNodeTemplatesDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 public class ToscaRequirementsNodeTemplatesDefinition {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
index 5b50b0e..78201b9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaServiceGroupsMetadataDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.io.Serializable;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
index d3bb2a0..16637b0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaSubstitutionMappingsDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
index 9b29960..04abae1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import org.yaml.snakeyaml.TypeDescription;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
index 5c750c9..96b74fc 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTopologyTemplateDefinition2.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.Map;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypeDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
index 66d8350..cba839a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTypeDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypesDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
index 16292a8..f6ce990 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaTypesDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/VfModuleDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/VfModuleDefinition.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/VfModuleDefinition.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/VfModuleDefinition.java
index 1d32fc1..e2c8e27 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/datatypes/VfModuleDefinition.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/VfModuleDefinition.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.datatypes;
+package org.onap.sdc.backend.ci.tests.tosca.datatypes;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
index 8716533..f39165a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/model/ToscaMetadataFieldsPresentationEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.tosca.model;
+package org.onap.sdc.backend.ci.tests.tosca.model;
 
 public class ToscaMetadataFieldsPresentationEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/AddUserAuditMessageInfo.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/AddUserAuditMessageInfo.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/AddUserAuditMessageInfo.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/AddUserAuditMessageInfo.java
index 9ca8ade..b9d909b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/AddUserAuditMessageInfo.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/AddUserAuditMessageInfo.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.users;
+package org.onap.sdc.backend.ci.tests.users;
 
 public class AddUserAuditMessageInfo {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserAuditJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserAuditJavaObject.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserAuditJavaObject.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserAuditJavaObject.java
index b34d474..0bff609 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserAuditJavaObject.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserAuditJavaObject.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.users;
+package org.onap.sdc.backend.ci.tests.users;
 
 public class UserAuditJavaObject {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserHeaderData.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserHeaderData.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserHeaderData.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserHeaderData.java
index 06320bc..ab48387 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserHeaderData.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserHeaderData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.users;
+package org.onap.sdc.backend.ci.tests.users;
 
 public class UserHeaderData {
        String contentType;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserResponseMessageEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserResponseMessageEnum.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserResponseMessageEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserResponseMessageEnum.java
index 97a0847..fddde8d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/UserResponseMessageEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/UserResponseMessageEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.users;
+package org.onap.sdc.backend.ci.tests.users;
 
 public enum UserResponseMessageEnum {
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/WebSealUserDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/WebSealUserDetails.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/WebSealUserDetails.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/WebSealUserDetails.java
index 609ebf2..c428bf2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/users/WebSealUserDetails.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/users/WebSealUserDetails.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.users;
+package org.onap.sdc.backend.ci.tests.users;
 
 public class WebSealUserDetails {
        String firstName;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ArtifactUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ArtifactUtils.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ArtifactUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ArtifactUtils.java
index 12f8ffe..707c816 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ArtifactUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ArtifactUtils.java
@@ -18,10 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 
 public class ArtifactUtils {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarParserUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/CsarParserUtils.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarParserUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/CsarParserUtils.java
index fc717ca..96a46c0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarParserUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/CsarParserUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.json.simple.JSONArray;
@@ -26,20 +26,20 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.junit.Assert;
+import org.onap.sdc.backend.ci.tests.datatypes.GroupHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.TypeHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaParameterConstants;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.CsarValidationUtils;
 import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaParameterConstants;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.CsarValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/CsarToscaTester.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/CsarToscaTester.java
index be337ba..ac20da2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/CsarToscaTester.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.tosca.parser.enums.SdcTypes;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DbUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/DbUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DbUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/DbUtils.java
index 5ba7062..b8080fd 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DbUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/DbUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import com.google.gson.*;
 import org.janusgraph.core.JanusGraphEdge;
@@ -30,12 +30,12 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.users.UserAuditJavaObject;
-import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.cassandra.CassandraUtils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.users.UserAuditJavaObject;
 
 import java.io.IOException;
 import java.util.*;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Decoder.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/Decoder.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Decoder.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/Decoder.java
index 3b11388..a394a32 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Decoder.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/Decoder.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import org.apache.commons.codec.binary.Base64;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DistributionUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/DistributionUtils.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DistributionUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/DistributionUtils.java
index 479fdcb..accd8b1 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/DistributionUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/DistributionUtils.java
@@ -18,27 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import com.clearspring.analytics.util.Pair;
 import com.google.gson.Gson;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.onap.sdc.backend.ci.tests.datatypes.DistributionMonitorObject;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceDistributionStatus;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ServiceRestUtils;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.DistributionMonitorObject;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceDistributionStatus;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -47,7 +47,7 @@ import java.util.Map.Entry;
 
 //import org.openecomp.sdc.be.components.distribution.engine.DistributionStatusNotificationEnum;
 
- public class DistributionUtils extends BaseRestUtils{
+ public class DistributionUtils extends BaseRestUtils {
         
         final static String serviceDistributionSuffix = "/sdc/v1/catalog/services/";
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ReqCap.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ReqCap.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ReqCap.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ReqCap.java
index 55cc748..ce09c06 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ReqCap.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ReqCap.java
@@ -18,25 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.testng.Assert;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.testng.Assert;
 
 import static org.testng.AssertJUnit.*;
 
@@ -548,7 +548,7 @@ public class ReqCap {
        }
 
        public static RestResponse associateComponentInstancesForService(RequirementCapabilityRelDef requirementDef,
-                       ComponentReqDetails containerDetails, User user) throws IOException {
+                                                                     ComponentReqDetails containerDetails, User user) throws IOException {
 
                RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(requirementDef, user,
                                containerDetails.getUniqueId(), ComponentTypeEnum.SERVICE);

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ToscaParserUtils.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ToscaParserUtils.java
index b7eaf99..dfc902e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaParserUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ToscaParserUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
@@ -32,19 +32,19 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 import org.apache.commons.collections4.MapUtils;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaGroupsTopologyTemplateDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaImportsDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaInputsTopologyTemplateDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaMetadataDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaNodeTemplatesTopologyTemplateDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaParameterConstants;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaSubstitutionMappingsDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaTopologyTemplateDefinition;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ImportRestUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ImportRestUtils;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaGroupsTopologyTemplateDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaImportsDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaInputsTopologyTemplateDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaMetadataDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaNodeTemplatesTopologyTemplateDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaParameterConstants;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaSubstitutionMappingsDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaTopologyTemplateDefinition;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
 import org.openecomp.sdc.common.zip.ZipUtils;
 import org.openecomp.sdc.common.zip.exception.ZipException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaTypesDefinitionUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ToscaTypesDefinitionUtils.java
similarity index 86%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaTypesDefinitionUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ToscaTypesDefinitionUtils.java
index eab84ae..9e5c696 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/ToscaTypesDefinitionUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/ToscaTypesDefinitionUtils.java
@@ -18,20 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaParameterConstants;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaParameterConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
 import static org.junit.Assert.assertNotNull;
-import static org.openecomp.sdc.ci.tests.utils.CsarParserUtils.downloadComponentCsar;
-import static org.openecomp.sdc.ci.tests.utils.ToscaParserUtils.getDataFromZipFileByBytes;
+import static org.onap.sdc.backend.ci.tests.utils.ToscaParserUtils.getDataFromZipFileByBytes;
 import static org.testng.AssertJUnit.fail;
 
 public class ToscaTypesDefinitionUtils {
@@ -43,7 +42,7 @@ public class ToscaTypesDefinitionUtils {
     private static Logger log = LoggerFactory.getLogger(ToscaTypesDefinitionUtils.class);
 
     public static ToscaAnnotationsTypesDefinition getToscaAnnotationsFromCsar(Component csarOwner, User user) throws Exception {
-        byte[] decodeBase64 = downloadComponentCsar(csarOwner, user);
+        byte[] decodeBase64 = CsarParserUtils.downloadComponentCsar(csarOwner, user);
         String dataFromZipFileByBytes = getDataFromZipFileByBytes(ANNOTATIONS_TYPE_PATH, decodeBase64);
         assertNotNull(dataFromZipFileByBytes);
         return parseToscaAnnotationsYml(dataFromZipFileByBytes);

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Utils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/Utils.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Utils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/Utils.java
index 73e9901..86d1ddb 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/Utils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/Utils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils;
+package org.onap.sdc.backend.ci.tests.utils;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -27,11 +27,11 @@ import com.google.gson.JsonParser;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.tosca.model.ToscaMetadataFieldsPresentationEnum;
 import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.tosca.model.ToscaMetadataFieldsPresentationEnum;
+import org.onap.sdc.backend.ci.tests.config.Config;
 import org.openecomp.sdc.common.api.ToscaNodeTypeInfo;
 import org.openecomp.sdc.common.api.YamlConstants;
 import org.yaml.snakeyaml.Yaml;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/cassandra/CassandraUtils.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/cassandra/CassandraUtils.java
index 20a137d..0e4ec92 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/cassandra/CassandraUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.cassandra;
+package org.onap.sdc.backend.ci.tests.utils.cassandra;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.policies.*;
@@ -27,7 +27,7 @@ import com.datastax.driver.core.querybuilder.Select;
 import com.datastax.driver.core.querybuilder.Select.Where;
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils2.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/cassandra/CassandraUtils2.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils2.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/cassandra/CassandraUtils2.java
index ebb3b33..c676cc7 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/cassandra/CassandraUtils2.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/cassandra/CassandraUtils2.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.cassandra;
+package org.onap.sdc.backend.ci.tests.utils.cassandra;
 
 import com.datastax.driver.core.*;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
@@ -26,7 +26,7 @@ import com.datastax.driver.core.querybuilder.Select;
 import com.datastax.driver.core.querybuilder.Select.Where;
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/AtomicOperationUtils.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/AtomicOperationUtils.java
index f0efd96..c69d70a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/AtomicOperationUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 import com.aventstack.extentreports.Status;
 import com.google.gson.Gson;
@@ -26,6 +26,15 @@ import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.tuple.Pair;
 import org.json.JSONException;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
@@ -33,22 +42,15 @@ import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.ExtentTestActions;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaDefinition;
-import org.openecomp.sdc.ci.tests.utils.CsarToscaTester;
-import org.openecomp.sdc.ci.tests.utils.DistributionUtils;
-import org.openecomp.sdc.ci.tests.utils.ToscaParserUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.ExtentTestActions;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaDefinition;
+import org.onap.sdc.backend.ci.tests.utils.CsarToscaTester;
+import org.onap.sdc.backend.ci.tests.utils.DistributionUtils;
+import org.onap.sdc.backend.ci.tests.utils.ToscaParserUtils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.testng.SkipException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/Convertor.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/Convertor.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/Convertor.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/Convertor.java
index 031d2d8..d6b3a5a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/Convertor.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/Convertor.java
@@ -18,34 +18,34 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.lang3.StringUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedProductAudit;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedUserCRUDAudit;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedProductAudit;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedUserCRUDAudit;
 import org.openecomp.sdc.common.api.Constants;
 
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_CREATED;
-import static org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_SUCCESS;
+import static org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_CREATED;
+import static org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils.STATUS_CODE_SUCCESS;
 
 public class Convertor {
        // ***** resource *****
        public static ResourceRespJavaObject constructFieldsForRespValidation(ResourceReqDetails resourceDetails,
-                       String resourceVersion) {
+                                                                          String resourceVersion) {
                return convertToRespObject(resourceDetails, resourceVersion, UserRoleEnum.ADMIN.getUserId(),
                                UserRoleEnum.ADMIN.getUserName());
 
@@ -131,7 +131,7 @@ public class Convertor {
        // ********** product **************
 
        public static Product constructFieldsForRespValidation(ProductReqDetails productDetails, String productVersion,
-                       User user) {
+                                                           User user) {
                return convertToRespObject(productDetails, productVersion, user.getUserId(), user.getFullName());
        }
 
@@ -270,9 +270,9 @@ public class Convertor {
 
        // For RESOURCE and SERVICE same Audit
        public static ExpectedResourceAuditJavaObject constructFieldsForAuditValidation(
-                       ComponentReqDetails componentDetails, String action, User userModifier, ActionStatus actionStatus,
-                       String currVersion, String prevVersion, String curState, String prevState, String uuid, String comment,
-                       Object... variables) throws Exception {
+            ComponentReqDetails componentDetails, String action, User userModifier, ActionStatus actionStatus,
+            String currVersion, String prevVersion, String curState, String prevState, String uuid, String comment,
+            Object... variables) throws Exception {
                ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(actionStatus.name());
                ExpectedResourceAuditJavaObject expectedResourceAuditJavaObject = new ExpectedResourceAuditJavaObject();
                expectedResourceAuditJavaObject.setAction(action);

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/ElementFactory.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/ElementFactory.java
index 31b8c5b..548b452 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ElementFactory.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/ElementFactory.java
@@ -18,9 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 import org.apache.commons.lang.StringUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedExternalAudit;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
@@ -32,23 +41,13 @@ import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedExternalAudit;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.AuditValidationUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.AuditValidationUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.util.ValidationUtils;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 public final class ElementFactory {
 
        private static final String CI_SERVICE = "ciService";

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java
index ec38312..f26ff94 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -41,9 +41,9 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import org.apache.commons.io.FileUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.XnfTypeEnum;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.yaml.snakeyaml.Yaml;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileUtils.java
index 226c734..6649097 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/FileUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileUtils.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 import fj.data.Either;
-import org.openecomp.sdc.ci.tests.utils.Decoder;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.Decoder;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ImportUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/ImportUtils.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ImportUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/ImportUtils.java
index 3b1dcda..15c9446 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/ImportUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/ImportUtils.java
@@ -18,9 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
-import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ImportReqDetails;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtillViaApis.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtillViaApis.java
index 64a62c5..6c6ba0d 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtillViaApis.java
@@ -18,27 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 import com.google.gson.Gson;
 import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ServiceCategoriesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.VendorLicenseModel;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.VendorSoftwareProductObject;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ServiceCategoriesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.VendorLicenseModel;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.VendorSoftwareProductObject;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java
index 1a15f46..1357dc4 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
+import org.onap.sdc.backend.ci.tests.datatypes.enums.XnfTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 
 import java.util.*;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/SnmpTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/SnmpTypeEnum.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/SnmpTypeEnum.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/SnmpTypeEnum.java
index 366962e..924121b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/SnmpTypeEnum.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/SnmpTypeEnum.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 enum SnmpTypeEnum{
     SNMP_POLL ("snmp"),

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java
index 72f8fc1..072f2a9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 import com.aventstack.extentreports.Status;
 import org.json.JSONObject;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.VendorLicenseModel;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.VendorLicenseModel;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
index 864dd89..96d6416 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.general;
+package org.onap.sdc.backend.ci.tests.utils.general;
 
 import com.aventstack.extentreports.Status;
 import com.clearspring.analytics.util.Pair;
@@ -33,19 +33,19 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONValue;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.CvfcTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.CvfcTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ArtifactRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ArtifactRestUtils.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ArtifactRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ArtifactRestUtils.java
index 7daf1bd..c9bbb6a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ArtifactRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ArtifactRestUtils.java
@@ -18,26 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import org.apache.commons.codec.binary.Base64;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.Decoder;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.slf4j.Logger;
@@ -910,7 +911,7 @@ public class ArtifactRestUtils extends BaseRestUtils {
                Gson gson = new Gson();
                Map<String, String> fromJson = gson.fromJson(restResponse.getResponse(), Map.class);
                String payloadData = fromJson.get("base64Contents").toString();
-               String decodedPaypload = org.openecomp.sdc.ci.tests.utils.Decoder.decode(payloadData);
+               String decodedPaypload = Decoder.decode(payloadData);
                return decodedPaypload;
        }
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java
index ad70c34..3e2eb09 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.*;
@@ -28,20 +28,20 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,7 +75,7 @@ public class AssetRestUtils extends BaseRestUtils {
                                assetType.getValue(), uuid);
                HttpGet httpGet = new HttpGet(url);
 
-               httpGet.addHeader(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               httpGet.addHeader(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
                httpGet.addHeader(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
 
                logger.debug("Send GET request to get Tosca model: {}", url);
@@ -103,7 +103,7 @@ public class AssetRestUtils extends BaseRestUtils {
                }
 
                
-               httpGet.addHeader(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               httpGet.addHeader(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
                httpGet.addHeader(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
 
                logger.debug("Send GET request to get Tosca model: {}", url);
@@ -128,7 +128,7 @@ public class AssetRestUtils extends BaseRestUtils {
                Map<String, String> headersMap = new HashMap<>();
                headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
                headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
-               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
                
                HttpRequest http = new HttpRequest();
 
@@ -148,12 +148,12 @@ public class AssetRestUtils extends BaseRestUtils {
                        String... filterArrayString) throws IOException {
                Config config = Utils.getConfig();
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                if (isBasicAuthentication) {
                        headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
                }
-               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
 
                HttpRequest http = new HttpRequest();
                        String url = String.format(Urls.GET_ASSET_LIST, config.getCatalogBeHost(), config.getCatalogBePort(),
@@ -170,10 +170,10 @@ public class AssetRestUtils extends BaseRestUtils {
        public static RestResponse getFilteredComponentList(AssetTypeEnum assetType, String query) throws IOException {
                Config config = Utils.getConfig();
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
-               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
 
                HttpRequest http = new HttpRequest();
 
@@ -207,12 +207,12 @@ public class AssetRestUtils extends BaseRestUtils {
 
                Config config = Utils.getConfig();
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                if (isBasicAuthentication) {
                        headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), basicAuthentication);
                }
-               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
 
                HttpRequest http = new HttpRequest();
                String url = String.format(Urls.GET_ASSET_METADATA, config.getCatalogBeHost(), config.getCatalogBePort(),
@@ -314,7 +314,7 @@ public class AssetRestUtils extends BaseRestUtils {
        }
 
        public static void serviceMetadataValidatior(ServiceDetailedAssetStructure serviceAssetMetadata, Service service,
-                       AssetTypeEnum assetType) throws Exception {
+                                                 AssetTypeEnum assetType) throws Exception {
 
                generalMetadataFieldsValidatior(serviceAssetMetadata, service);
                assertTrue(

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AutomationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AutomationUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AutomationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AutomationUtils.java
index 8d39bd1..69e9377 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/AutomationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AutomationUtils.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/BaseRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/BaseRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/BaseRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/BaseRestUtils.java
index b8ec35f..607265c 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/BaseRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/BaseRestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpEntity;
@@ -26,10 +26,10 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.validation.BaseValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CapabilityRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CapabilityRestUtils.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CapabilityRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CapabilityRestUtils.java
index 488ed24..e67d7da 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CapabilityRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CapabilityRestUtils.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.CapabilityDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.CapabilityDetails;
 
 import java.util.List;
 
@@ -31,8 +31,8 @@ public class CapabilityRestUtils extends BaseRestUtils {
     private static Gson gson = new Gson();
 
     public static RestResponse createCapability(Component component,
-                                                 List<CapabilityDetails> capabilityDetailsList,
-                                                 User user) throws Exception{
+                                                List<CapabilityDetails> capabilityDetailsList,
+                                                User user) throws Exception{
         Config config = Config.instance();
         String url = String.format(Urls.CREATE_CAPABILITY, config.getCatalogBeHost(), config.getCatalogBePort(),
                 ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CatalogRestUtils.java
similarity index 88%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CatalogRestUtils.java
index 4c8f178..6341586 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CatalogRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CatalogRestUtils.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
-
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+package org.onap.sdc.backend.ci.tests.utils.rest;
+
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.io.IOException;
 import java.util.HashMap;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CategoryRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CategoryRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CategoryRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CategoryRestUtils.java
index 3e1413a..1c75ca6 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/CategoryRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/CategoryRestUtils.java
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.io.IOException;
 import java.util.List;
@@ -44,7 +44,7 @@ public class CategoryRestUtils extends BaseRestUtils {
        private static Gson gson = new Gson();
 
        public static RestResponse createCategory(CategoryDefinition categoryDefinition, User sdncModifierDetails,
-                       String categoryType) throws Exception {
+                                              String categoryType) throws Exception {
                Config config = Utils.getConfig();
                String url = String.format(Urls.CREATE_CATEGORY, config.getCatalogBeHost(), config.getCatalogBePort(),
                                categoryType);

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentInstanceRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ComponentInstanceRestUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentInstanceRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ComponentInstanceRestUtils.java
index 7cc06de..dd88490 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentInstanceRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ComponentInstanceRestUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -45,7 +45,7 @@ public class ComponentInstanceRestUtils extends BaseRestUtils {
        // 'componentType' can be 'services' or 'resources'
 
        public static RestResponse createComponentInstance(ComponentInstanceReqDetails componentInstanceReqDetails,
-                       User sdncModifierDetails, Component component) throws Exception {
+                                                       User sdncModifierDetails, Component component) throws Exception {
                return createComponentInstance(componentInstanceReqDetails, sdncModifierDetails, component.getUniqueId(),
                                component.getComponentType());
        }

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ComponentRestUtils.java
similarity index 78%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ComponentRestUtils.java
index 8fcc679..2639f3b 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ComponentRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ComponentRestUtils.java
@@ -18,25 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.CapReqDef;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ProductReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.io.IOException;
 
 public class ComponentRestUtils extends BaseRestUtils {
        public static RestResponse getComponentRequirmentsCapabilities(User sdncModifierDetails,
-                       ComponentReqDetails componentReqDetails) throws IOException {
+                                                                   ComponentReqDetails componentReqDetails) throws IOException {
                Config config = Utils.getConfig();
                ComponentTypeEnum componentType = null;
                if (componentReqDetails instanceof ResourceReqDetails) {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ConsumerRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ConsumerRestUtils.java
index 5e35327..b3393e0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ConsumerRestUtils.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.util.Map;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/EcompUserRestUtils.java
similarity index 83%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/EcompUserRestUtils.java
index 1cd8632..52f6e12 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/EcompUserRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/EcompUserRestUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import org.onap.portalsdk.core.restful.domain.EcompRole;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,8 +53,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -79,8 +79,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -105,8 +105,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -125,8 +125,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -145,8 +145,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -169,8 +169,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 
@@ -199,8 +199,8 @@ public class EcompUserRestUtils extends BaseRestUtils {
                Config config = Utils.getConfig();
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.ECOMP_USERNAME.getValue(), ecompUsername);
                headersMap.put(HttpHeaderEnum.ECOMP_PASSWORD.getValue(), ecompPassword);
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/GroupRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/GroupRestUtils.java
similarity index 86%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/GroupRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/GroupRestUtils.java
index e491b3b..3afc085 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/GroupRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/GroupRestUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.io.IOException;
 import java.util.HashMap;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ImportRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ImportRestUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ImportRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ImportRestUtils.java
index 0edc294..aa5d30e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ImportRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ImportRestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
@@ -32,18 +32,18 @@ import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.codehaus.jettison.json.JSONException;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ImportTestTypesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ImportTestTypesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InputsRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/InputsRestUtils.java
similarity index 85%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InputsRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/InputsRestUtils.java
index 36fe6e3..bc762f9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InputsRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/InputsRestUtils.java
@@ -18,20 +18,20 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstInputsMap;
 import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +51,7 @@ public class InputsRestUtils extends BaseRestUtils {
         * @param component
         * @param inputs
         * @param userRole
-        * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+        * @return {@link RestResponse}
         * @throws Exception
         */
        public static RestResponse addInput(Component component, ComponentInstInputsMap inputs, UserRoleEnum userRole)
@@ -69,7 +69,7 @@ public class InputsRestUtils extends BaseRestUtils {
         * @param component
         * @param data
         * @param userRole
-        * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+        * @return {@link RestResponse}
         * @throws Exception
         */
        public static RestResponse updateInput(Component component, String data, UserRoleEnum userRole) throws Exception {
@@ -83,7 +83,7 @@ public class InputsRestUtils extends BaseRestUtils {
         * Get all Component inputs
         *
         * @param component
-        * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+        * @return {@link RestResponse}
         * @throws Exception
         */
        public static RestResponse getComponentInputs(Component component) throws Exception {
@@ -99,7 +99,7 @@ public class InputsRestUtils extends BaseRestUtils {
         *
         * @param parentComponent
         * @param componentInstance
-        * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+        * @return {@link RestResponse}
         * @throws Exception
         */
        public static RestResponse getComponentInstanceInputs(Component parentComponent,
@@ -119,7 +119,7 @@ public class InputsRestUtils extends BaseRestUtils {
         *
         * @param parentComponent
         * @param inputId
-        * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+        * @return {@link RestResponse}
         * @throws Exception
         */
        public static RestResponse deleteInputFromComponent(Component parentComponent, String inputId) throws Exception {
@@ -133,7 +133,7 @@ public class InputsRestUtils extends BaseRestUtils {
         * @param componentType
         * @param componentId
         * @param inputUniqueId
-        * @return {@link org.openecomp.sdc.ci.tests.datatypes.http.RestResponse}
+        * @return {@link RestResponse}
         * @throws Exception
         */
        public static RestResponse deleteInputFromComponent(String componentType, String componentId, String inputUniqueId)

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InterfaceOperationsRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
index 32e731b..47b4b09 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/InterfaceOperationsRestUtils.java
@@ -18,18 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import java.io.IOException;
 import java.util.Map;
+
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +40,7 @@ public class InterfaceOperationsRestUtils extends BaseRestUtils {
     private static Logger logger = LoggerFactory.getLogger(InterfaceOperationsRestUtils.class.getName());
 
     public static RestResponse addInterfaceOperations(Component component, Map<String, Object> interfaceDefinitionMap,
-            User user) throws IOException {
+                                                      User user) throws IOException {
         Config config = Utils.getConfig();
         String url = String.format(Urls.ADD_INTERFACE_OPERATIONS, config.getCatalogBeHost(), config.getCatalogBePort(),
                 ComponentTypeEnum.findParamByType(component.getComponentType()), component.getUniqueId());

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/LifecycleRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/LifecycleRestUtils.java
index 72cad8c..395fefc 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/LifecycleRestUtils.java
@@ -18,24 +18,24 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import org.json.simple.JSONObject;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ProductReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -110,7 +110,7 @@ public class LifecycleRestUtils extends BaseRestUtils {
                Map<String, String> additionalHeaders = new HashMap<>();
                
                additionalHeaders.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
-               additionalHeaders.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               additionalHeaders.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
 
                String jsonBody = "{\"userRemarks\": \"" + comment + "\"}";
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ProductRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ProductRestUtils.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ProductRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ProductRestUtils.java
index 1a59a31..de50c91 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ProductRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ProductRestUtils.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ProductReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ProductReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/PropertyRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/PropertyRestUtils.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/PropertyRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/PropertyRestUtils.java
index 34a158f..cd1a039 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/PropertyRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/PropertyRestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
@@ -31,6 +31,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
@@ -40,12 +43,9 @@ import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyObject;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/RequirementsUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/RequirementsUtils.java
similarity index 92%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/RequirementsUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/RequirementsUtils.java
index 4be1d94..90439e0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/RequirementsUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/RequirementsUtils.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.RequirementDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.RequirementDetails;
 
 import java.util.List;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResourceRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResourceRestUtils.java
index 656ece5..dabab25 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResourceRestUtils.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -28,20 +28,21 @@ import org.apache.http.client.ClientProtocolException;
 import org.json.JSONException;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.validation.BaseValidationUtils;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.resources.data.RelationshipInstData;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ComponentInstanceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ImportReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ComponentInstanceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ImportReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -191,14 +192,14 @@ public class ResourceRestUtils extends BaseRestUtils {
                        throws IOException {
                RestResponse deleteResponse = ResourceRestUtils.deleteResourceByNameAndVersion(
                                ElementFactory.getDefaultUser(UserRoleEnum.ADMIN), resourceName, resourceVersion);
-               return checkErrorCode(deleteResponse);
+               return BaseValidationUtils.checkErrorCode(deleteResponse);
        }
 
        public static Boolean removeResource(String resourceId)
                        throws FileNotFoundException, IOException, ClientProtocolException {
                RestResponse response = deleteResource(resourceId,
                                ElementFactory.getDefaultUser(UserRoleEnum.ADMIN).getUserId());
-               return checkErrorCode(response);
+               return BaseValidationUtils.checkErrorCode(response);
        }
 
        // ************** GET *************

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
similarity index 82%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
index f09b14c..771c4d2 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResourceRestUtilsExternalAPI.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceExternalReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceExternalReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.openecomp.sdc.common.util.GeneralUtility;
 
 import java.util.Map;
@@ -49,7 +49,7 @@ public class ResourceRestUtilsExternalAPI extends BaseRestUtils {
                String calculateMD5 = GeneralUtility.calculateMD5Base64EncodedByString(userBodyJson);
                headersMap.put(HttpHeaderEnum.Content_MD5.getValue(), calculateMD5);
                headersMap.put(HttpHeaderEnum.AUTHORIZATION.getValue(), authorizationHeader);
-               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), BaseRestUtils.xEcompInstanceId);
+               headersMap.put(HttpHeaderEnum.X_ECOMP_INSTANCE_ID.getValue(), xEcompInstanceId);
                headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
                
                HttpRequest http = new HttpRequest();

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.java
index 5254db8..996abb8 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ResponseParser.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 //import com.fasterxml.jackson.databind.DeserializationFeature;
 //import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,13 +35,13 @@ package org.openecomp.sdc.ci.tests.utils.rest;
 //import org.openecomp.sdc.be.model.*;
 //import org.openecomp.sdc.be.model.category.CategoryDefinition;
 //import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintJacksonDeserializer;;
-//import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-//import org.openecomp.sdc.ci.tests.datatypes.ResourceAssetStructure;
-//import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
-//import org.openecomp.sdc.ci.tests.datatypes.ServiceDistributionStatus;
-//import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-//import org.openecomp.sdc.ci.tests.tosca.datatypes.VfModuleDefinition;
-//import org.openecomp.sdc.ci.tests.utils.Utils;
+//import ArtifactReqDetails;
+//import ResourceAssetStructure;
+//import ResourceRespJavaObject;
+//import ServiceDistributionStatus;
+//import RestResponse;
+//import VfModuleDefinition;
+//import Utils;
 //import org.yaml.snakeyaml.Yaml;
 //
 //import java.io.ByteArrayInputStream;
@@ -62,16 +62,16 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceAssetStructure;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceDistributionStatus;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.VfModuleDefinition;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceAssetStructure;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceRespJavaObject;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceDistributionStatus;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.VfModuleDefinition;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.ByteArrayInputStream;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceFilterUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ServiceFilterUtils.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceFilterUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ServiceFilterUtils.java
index ce2760a..cff7405 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceFilterUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ServiceFilterUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 
 import java.util.List;
 
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceFilterDetails;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceFilterDetails;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ServiceRestUtils.java
similarity index 91%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ServiceRestUtils.java
index ec132f0..4b53b64 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/ServiceRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/ServiceRestUtils.java
@@ -18,23 +18,23 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -182,10 +182,10 @@ public class ServiceRestUtils extends BaseRestUtils {
        public static Map<String, String> prepareHeadersMap(User sdncModifierDetails, boolean isCached) {
                Map<String, String> headersMap = new HashMap<>();
                if (isCached)
-                       headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), BaseRestUtils.cacheControlHeader);
+                       headersMap.put(HttpHeaderEnum.CACHE_CONTROL.getValue(), cacheControlHeader);
 
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.USER_ID.getValue(), sdncModifierDetails.getUserId());
                return headersMap;
        }
@@ -205,7 +205,7 @@ public class ServiceRestUtils extends BaseRestUtils {
                String url = String.format(Urls.REJECT_DISTRIBUTION, config.getCatalogBeHost(), config.getCatalogBePort(),
                                serviceId);
                String userBodyJson = gson.toJson(comment);
-               return sendPost(url, userBodyJson, userId, BaseRestUtils.acceptHeaderData);
+               return sendPost(url, userBodyJson, userId, acceptHeaderData);
 
        }
 
@@ -272,8 +272,8 @@ public class ServiceRestUtils extends BaseRestUtils {
                String url = String.format(Urls.GET_FOLLWED_LIST, config.getCatalogBeHost(), config.getCatalogBePort());
 
                Map<String, String> headersMap = new HashMap<>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), BaseRestUtils.contentTypeHeaderData);
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), BaseRestUtils.acceptHeaderData);
+               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData);
+               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), acceptHeaderData);
                headersMap.put(HttpHeaderEnum.USER_ID.getValue(), user.getUserId());
 
                RestResponse getResourceNotAbstarctResponse = httpRequest.httpSendGet(url, headersMap);

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/UserRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/UserRestUtils.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/UserRestUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/UserRestUtils.java
index 0e2a182..3f8926e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/rest/UserRestUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/UserRestUtils.java
@@ -18,17 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.rest;
+package org.onap.sdc.backend.ci.tests.utils.rest;
 
 import com.google.gson.Gson;
 import org.apache.commons.lang.StringUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ArtifactValidationUtils.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ArtifactValidationUtils.java
index 62d491a..5465c98 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ArtifactValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ArtifactValidationUtils.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.resources.data.DAOArtifactData;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Decoder;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.FileUtils;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Decoder;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.FileUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 
 import java.io.File;
@@ -68,7 +68,7 @@ public class ArtifactValidationUtils {
        }
 
        public static void validateArtifactsNumberInComponent(Component component, ArtifactGroupTypeEnum artifactGroupType,
-                       ArtifactTypeEnum artifactType, int expectedNumber) {
+                                                          ArtifactTypeEnum artifactType, int expectedNumber) {
                Map<String, ArtifactDefinition> deploymentArtifacts;
                int counter = 0;
                if (artifactGroupType == ArtifactGroupTypeEnum.DEPLOYMENT) {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/AuditValidationUtils.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/AuditValidationUtils.java
index 4240f04..762e8d9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/AuditValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/AuditValidationUtils.java
@@ -18,16 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import com.datastax.driver.core.ColumnDefinitions;
 import com.datastax.driver.core.Row;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.*;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.javatuples.Pair;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.AuditEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.AuditJsonKeysEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ComponentType;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpRequest;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.cassandra.CassandraUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
@@ -37,29 +48,17 @@ import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.AuditEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.AuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ComponentType;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.expected.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils.CategoryAuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.utils.rest.ConsumerRestUtils.EcompConsumerAuditJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils.CategoryAuditJsonKeysEnum;
+import org.onap.sdc.backend.ci.tests.utils.rest.ConsumerRestUtils.EcompConsumerAuditJsonKeysEnum;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.*;
-
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
@@ -110,7 +109,7 @@ public class AuditValidationUtils {
        }
 
        public static void validateAuditDownloadExternalAPI(ExpectedResourceAuditJavaObject resourceAuditJavaObject,
-                       String action, String body, boolean checkAllFields) throws Exception {
+                                                        String action, String body, boolean checkAllFields) throws Exception {
                Map<String, Object> actualAuditRecords = parseAuditResourceByAction(action, null);
 
                validateField(actualAuditRecords, AuditJsonKeysEnum.ACTION.getAuditJsonKeyName(), action);
@@ -902,7 +901,7 @@ public class AuditValidationUtils {
 
 
        public static ExpectedResourceAuditJavaObject expectedArtifactNotFoundAuditObject(String Action, String resourceUid,
-                       ComponentType resourceType, String artifactUid, User user, String currState, String currVersion)
+                                                                                      ComponentType resourceType, String artifactUid, User user, String currState, String currVersion)
                        throws FileNotFoundException {
                String desc = null;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/BaseValidationUtils.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/BaseValidationUtils.java
index b29fab4..69a7e69 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/BaseValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/BaseValidationUtils.java
@@ -18,12 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.testng.Assert;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/CategoryValidationUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/CategoryValidationUtils.java
index 71a19ea..9af21e6 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CategoryValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/CategoryValidationUtils.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import org.json.JSONObject;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
 
 import static org.testng.AssertJUnit.*;
 
 public class CategoryValidationUtils {
 
        public static void verifyCategoryExistInGetResponse(RestResponse getAllCategoryRest,
-                       CategoryDefinition categoryDefinition) {
+                                                        CategoryDefinition categoryDefinition) {
 
                int categoriesNum = CategoryRestUtils.getMatchingCategoriesNum(getAllCategoryRest, categoryDefinition);
                assertEquals("category " + categoryDefinition.getName() + " not found during get or found more than once", 1,

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/CsarValidationUtils.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/CsarValidationUtils.java
index d85e093..1590b26 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/CsarValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/CsarValidationUtils.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.ci.tests.datatypes.GroupHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.TypeHeatMetaDefinition;
-import org.openecomp.sdc.ci.tests.utils.CsarParserUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.GroupHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.HeatMetaFirstLevelDefinition;
+import org.onap.sdc.backend.ci.tests.datatypes.TypeHeatMetaDefinition;
+import org.onap.sdc.backend.ci.tests.utils.CsarParserUtils;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/DistributionValidationUtils.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/DistributionValidationUtils.java
index b6b809a..60e64bb 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/DistributionValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/DistributionValidationUtils.java
@@ -18,11 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.utils.DistributionUtils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.DistributionUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 
 import java.io.IOException;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ErrorValidationUtils.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ErrorValidationUtils.java
index 4c55339..9913fc9 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ErrorValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ErrorValidationUtils.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ExceptionEnumType;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ExceptionEnumType;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ProductValidationUtils.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ProductValidationUtils.java
index f2ef082..f6b6124 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ProductValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ProductValidationUtils.java
@@ -18,22 +18,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest.ComponentOperationEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest.ComponentOperationEnum;
+import org.onap.sdc.backend.ci.tests.utils.rest.ProductRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ResourceValidationUtils.java
similarity index 97%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ResourceValidationUtils.java
index de6d32b..41e4141 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ResourceValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ResourceValidationUtils.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import com.google.gson.Gson;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.RespJsonKeysEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.InterfaceDefinition;
 import org.openecomp.sdc.be.model.Operation;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceRespJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.enums.RespJsonKeysEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceRespJavaObject;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 
 import java.util.*;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ServiceValidationUtils.java
similarity index 93%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ServiceValidationUtils.java
index 6c9b839..a399ebe 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/ServiceValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/ServiceValidationUtils.java
@@ -18,16 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.model.DistributionStatusEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.expected.ExpectedResourceAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -122,7 +122,7 @@ public class ServiceValidationUtils {
        }
 
        public static void validateDistrubtionStatusValue(RestResponse response,
-                       DistributionStatusEnum expectedDistributionValue) throws Exception {
+                                                      DistributionStatusEnum expectedDistributionValue) throws Exception {
                String actualDistributionValue = ResponseParser.getValueFromJsonResponse(response.getResponse(),
                                "distributionStatus");
                assertEquals(expectedDistributionValue.name(), actualDistributionValue);

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/UserValidationUtils.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/UserValidationUtils.java
index 58fd4f0..b812fcf 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/ci/tests/utils/validation/UserValidationUtils.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/validation/UserValidationUtils.java
@@ -18,19 +18,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.ci.tests.utils.validation;
+package org.onap.sdc.backend.ci.tests.utils.validation;
 
 import com.google.gson.*;
 import org.apache.commons.lang.StringUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.users.AddUserAuditMessageInfo;
-import org.openecomp.sdc.ci.tests.users.UserAuditJavaObject;
-import org.openecomp.sdc.ci.tests.utils.DbUtils;
-import org.openecomp.sdc.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.users.AddUserAuditMessageInfo;
+import org.onap.sdc.backend.ci.tests.users.UserAuditJavaObject;
+import org.onap.sdc.backend.ci.tests.utils.DbUtils;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
 
 import java.util.List;
 
@@ -163,7 +163,7 @@ public class UserValidationUtils {
        }
 
        public static void validateDataAgainstAuditDB_access(User sdncUserDetails, UserAuditJavaObject auditJavaObject,
-                       RestResponse restResponse, ErrorInfo errorInfo, List<String> variables) {
+                                                         RestResponse restResponse, ErrorInfo errorInfo, List<String> variables) {
 
                validateAuditDataAgainstAuditDbInAccess(sdncUserDetails, auditJavaObject, restResponse, errorInfo, variables);
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/AssetLifeCycle.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/AssetLifeCycle.java
index d7698a6..b92b466 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/AssetLifeCycle.java
@@ -18,36 +18,37 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.aventstack.extentreports.Status;
 import com.google.gson.Gson;
 import fj.data.Either;
+import java.io.FileNotFoundException;
 import org.json.simple.parser.JSONParser;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import java.io.FileNotFoundException;
-
 public class AssetLifeCycle extends ComponentBaseTest {
        private static Logger log = LoggerFactory.getLogger(CRUDExternalAPI.class.getName());
        protected static final String UPLOAD_ARTIFACT_PAYLOAD = "UHVUVFktVXNlci1LZXktRmlsZS0yOiBzc2gtcnNhDQpFbmNyeXB0aW9uOiBhZXMyNTYtY2JjDQpDb21tZW5wOA0K";

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/CRUDExternalAPI.java
similarity index 99%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/CRUDExternalAPI.java
index d838375..9ee92bd 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/CRUDExternalAPI.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/CRUDExternalAPI.java
@@ -18,38 +18,38 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.aventstack.extentreports.Status;
 import fj.data.Either;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ArtifactReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.Decoder;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ArtifactReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
 import static java.util.Arrays.asList;
 
 public class CRUDExternalAPI extends ComponentBaseTest {
@@ -365,7 +365,7 @@ public class CRUDExternalAPI extends ComponentBaseTest {
         if (artifactReqDetails != null) {
             String response = restResponse.getResponse();
             String payloadData = artifactReqDetails.getPayload();
-            String decodedPaypload = org.openecomp.sdc.ci.tests.utils.Decoder.decode(payloadData);
+            String decodedPaypload = Decoder.decode(payloadData);
             Assert.assertEquals(response, decodedPaypload, "Response artifact payload not correct.");
         }
         return restResponse;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/DeploymentValiditaion.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/DeploymentValiditaion.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/DeploymentValiditaion.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/DeploymentValiditaion.java
index 9b77603..eb31092 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/DeploymentValiditaion.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/DeploymentValiditaion.java
@@ -18,27 +18,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.aventstack.extentreports.Status;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.PropertyReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.CatalogRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResponseParser;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.PropertyReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 import org.yaml.snakeyaml.Yaml;
@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
 
 import static org.testng.AssertJUnit.assertTrue;
 
-public class DeploymentValiditaion extends ComponentBaseTest{
+public class DeploymentValiditaion extends ComponentBaseTest {
 
        @Rule
        public static TestName name = new TestName();

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetAssetServlet.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetAssetServlet.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetAssetServlet.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetAssetServlet.java
index 2657ddf..a1970a0 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetAssetServlet.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetAssetServlet.java
@@ -18,10 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
@@ -30,6 +33,20 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.api.Urls;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.ArtifactRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.AssetRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
 import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -38,27 +55,9 @@ import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.api.Urls;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.ArtifactRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.AssetRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.testng.annotations.Test;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.testng.AssertJUnit.assertEquals;
 
 public class GetAssetServlet extends ComponentBaseTest {

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetCSARofVF.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetCSARofVF.java
similarity index 95%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetCSARofVF.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetCSARofVF.java
index a56f994..2c7029a 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetCSARofVF.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetCSARofVF.java
@@ -18,21 +18,21 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.AssetRestUtils;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.AssetRestUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetFilteredAssetServlet.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetFilteredAssetServlet.java
similarity index 98%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetFilteredAssetServlet.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetFilteredAssetServlet.java
index 04203ab..1ad8b89 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetFilteredAssetServlet.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetFilteredAssetServlet.java
@@ -18,33 +18,35 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.*;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.Utils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.*;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.DistributionStatusEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.*;
-import org.openecomp.sdc.ci.tests.datatypes.enums.*;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.Utils;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetSpecificAssetMetadataServlet.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetSpecificAssetMetadataServlet.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetSpecificAssetMetadataServlet.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetSpecificAssetMetadataServlet.java
index dbecc14..3e980d6 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/GetSpecificAssetMetadataServlet.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/GetSpecificAssetMetadataServlet.java
@@ -18,26 +18,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceDetailedAssetStructure;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceDetailedAssetStructure;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ArtifactTypeEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.*;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceDetailedAssetStructure;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceDetailedAssetStructure;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ArtifactTypeEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.*;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/SearchFilterCategoryExternalAPI.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/SearchFilterCategoryExternalAPI.java
similarity index 94%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/SearchFilterCategoryExternalAPI.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/SearchFilterCategoryExternalAPI.java
index a54e2c4..5652d4f 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/SearchFilterCategoryExternalAPI.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/SearchFilterCategoryExternalAPI.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -27,25 +27,25 @@ import com.google.gson.JsonParser;
 import org.json.simple.parser.JSONParser;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.SearchCriteriaEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.CategoryRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.SearchCriteriaEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/UserAPIs.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/UserAPIs.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/UserAPIs.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/UserAPIs.java
index 749de6d..19dcb90 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/UserAPIs.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/UserAPIs.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -26,19 +26,19 @@ import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.onap.portalsdk.core.restful.domain.EcompRole;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.BaseRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.EcompUserRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.UserRestUtils;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.EcompUserRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.UserRestUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/VFCMTExternalAPI.java
similarity index 96%
rename from integration-tests/src/test/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/externalApis/VFCMTExternalAPI.java
index 2eb3843..ca51678 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/externalApis/VFCMTExternalAPI.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/externalApis/VFCMTExternalAPI.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.externalApis;
+package org.onap.sdc.backend.externalApis;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -26,26 +26,26 @@ import com.google.gson.JsonElement;
 import org.json.simple.parser.JSONParser;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.config.Config;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceAssetStructure;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceExternalReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.ServiceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ErrorInfo;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.SearchCriteriaEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.rest.AssetRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.ResourceRestUtilsExternalAPI;
+import org.onap.sdc.backend.ci.tests.utils.validation.ErrorValidationUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.config.Config;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceAssetStructure;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceExternalReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.SearchCriteriaEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.rest.AssetRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils;
-import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtilsExternalAPI;
-import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/internalApis/annotations/AnnotationsTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/internalApis/annotations/AnnotationsTest.java
similarity index 73%
rename from integration-tests/src/test/java/org/openecomp/sdc/internalApis/annotations/AnnotationsTest.java
rename to integration-tests/src/test/java/org/onap/sdc/backend/internalApis/annotations/AnnotationsTest.java
index 63f855c..2f7408e 100644 (file)
--- a/integration-tests/src/test/java/org/openecomp/sdc/internalApis/annotations/AnnotationsTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/internalApis/annotations/AnnotationsTest.java
@@ -18,30 +18,33 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.internalApis.annotations;
+package org.onap.sdc.backend.internalApis.annotations;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.onap.sdc.backend.ci.tests.api.ComponentBaseTest;
+import org.onap.sdc.backend.ci.tests.datatypes.ResourceReqDetails;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.LifeCycleStatesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.NormativeTypesEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum;
+import org.onap.sdc.backend.ci.tests.datatypes.http.RestResponse;
+import org.onap.sdc.backend.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition;
+import org.onap.sdc.backend.ci.tests.utils.ToscaTypesDefinitionUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils;
+import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory;
+import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
+import org.onap.sdc.backend.ci.tests.utils.rest.InputsRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.rest.PropertyRestUtils;
+import org.onap.sdc.backend.ci.tests.utils.validation.BaseValidationUtils;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.datatypes.elements.Annotation;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.utils.ComponentUtilities;
-import org.openecomp.sdc.ci.tests.api.ComponentBaseTest;
-import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails;
-import org.openecomp.sdc.ci.tests.datatypes.enums.LifeCycleStatesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.NormativeTypesEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.ResourceCategoryEnum;
-import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum;
-import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
-import org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition;
-import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
-import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
-import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
-import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -53,15 +56,10 @@ import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.openecomp.sdc.ci.tests.tosca.datatypes.ToscaAnnotationsTypesDefinition.SOURCE_ANNOTATION;
-import static org.openecomp.sdc.ci.tests.utils.ToscaTypesDefinitionUtils.getToscaAnnotationsFromCsar;
-import static org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils.*;
-import static org.openecomp.sdc.ci.tests.utils.general.ElementFactory.getDefaultUser;
-import static org.openecomp.sdc.ci.tests.utils.rest.InputsRestUtils.deleteInputFromComponent;
-import static org.openecomp.sdc.ci.tests.utils.validation.BaseValidationUtils.checkSuccess;
+import static org.onap.sdc.backend.ci.tests.utils.rest.InputsRestUtils.deleteInputFromComponent;
 import static org.springframework.util.CollectionUtils.isEmpty;
 
-public class AnnotationsTest extends ComponentBaseTest{
+public class AnnotationsTest extends ComponentBaseTest {
 
     private static final String PCM_FLAVOR_NAME = "pcm_flavor_name";
     private static final String AVAILABILITY_ZONE = "availabilityzone_name";
@@ -84,32 +82,32 @@ public class AnnotationsTest extends ComponentBaseTest{
         User sdncModifierDetails = ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER);
         ResourceReqDetails resourceDetails = ElementFactory.getDefaultResourceByType("exportToscaAnnotationsYml", NormativeTypesEnum.ROOT, ResourceCategoryEnum.GENERIC_INFRASTRUCTURE, sdncModifierDetails.getUserId(), ResourceTypeEnum.VF.toString());
         Resource createdVF = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
-        ToscaAnnotationsTypesDefinition toscaAnnotations = getToscaAnnotationsFromCsar(createdVF, sdncModifierDetails);
-        assertTrue(toscaAnnotations.getAnnotation_types().containsKey(SOURCE_ANNOTATION));
+        ToscaAnnotationsTypesDefinition toscaAnnotations = ToscaTypesDefinitionUtils.getToscaAnnotationsFromCsar(createdVF, sdncModifierDetails);
+        assertTrue(toscaAnnotations.getAnnotation_types().containsKey(ToscaAnnotationsTypesDefinition.SOURCE_ANNOTATION));
     }
 
     @Test
     public void whenDeclaringAnInputFromPropertyWhichOriginatedFromInputWithAnnotation_copyAnnotationsToNewInput() throws Exception {
         Resource vfWithAnnotationsV1 = importAnnotationsCsarAndCheckIn();
-        Service service = createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
-        ComponentInstance createdCmptInstance = addComponentInstanceToComponentContainer(vfWithAnnotationsV1, service).left().value();
-        Service fetchedService = getServiceObject(service.getUniqueId());
+        Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+        ComponentInstance createdCmptInstance = AtomicOperationUtils.addComponentInstanceToComponentContainer(vfWithAnnotationsV1, service).left().value();
+        Service fetchedService = AtomicOperationUtils.getServiceObject(service.getUniqueId());
         List<ComponentInstanceInput> declaredProps = declareProperties(fetchedService, createdCmptInstance, PROPS_TO_DECLARE);
         verifyAnnotationsOnDeclaredInputs(vfWithAnnotationsV1, fetchedService, declaredProps);
-        Service serviceAfterPropertyDeclaration = getServiceObject(service.getUniqueId());
+        Service serviceAfterPropertyDeclaration = AtomicOperationUtils.getServiceObject(service.getUniqueId());
         deleteDeclaredInputsAndVerifySuccess(serviceAfterPropertyDeclaration);
     }
 
     @Test
     public void onChangeVersion_copyAnnotationsFromNewVspToServiceInputs() throws Exception {
         Resource vfWithAnnotationsV1 = importAnnotationsCsarAndCheckIn();
-        Service service = createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
-        ComponentInstance createdCmptInstance = addComponentInstanceToComponentContainer(vfWithAnnotationsV1, service).left().value();
-        Service fetchedService = getServiceObject(service.getUniqueId());
+        Service service = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true).left().value();
+        ComponentInstance createdCmptInstance = AtomicOperationUtils.addComponentInstanceToComponentContainer(vfWithAnnotationsV1, service).left().value();
+        Service fetchedService = AtomicOperationUtils.getServiceObject(service.getUniqueId());
         declareProperties(fetchedService, createdCmptInstance, PROPS_TO_DECLARE);
 
         Resource vfWithAnnotationsV2 = updateAnnotationsCsarAndCheckIn(vfWithAnnotationsV1);
-        Pair<Component, ComponentInstance> changeVersionRes = changeComponentInstanceVersion(service, createdCmptInstance, vfWithAnnotationsV2, UserRoleEnum.DESIGNER, true).left().value();
+        Pair<Component, ComponentInstance> changeVersionRes = AtomicOperationUtils.changeComponentInstanceVersion(service, createdCmptInstance, vfWithAnnotationsV2, UserRoleEnum.DESIGNER, true).left().value();
         Component serviceAfterChangeVersion = changeVersionRes.getKey();
         ComponentInstance newInstance = changeVersionRes.getRight();
         List<ComponentInstanceInput> declaredProps = getInstanceProperties(serviceAfterChangeVersion, newInstance.getUniqueId(), PROPS_TO_DECLARE);
@@ -131,10 +129,10 @@ public class AnnotationsTest extends ComponentBaseTest{
 
     private void deleteDeclaredInputsAndVerifySuccess(Component service) throws Exception {
         for (InputDefinition declaredInput : service.getInputs()) {
-            RestResponse deleteInputResponse = deleteInputFromComponent(service, declaredInput.getUniqueId());
-            checkSuccess(deleteInputResponse);
+            RestResponse deleteInputResponse = InputsRestUtils.deleteInputFromComponent(service, declaredInput.getUniqueId());
+            BaseValidationUtils.checkSuccess(deleteInputResponse);
         }
-        Service fetchedService = getServiceObject(service.getUniqueId());
+        Service fetchedService = AtomicOperationUtils.getServiceObject(service.getUniqueId());
         assertThat(fetchedService.getInputs()).isNullOrEmpty();
     }
 
@@ -164,7 +162,7 @@ public class AnnotationsTest extends ComponentBaseTest{
     }
 
     private Map<String, InputDefinition> getCreatedInputsByProperty(Component service, List<ComponentInstanceInput> declaredProps) throws Exception {
-        Service fetchedService = getServiceObject(service.getUniqueId());
+        Service fetchedService = AtomicOperationUtils.getServiceObject(service.getUniqueId());
         List<InputDefinition> inputs = fetchedService.getInputs();
         return filterInputsCreatedByDeclaringFromProperties(declaredProps, inputs);
     }
@@ -176,22 +174,22 @@ public class AnnotationsTest extends ComponentBaseTest{
     }
 
     private Resource importAnnotationsCsarAndCheckIn() throws Exception {
-        Resource annotationsVF = importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, CSAR_WITH_ANNOTATIONS_V1, SRIOV_PATH);
-        changeComponentState(annotationsVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+        Resource annotationsVF = AtomicOperationUtils.importResourceFromCsar(ResourceTypeEnum.VF, UserRoleEnum.DESIGNER, CSAR_WITH_ANNOTATIONS_V1, SRIOV_PATH);
+        AtomicOperationUtils.changeComponentState(annotationsVF, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
         return annotationsVF;
     }
 
     private Resource updateAnnotationsCsarAndCheckIn(Resource vfToUpdate) throws Exception {
-        changeComponentState(vfToUpdate, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true);
-        Resource annotationsVfV2 = updateResourceFromCsar(vfToUpdate, UserRoleEnum.DESIGNER, CSAR_WITH_ANNOTATIONS_V2, SRIOV_PATH);
-        changeComponentState(annotationsVfV2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
+        AtomicOperationUtils.changeComponentState(vfToUpdate, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKOUT, true);
+        Resource annotationsVfV2 = AtomicOperationUtils.updateResourceFromCsar(vfToUpdate, UserRoleEnum.DESIGNER, CSAR_WITH_ANNOTATIONS_V2, SRIOV_PATH);
+        AtomicOperationUtils.changeComponentState(annotationsVfV2, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CHECKIN, true);
         return annotationsVfV2;
     }
 
     private List<ComponentInstanceInput> declareProperties(Service service, ComponentInstance instance, String ... propertiesToDeclareNames) throws Exception {
         Map<String, List<ComponentInstanceInput>> propertiesToDeclare = getServiceInstancesProps(service, instance.getUniqueId(), propertiesToDeclareNames);
-        RestResponse restResponse = PropertyRestUtils.declareProporties(service, propertiesToDeclare, getDefaultUser(UserRoleEnum.DESIGNER));
-        checkSuccess(restResponse);
+        RestResponse restResponse = PropertyRestUtils.declareProporties(service, propertiesToDeclare, ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER));
+        BaseValidationUtils.checkSuccess(restResponse);
         return propertiesToDeclare.get(instance.getUniqueId());
     }
 

diff --git a/integration-tests/src/test/java/org/openecomp/sdc/post/Install.java b/integration-tests/src/test/java/org/openecomp/sdc/post/Install.java
deleted file mode 100644 (file)
index 322a317..0000000
--- a/integration-tests/src/test/java/org/openecomp/sdc/post/Install.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.post;
-
-import org.openecomp.sdc.be.dao.DAOJanusGraphStrategy;
-import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
-import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
-
-import java.io.File;
-
-public class Install {
-       public static void main(String[] args) {
-
-               if (args == null || args.length == 0) {
-                       System.out.println("Usage: org.openecomp.sdc.post.Install path_to_janusgraph.properties");
-                       System.exit(1);
-               }
-               String janusGraphPropsFile = args[0];
-
-               if (!isFileExists(janusGraphPropsFile)) {
-                       System.exit(2);
-               }
-
-               if (!createJanusGraphSchema(janusGraphPropsFile)) {
-                       System.exit(3);
-               }
-
-               System.exit(0);
-       }
-
-       private static boolean createJanusGraphSchema(String janusGraphPropsFile) {
-               JanusGraphClient janusGraphClient = new JanusGraphClient(new DAOJanusGraphStrategy());
-               JanusGraphOperationStatus status = janusGraphClient.createGraph(janusGraphPropsFile);
-               if (JanusGraphOperationStatus.OK == status) {
-                       System.out.println("JanusGraph schema ,indexes and default values created successfully.");
-                       return true;
-               } else {
-                       System.out.println(
-                                       "Problem while creating janusgraph schema ,indexes and default values. (" + status.name() + ")");
-                       return false;
-               }
-       }
-
-       private static boolean isFileExists(String janusGraphPropsFile) {
-               File f = new File(janusGraphPropsFile);
-               if (!f.exists()) {
-                       System.out.println(janusGraphPropsFile + " not found");
-                       return false;
-               }
-               return true;
-       }
-}

diff --git a/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml
deleted file mode 100644 (file)
index 005bdba..0000000
--- a/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="lifeCycle" parallel="none">
-  <test name="Test">
-    <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
-    </classes>
-  </test> <!-- Test -->
-</suite> <!-- lifeCycle -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
index 9237775..0306e46 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml
@@ -5,7 +5,7 @@
   <test name="Test">
     <classes>
       <class 
-      name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+      name="org.onap.sdc.backend.externalApis.CRUDExternalAPI">
                           <methods>
                                <!--    <include name="uploadArtifactOnVFViaExternalAPI" />
                                        <include name="uploadArtifactOnServiceViaExternalAPI" />

diff --git a/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
index 0259452..b17a8e6 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/ExternalApiSanity.xml
@@ -4,7 +4,7 @@
 
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+      <class name="org.onap.sdc.backend.externalApis.CRUDExternalAPI">
                <methods>
                        <include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" />
                        <include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" />
@@ -24,41 +24,41 @@
                        <include name="deleteArtifactOnAssetWhichNotExist" />                   
                </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt">
         <methods>
             <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
         <methods>
             <include name="getResourceAssetBySpecifiedCategory"/>
             <include name="getServiceAssetBySpecifiedCategory"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+      <class name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI">
         <methods>
             <include name="normativeResourceCategory" invocation-numbers="0"/>
         </methods>
       </class>      
-      <class name="org.openecomp.sdc.externalApis.GetCSARofVF">
+      <class name="org.onap.sdc.backend.externalApis.GetCSARofVF">
         <methods>
             <include name="getServiceToscaModelCheckInState"/>
             <include name="getRsourceToscaModelCertifyState"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
         <methods>
             <include name="getResourceAssetBySpecifiedCategory"/>
             <include name="getServiceAssetBySpecifiedCategory"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+      <class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet">
         <methods>
             <include name="getResourceAssetMetadataSuccess"/>
             <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.AssetLifeCycle">
+      <class name="org.onap.sdc.backend.externalApis.AssetLifeCycle">
         <methods>
             <include name="theFlow"/>
         </methods>

diff --git a/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml b/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
index 8d21be4..b401c28 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/SearchExternalAPI.xml
@@ -5,7 +5,7 @@
   <test name="Test">
     <classes>
       <class 
-      name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+      name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI">
                           <methods>
 
                                        <include name="searchWithInvalidFilter" />

diff --git a/integration-tests/src/test/resources/ci/testSuites/artifacts.xml b/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
index 1352e75..1e27b81 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/artifacts.xml
@@ -3,9 +3,9 @@
 <suite name="Artifacts">
   <test name="Artifacts">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.PlaceHolderValidations"/>
     </classes>
   </test>
 </suite> <!-- Artifacts -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
index 8298af2..9b1c6e5 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml
@@ -3,8 +3,8 @@
 <suite name="Cap_Req" >
        <test name="Cap_Req">
                <classes>
-                       <class name="org.openecomp.sdc.ci.tests.requirements.RequirementsTest"/>
-                       <class name="org.openecomp.sdc.ci.tests.capability.CapabilitiesTest"/>
+                       <class name="org.onap.sdc.backend.ci.tests.requirements.RequirementsTest"/>
+                       <class name="org.onap.sdc.backend.ci.tests.capability.CapabilitiesTest"/>
                </classes>
        </test>
 </suite> <!-- Artifacts -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/category.xml b/integration-tests/src/test/resources/ci/testSuites/category.xml
index 3de8343..ef2c26f 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/category.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/category.xml
@@ -3,8 +3,8 @@
 <suite name="category">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.GroupingTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.SubCategoriesTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- category -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
index 7a9558e..963c568 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml
@@ -3,8 +3,8 @@
 <suite name="ciFull" configfailurepolicy="continue" verbose="2">
   <test name="Category">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.GroupingTest">
         <methods>
           <exclude name="createProductGroupForNonExistingCategory"/>
           <exclude name="createProductGroupForNonExistingSunCategory"/>
@@ -12,7 +12,7 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.SubCategoriesTest">
         <methods>
           <exclude name="createProductSubCategoryForNonExistingCategory"/>
           <exclude name="createResourceSubCategoryForNonExistingCategory"/>
@@ -24,9 +24,9 @@
   <test name="Distribution">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"/>
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
         <methods>
           <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
         </methods>
@@ -35,44 +35,44 @@
   </test> <!-- Test -->
   <test name="General">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest"/>
     </classes>
   </test>
   <test name="Resource">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.SimultaneousApiTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.SimultaneousApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
         <methods>
           <exclude name="UpdateResourceCategory_negativeFlow"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData"/>
+        name="org.onap.sdc.backend.ci.tests.execute.resource.ValidateExtendedVfData"/>
     </classes>
   </test>
   <test name="Product">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
         <methods>
           <exclude name="undoCheckOutNotExist"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
         <methods>
           <exclude name="checkInProductNotExist"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest">
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductCreateWithValidationsTest">
         <methods>
           <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/>
           <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/>
@@ -84,14 +84,14 @@
   </test>
   <test name="Service">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.service.GetAllServiceVersions"/>
     </classes>
   </test>
   <test name="Artifacts">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.artifacts.PlaceHolderValidations"/>
     </classes>
   </test>
 </suite> 
\ No newline at end of file

diff --git a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
index 7c9d6d9..637ec3e 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml
@@ -4,28 +4,28 @@
        <test name="ExternalApis"> 
                <classes>       
                        
-                       <class name="org.openecomp.sdc.externalApis.VFCMTExternalAPI"/>
-                       <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI"/> 
-                       <class name="org.openecomp.sdc.externalApis.DeploymentValiditaion"/>  
-                       <class name="org.openecomp.sdc.externalApis.GetAssetServlet"/>
-                       <class name="org.openecomp.sdc.externalApis.GetCSARofVF"/>
-                       <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"/>
-                       <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"/>
-                       <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI"/>
-                       <class name="org.openecomp.sdc.externalApis.AssetLifeCycle"/>
-                       <class name="org.openecomp.sdc.externalApis.UserAPIs"/>
+                       <class name="org.onap.sdc.backend.externalApis.VFCMTExternalAPI"/>
+                       <class name="org.onap.sdc.backend.externalApis.CRUDExternalAPI"/>
+                       <class name="org.onap.sdc.backend.externalApis.DeploymentValiditaion"/>
+                       <class name="org.onap.sdc.backend.externalApis.GetAssetServlet"/>
+                       <class name="org.onap.sdc.backend.externalApis.GetCSARofVF"/>
+                       <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet"/>
+                       <class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet"/>
+                       <class name="org.onap.sdc.backend.externalApis.SearchFilterCategoryExternalAPI"/>
+                       <class name="org.onap.sdc.backend.externalApis.AssetLifeCycle"/>
+                       <class name="org.onap.sdc.backend.externalApis.UserAPIs"/>
 
-                       <class name="org.openecomp.sdc.internalApis.annotations.AnnotationsTest"/>
+                       <class name="org.onap.sdc.backend.internalApis.annotations.AnnotationsTest"/>
 
                        
 <!--         <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+                             <class name="ProductCheckinTest"/>
+                             <class name="ProductCheckoutTest"/>
                              <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+                             <class name="ProductCreateWithValidationsTest"/>
                              <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>    -->
+                             <class name="ProductGetFollowedTest"/>
+                             <class name="ProductUndoCheckoutTest"/>    -->
                        
                        
                </classes>

diff --git a/integration-tests/src/test/resources/ci/testSuites/general.xml b/integration-tests/src/test/resources/ci/testSuites/general.xml
index a63f364..9ee6387 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/general.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/general.xml
@@ -3,7 +3,7 @@
 <suite name="General">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- General -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/imports.xml b/integration-tests/src/test/resources/ci/testSuites/imports.xml
index b9374cf..56d9010 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/imports.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/imports.xml
@@ -3,7 +3,7 @@
 <suite name="Imports">
   <test name="Imports">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Imports -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/normatives.xml b/integration-tests/src/test/resources/ci/testSuites/normatives.xml
index 02da714..8e633e2 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/normatives.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/normatives.xml
@@ -19,7 +19,7 @@
 <suite name="normatives" >
        <test name="InterfaceLifecycleTypes">
                <classes>
-                       <class name="org.openecomp.sdc.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
+                       <class name="org.onap.sdc.backend.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
                </classes>
        </test>
 </suite> 
\ No newline at end of file

diff --git a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
index 9fcd043..9f18910 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml
@@ -5,7 +5,7 @@
        <parameter name="makeToscaValidation"  value="true"/>
        <test name="ExternalApis"> 
                <classes>
-                       <class name="org.openecomp.sdc.ci.tests.sanity.Onboard"/>
+                       <class name="org.onap.sdc.backend.ci.tests.sanity.Onboard"/>
                </classes>
        </test>
 </suite>
\ No newline at end of file

diff --git a/integration-tests/src/test/resources/ci/testSuites/pass.xml b/integration-tests/src/test/resources/ci/testSuites/pass.xml
index 731d736..00df382 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/pass.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/pass.xml
@@ -7,7 +7,7 @@
 
  <classes>
     <class
-            name="org.openecomp.sdc.ci.tests.sanity.Onboard">
+            name="org.onap.sdc.backend.ci.tests.sanity.Onboard">
         <methods>
             <include name="passTest" />
         </methods>

diff --git a/integration-tests/src/test/resources/ci/testSuites/product.xml b/integration-tests/src/test/resources/ci/testSuites/product.xml
index 101b94a..559fc54 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/product.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/product.xml
@@ -3,10 +3,10 @@
 <suite name="Product">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductLifecycleTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductLifecycleTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Product -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
index df9aa9f..bd5f06d 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml
@@ -5,11 +5,11 @@
 
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Suite -->
\ No newline at end of file

diff --git a/integration-tests/src/test/resources/ci/testSuites/property.xml b/integration-tests/src/test/resources/ci/testSuites/property.xml
index b7dba95..cb8875a 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/property.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/property.xml
@@ -3,8 +3,8 @@
 <suite name="Property" >
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Property -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/resource.xml b/integration-tests/src/test/resources/ci/testSuites/resource.xml
index 4fd0e43..c2dd490 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/resource.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/resource.xml
@@ -5,30 +5,30 @@
   <test verbose="2" name="Sanity">
     <classes>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+      <class name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests">
         <methods>
           <include name="downloadServiceArtifactSuccessWithAutantication"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
         <methods>
           <include name="downloadResourceArtifactSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest">
         <methods>
           <include name="testE2EUuidHeaderReturnedAndPreserved"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest">
         <methods>
           <include name="importAllTestResources"/>
           <include name="testImportCheckoutAndUpdateUserResource"/>
@@ -36,7 +36,7 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest">
         <methods>
           <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
           <include name="updateResourceAdditionalInformationTest"/>
@@ -44,66 +44,66 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest">
         <methods>
           <include name="testPropertyApis"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions">
         <methods>
           <include name="getResourceAllVersions_version15"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest">
         <methods>
           <include name="updateResourceMetadataSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
         <methods>
           <include name="UpdateDerivedFromSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest">
         <methods>
           <include name="testServiceAuditCertifiedVersion"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser">
+      <class name="org.onap.sdc.backend.ci.tests.execute.user.ActivateDeActivateDeleteUser">
         <methods>
           <include name="authorizeDeActivatedUser"/>
         </methods>
       </class>
 
       <!-- Product tests start-->
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
         <methods>
           <include name="checkInProductByCreator"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest">
         <methods>
           <include name="checkOutProductByPmNotInContacts"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest">
         <methods>
           <include name="followedPageTest"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
         <methods>
           <include name="undoCheckOutProductByPm"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
         <methods>
           <include name="addInterfaceOperationsOfGlobalTypeOnResource"/>
           <include name="addInterfaceOperationsOnResource"/>

diff --git a/integration-tests/src/test/resources/ci/testSuites/sanity.xml b/integration-tests/src/test/resources/ci/testSuites/sanity.xml
index 320c3cc..09323f2 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/sanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/sanity.xml
@@ -4,14 +4,14 @@
 
   <test name="sanityE2Eflows">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E"/>
+      <class name="org.onap.sdc.backend.ci.tests.sanity.CrudE2E"/>
     </classes>
   </test>
 
   <test name="General">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.FeProxyTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.general.UuidTest">
         <methods>
           <include name="testE2EUuidHeaderReturnedAndPreserved"/>
         </methods>
@@ -27,7 +27,7 @@
   <test name="Artifact">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt">
         <methods>
           <include name="downloadArtifactFromResourceTest"/>
           <include name="downloadArtifactFromServiceTest"/>
@@ -39,7 +39,7 @@
   <test name="Service">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest">
         <methods>
           <include name="testServiceAuditCertifiedVersion"/>
         </methods>
@@ -51,20 +51,20 @@
   <test name="Resource">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions">
         <methods>
           <include name="getResourceAllVersions_version15"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.resource.ResourceApiTest">
         <methods>
           <include name="updateResourceMetadataSuccess"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest">
         <methods>
           <include name="UpdateDerivedFromSuccess"/>
         </methods>
@@ -73,24 +73,24 @@
   </test>
   <test name="Product">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckinTest">
         <methods>
           <include name="checkInProductByCreator"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.product.ProductCheckoutTest">
         <methods>
           <include name="checkOutProductByPmNotInContacts"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest">
         <methods>
           <include name="followedPageTest"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest">
         <methods>
           <include name="undoCheckOutProductByPm"/>
         </methods>
@@ -100,21 +100,21 @@
   </test>
   <test name="Catalog">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.category.CatalogDataApiTest"/>
     </classes>
   </test>
 
   <test name="distribution">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests">
         <methods>
           <include name="downloadServiceArtifactSuccessWithAutantication"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
         <methods>
           <include name="downloadResourceArtifactSuccess"/>
         </methods>
@@ -130,7 +130,7 @@
   <test name="Imports">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        name="org.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest">
         <methods>
           <include name="importAllTestResources"/>
           <include name="testImportCheckoutAndUpdateUserResource"/>
@@ -138,7 +138,7 @@
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
+        name="org.onap.sdc.backend.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
         <methods>
           <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
           <include
@@ -151,7 +151,7 @@
   <test name="attribute">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
+        name="org.onap.sdc.backend.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
         <methods>
           <include name="testUpdateAttributeOnResourceInstance"/>
         </methods>
@@ -162,7 +162,7 @@
   <test name="inputs">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests">
+        name="org.onap.sdc.backend.ci.tests.execute.inputs.InputsApiTests">
         <methods>
           <include name="testInputsMainFunctionality"/>
         </methods>
@@ -173,7 +173,7 @@
   <test name="property">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest">
         <methods>
           <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
           <include name="updateResourceAdditionalInformationTest"/>
@@ -181,12 +181,12 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.PropertyApisTest">
         <methods>
           <include name="testPropertyApis"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.property.ComponentInstancePropertyTest">
         <methods>
           <include name="nestedVfResourceProperty3Levels"/>
         </methods>
@@ -203,18 +203,18 @@
 
   <test name="ExternalApis">
     <classes>
-      <class name="org.openecomp.sdc.externalApis.GetAssetServlet">
+      <class name="org.onap.sdc.backend.externalApis.GetAssetServlet">
         <methods>
           <include name="getResourceAssetSuccess"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="org.onap.sdc.backend.externalApis.GetFilteredAssetServlet">
         <methods>
           <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
           <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+      <class name="org.onap.sdc.backend.externalApis.GetSpecificAssetMetadataServlet">
         <methods>
           <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/>
           <include

diff --git a/integration-tests/src/test/resources/ci/testSuites/service.xml b/integration-tests/src/test/resources/ci/testSuites/service.xml
index 9c66276..05300ba 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/service.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/service.xml
@@ -3,8 +3,8 @@
 <suite name="Service">
   <test name="Service">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+      <class name="org.onap.sdc.backend.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
         <methods>
           <include name="addInterfaceOperationsOnService"/>
           <include name="getInterfaceOperationsFromService"/>

diff --git a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
index 7f1cba4..9ae3cfd 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="lifeCycle">
+<suite name="lifeCycle" parallel="none">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.lifecycle.LCSbaseTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- lifeCycle -->

diff --git a/integration-tests/src/test/resources/ci/testSuites/user.xml b/integration-tests/src/test/resources/ci/testSuites/user.xml
index 3ab1f97..ddd90b1 100644 (file)
--- a/integration-tests/src/test/resources/ci/testSuites/user.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/user.xml
@@ -3,7 +3,7 @@
 <suite name="User">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
+      <class name="org.onap.sdc.backend.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- User -->

diff --git a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
index 005bdba..6188116 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
+++ b/test-apis-ci/src/main/resources/ci/conf/testngLifeCycle.xml
@@ -3,7 +3,7 @@
 <suite name="lifeCycle" parallel="none">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+      <class name="LCSbaseTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- lifeCycle -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
index 9237775..78c9372 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/CRUDArtifacts.xml
@@ -5,7 +5,7 @@
   <test name="Test">
     <classes>
       <class 
-      name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+      name="CRUDExternalAPI">
                           <methods>
                                <!--    <include name="uploadArtifactOnVFViaExternalAPI" />
                                        <include name="uploadArtifactOnServiceViaExternalAPI" />

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
index 0259452..633054f 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/ExternalApiSanity.xml
@@ -4,7 +4,7 @@
 
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI">
+      <class name="CRUDExternalAPI">
                <methods>
                        <include name="uploadArtifactOnVfcVlCpViaExternalAPI" invocation-numbers="0" />
                        <include name="uploadArtifactOnVFViaExternalAPI" invocation-numbers="0" />
@@ -24,41 +24,41 @@
                        <include name="deleteArtifactOnAssetWhichNotExist" />                   
                </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+      <class name="DownloadComponentArt">
         <methods>
             <include name="downloadArtifactOfComponentInstanceFromServiceViaExternalAPI"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="GetFilteredAssetServlet">
         <methods>
             <include name="getResourceAssetBySpecifiedCategory"/>
             <include name="getServiceAssetBySpecifiedCategory"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI">
+      <class name="SearchFilterCategoryExternalAPI">
         <methods>
             <include name="normativeResourceCategory" invocation-numbers="0"/>
         </methods>
       </class>      
-      <class name="org.openecomp.sdc.externalApis.GetCSARofVF">
+      <class name="GetCSARofVF">
         <methods>
             <include name="getServiceToscaModelCheckInState"/>
             <include name="getRsourceToscaModelCertifyState"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="GetFilteredAssetServlet">
         <methods>
             <include name="getResourceAssetBySpecifiedCategory"/>
             <include name="getServiceAssetBySpecifiedCategory"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+      <class name="GetSpecificAssetMetadataServlet">
         <methods>
             <include name="getResourceAssetMetadataSuccess"/>
             <include name="getServiceAssetMetadataWithResourceInstancesSuccess"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.AssetLifeCycle">
+      <class name="AssetLifeCycle">
         <methods>
             <include name="theFlow"/>
         </methods>

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
index 1352e75..6a018ab 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/artifacts.xml
@@ -3,9 +3,9 @@
 <suite name="Artifacts">
   <test name="Artifacts">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+      <class name="DownloadComponentArt"/>
+      <class name="ValidateHeatArtFieldsTypes"/>
+      <class name="PlaceHolderValidations"/>
     </classes>
   </test>
 </suite> <!-- Artifacts -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml b/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
index 8298af2..4fefeaf 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/cap_req.xml
@@ -3,8 +3,8 @@
 <suite name="Cap_Req" >
        <test name="Cap_Req">
                <classes>
-                       <class name="org.openecomp.sdc.ci.tests.requirements.RequirementsTest"/>
-                       <class name="org.openecomp.sdc.ci.tests.capability.CapabilitiesTest"/>
+                       <class name="RequirementsTest"/>
+                       <class name="CapabilitiesTest"/>
                </classes>
        </test>
 </suite> <!-- Artifacts -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/category.xml b/test-apis-ci/src/main/resources/ci/testSuites/category.xml
index 3de8343..b6f64fc 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/category.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/category.xml
@@ -3,8 +3,8 @@
 <suite name="category">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest"/>
+      <class name="GroupingTest"/>
+      <class name="SubCategoriesTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- category -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
index 47624c6..35239c7 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/ciFull.xml
@@ -3,8 +3,8 @@
 <suite name="ciFull" configfailurepolicy="continue" verbose="2">
   <test name="Category">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.GroupingTest">
+      <class name="CatalogDataApiTest"/>
+      <class name="GroupingTest">
         <methods>
           <exclude name="createProductGroupForNonExistingCategory"/>
           <exclude name="createProductGroupForNonExistingSunCategory"/>
@@ -12,7 +12,7 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.category.SubCategoriesTest">
+      <class name="SubCategoriesTest">
         <methods>
           <exclude name="createProductSubCategoryForNonExistingCategory"/>
           <exclude name="createResourceSubCategoryForNonExistingCategory"/>
@@ -24,9 +24,9 @@
   <test name="Distribution">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests"/>
+        name="AuthanticationTests"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="DistributionDownloadArtifactTest">
         <methods>
           <exclude name="downloadServiceArtifact_ServiceVersionNotFound"/>
         </methods>
@@ -35,44 +35,44 @@
   </test> <!-- Test -->
   <test name="General">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+      <class name="FeProxyTest"/>
+      <class name="UuidTest"/>
     </classes>
   </test>
   <test name="Resource">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.SimultaneousApiTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+      <class name="SimultaneousApiTest"/>
+      <class name="UpdateResourceMetadataTest">
         <methods>
           <exclude name="UpdateResourceCategory_negativeFlow"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.VFResourceInstanceNameCRUD"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest"/>
+      <class name="VFResourceInstanceNameCRUD"/>
+      <class name="ResourceApiTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.ValidateExtendedVfData"/>
+        name="ValidateExtendedVfData"/>
     </classes>
   </test>
   <test name="Product">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        name="ProductUndoCheckoutTest">
         <methods>
           <exclude name="undoCheckOutNotExist"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
+        name="ProductGetFollowedTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductToscaYamlGenerationTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+        name="ProductToscaYamlGenerationTest"/>
+      <class name="ProductCheckinTest">
         <methods>
           <exclude name="checkInProductNotExist"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="ProductCheckoutTest"/>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest">
+        name="ProductCreateWithValidationsTest">
         <methods>
           <exclude name="createProductDescriptionRemoveSpacesFromBeginning"/>
           <exclude name="createProductDescriptionRemoveSpacesFromTheEnd"/>
@@ -104,14 +104,14 @@
           <exclude name="rejectServiceNotFound"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
+      <class name="GetAllServiceVersions"/>
     </classes>
   </test>
   <test name="Artifacts">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.ValidateHeatArtFieldsTypes"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.artifacts.PlaceHolderValidations"/>
+      <class name="DownloadComponentArt"/>
+      <class name="ValidateHeatArtFieldsTypes"/>
+      <class name="PlaceHolderValidations"/>
     </classes>
   </test>
 </suite> 
\ No newline at end of file

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
index 7c9d6d9..b837618 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml
@@ -4,28 +4,28 @@
        <test name="ExternalApis"> 
                <classes>       
                        
-                       <class name="org.openecomp.sdc.externalApis.VFCMTExternalAPI"/>
-                       <class name="org.openecomp.sdc.externalApis.CRUDExternalAPI"/> 
-                       <class name="org.openecomp.sdc.externalApis.DeploymentValiditaion"/>  
-                       <class name="org.openecomp.sdc.externalApis.GetAssetServlet"/>
-                       <class name="org.openecomp.sdc.externalApis.GetCSARofVF"/>
-                       <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet"/>
-                       <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet"/>
-                       <class name="org.openecomp.sdc.externalApis.SearchFilterCategoryExternalAPI"/>
-                       <class name="org.openecomp.sdc.externalApis.AssetLifeCycle"/>
-                       <class name="org.openecomp.sdc.externalApis.UserAPIs"/>
+                       <class name="VFCMTExternalAPI"/>
+                       <class name="CRUDExternalAPI"/>
+                       <class name="DeploymentValiditaion"/>
+                       <class name="GetAssetServlet"/>
+                       <class name="GetCSARofVF"/>
+                       <class name="GetFilteredAssetServlet"/>
+                       <class name="GetSpecificAssetMetadataServlet"/>
+                       <class name="SearchFilterCategoryExternalAPI"/>
+                       <class name="AssetLifeCycle"/>
+                       <class name="UserAPIs"/>
 
-                       <class name="org.openecomp.sdc.internalApis.annotations.AnnotationsTest"/>
+                       <class name="AnnotationsTest"/>
 
                        
 <!--         <class name="org.openecomp.sdc.ci.tests.execute.product.ChangeServiceInstanceVersionTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+                             <class name="ProductCheckinTest"/>
+                             <class name="ProductCheckoutTest"/>
                              <class name="org.openecomp.sdc.ci.tests.execute.product.ProductComponentInstanceCRUDTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
+                             <class name="ProductCreateWithValidationsTest"/>
                              <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCrudTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
-                             <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>    -->
+                             <class name="ProductGetFollowedTest"/>
+                             <class name="ProductUndoCheckoutTest"/>    -->
                        
                        
                </classes>

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/general.xml b/test-apis-ci/src/main/resources/ci/testSuites/general.xml
index a63f364..9b988d8 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/general.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/general.xml
@@ -3,7 +3,7 @@
 <suite name="General">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest"/>
+      <class name="UuidTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- General -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
index b9374cf..3cf3b98 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/imports.xml
@@ -3,7 +3,7 @@
 <suite name="Imports">
   <test name="Imports">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest"/>
+      <class name="ImportGenericResourceCITest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Imports -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml b/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
index 02da714..9676e8f 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/normatives.xml
@@ -19,7 +19,7 @@
 <suite name="normatives" >
        <test name="InterfaceLifecycleTypes">
                <classes>
-                       <class name="org.openecomp.sdc.ci.tests.execute.globaltypes.InterfaceLifecycleTypesTest"/>
+                       <class name="InterfaceLifecycleTypesTest"/>
                </classes>
        </test>
 </suite> 
\ No newline at end of file

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
index 9fcd043..00f60cb 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/onapApiSanity.xml
@@ -5,7 +5,7 @@
        <parameter name="makeToscaValidation"  value="true"/>
        <test name="ExternalApis"> 
                <classes>
-                       <class name="org.openecomp.sdc.ci.tests.sanity.Onboard"/>
+                       <class name="Onboard"/>
                </classes>
        </test>
 </suite>
\ No newline at end of file

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/pass.xml b/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
index 731d736..02a314f 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/pass.xml
@@ -7,7 +7,7 @@
 
  <classes>
     <class
-            name="org.openecomp.sdc.ci.tests.sanity.Onboard">
+            name="Onboard">
         <methods>
             <include name="passTest" />
         </methods>

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/product.xml b/test-apis-ci/src/main/resources/ci/testSuites/product.xml
index 101b94a..72fb68b 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/product.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/product.xml
@@ -3,10 +3,10 @@
 <suite name="Product">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductLifecycleTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
+      <class name="ProductLifecycleTest"/>
+      <class name="ProductUndoCheckoutTest"/>
+      <class name="ProductCheckinTest"/>
+      <class name="ProductCheckoutTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Product -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
index df9aa9f..f3f7f91 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/productAPIs.xml
@@ -5,11 +5,11 @@
 
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCreateWithValidationsTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest"/>
+      <class name="ProductCheckinTest"/>
+      <class name="ProductCheckoutTest"/>
+      <class name="ProductCreateWithValidationsTest"/>
+      <class name="ProductGetFollowedTest"/>
+      <class name="ProductUndoCheckoutTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Suite -->
\ No newline at end of file

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/property.xml b/test-apis-ci/src/main/resources/ci/testSuites/property.xml
index f94f897..2b90f9b 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/property.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/property.xml
@@ -3,9 +3,9 @@
 <suite name="Property" >
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest"/>
+      <class name="PropertyApisTest"/>
       <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyServletTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest"/>
+      <class name="AdditionalInformationServletTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- Property -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
index 4fd0e43..c9f5558 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/resource.xml
@@ -5,30 +5,30 @@
   <test verbose="2" name="Sanity">
     <classes>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="CatalogDataApiTest"/>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+      <class name="AuthanticationTests">
         <methods>
           <include name="downloadServiceArtifactSuccessWithAutantication"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="DistributionDownloadArtifactTest">
         <methods>
           <include name="downloadResourceArtifactSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
+      <class name="FeProxyTest"/>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+      <class name="UuidTest">
         <methods>
           <include name="testE2EUuidHeaderReturnedAndPreserved"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+      <class name="ImportGenericResourceCITest">
         <methods>
           <include name="importAllTestResources"/>
           <include name="testImportCheckoutAndUpdateUserResource"/>
@@ -36,7 +36,7 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+      <class name="AdditionalInformationServletTest">
         <methods>
           <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
           <include name="updateResourceAdditionalInformationTest"/>
@@ -44,66 +44,66 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+      <class name="PropertyApisTest">
         <methods>
           <include name="testPropertyApis"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+      <class name="GetAllResourceVersions">
         <methods>
           <include name="getResourceAllVersions_version15"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+      <class name="ResourceApiTest">
         <methods>
           <include name="updateResourceMetadataSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+      <class name="UpdateResourceMetadataTest">
         <methods>
           <include name="UpdateDerivedFromSuccess"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+      <class name="GetComponentAuditApiTest">
         <methods>
           <include name="testServiceAuditCertifiedVersion"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser">
+      <class name="ActivateDeActivateDeleteUser">
         <methods>
           <include name="authorizeDeActivatedUser"/>
         </methods>
       </class>
 
       <!-- Product tests start-->
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+      <class name="ProductCheckinTest">
         <methods>
           <include name="checkInProductByCreator"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+      <class name="ProductCheckoutTest">
         <methods>
           <include name="checkOutProductByPmNotInContacts"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+      <class name="ProductGetFollowedTest">
         <methods>
           <include name="followedPageTest"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+      <class name="ProductUndoCheckoutTest">
         <methods>
           <include name="undoCheckOutProductByPm"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+      <class name="InterfaceOperationsTest">
         <methods>
           <include name="addInterfaceOperationsOfGlobalTypeOnResource"/>
           <include name="addInterfaceOperationsOnResource"/>

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
index 320c3cc..5d21455 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/sanity.xml
@@ -4,14 +4,14 @@
 
   <test name="sanityE2Eflows">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.sanity.CrudE2E"/>
+      <class name="CrudE2E"/>
     </classes>
   </test>
 
   <test name="General">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.FeProxyTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.general.UuidTest">
+      <class name="FeProxyTest"/>
+      <class name="UuidTest">
         <methods>
           <include name="testE2EUuidHeaderReturnedAndPreserved"/>
         </methods>
@@ -27,7 +27,7 @@
   <test name="Artifact">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.artifacts.DownloadComponentArt">
+        name="DownloadComponentArt">
         <methods>
           <include name="downloadArtifactFromResourceTest"/>
           <include name="downloadArtifactFromServiceTest"/>
@@ -39,7 +39,7 @@
   <test name="Service">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.service.GetComponentAuditApiTest">
+        name="GetComponentAuditApiTest">
         <methods>
           <include name="testServiceAuditCertifiedVersion"/>
         </methods>
@@ -51,20 +51,20 @@
   <test name="Resource">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.GetAllResourceVersions">
+        name="GetAllResourceVersions">
         <methods>
           <include name="getResourceAllVersions_version15"/>
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.resource.ResourceApiTest">
+      <class name="ResourceApiTest">
         <methods>
           <include name="updateResourceMetadataSuccess"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.resource.UpdateResourceMetadataTest">
+        name="UpdateResourceMetadataTest">
         <methods>
           <include name="UpdateDerivedFromSuccess"/>
         </methods>
@@ -73,24 +73,24 @@
   </test>
   <test name="Product">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckinTest">
+      <class name="ProductCheckinTest">
         <methods>
           <include name="checkInProductByCreator"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.product.ProductCheckoutTest">
+      <class name="ProductCheckoutTest">
         <methods>
           <include name="checkOutProductByPmNotInContacts"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductGetFollowedTest">
+        name="ProductGetFollowedTest">
         <methods>
           <include name="followedPageTest"/>
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.product.ProductUndoCheckoutTest">
+        name="ProductUndoCheckoutTest">
         <methods>
           <include name="undoCheckOutProductByPm"/>
         </methods>
@@ -100,21 +100,21 @@
   </test>
   <test name="Catalog">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest"/>
+      <class name="CatalogDataApiTest"/>
     </classes>
   </test>
 
   <test name="distribution">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.AuthanticationTests">
+        name="AuthanticationTests">
         <methods>
           <include name="downloadServiceArtifactSuccessWithAutantication"/>
         </methods>
       </class>
 
       <class
-        name="org.openecomp.sdc.ci.tests.execute.distribution.DistributionDownloadArtifactTest">
+        name="DistributionDownloadArtifactTest">
         <methods>
           <include name="downloadResourceArtifactSuccess"/>
         </methods>
@@ -130,7 +130,7 @@
   <test name="Imports">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.imports.ImportGenericResourceCITest">
+        name="ImportGenericResourceCITest">
         <methods>
           <include name="importAllTestResources"/>
           <include name="testImportCheckoutAndUpdateUserResource"/>
@@ -138,7 +138,7 @@
         </methods>
       </class>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties">
+        name="ImportToscaCapabilitiesWithProperties">
         <methods>
           <include name="importNodeTypeWithCapabilityWithPropertiesFromYmlSucceed"/>
           <include
@@ -151,7 +151,7 @@
   <test name="attribute">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.attribute.ComponentInstanceAttributeTest">
+        name="ComponentInstanceAttributeTest">
         <methods>
           <include name="testUpdateAttributeOnResourceInstance"/>
         </methods>
@@ -162,7 +162,7 @@
   <test name="inputs">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.inputs.InputsApiTests">
+        name="InputsApiTests">
         <methods>
           <include name="testInputsMainFunctionality"/>
         </methods>
@@ -173,7 +173,7 @@
   <test name="property">
     <classes>
       <class
-        name="org.openecomp.sdc.ci.tests.execute.property.AdditionalInformationServletTest">
+        name="AdditionalInformationServletTest">
         <methods>
           <include name="createResourceAdditionalInformationTestDuringLifecycle"/>
           <include name="updateResourceAdditionalInformationTest"/>
@@ -181,12 +181,12 @@
         </methods>
       </class>
 
-      <class name="org.openecomp.sdc.ci.tests.execute.property.PropertyApisTest">
+      <class name="PropertyApisTest">
         <methods>
           <include name="testPropertyApis"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.ci.tests.execute.property.ComponentInstancePropertyTest">
+      <class name="ComponentInstancePropertyTest">
         <methods>
           <include name="nestedVfResourceProperty3Levels"/>
         </methods>
@@ -203,18 +203,18 @@
 
   <test name="ExternalApis">
     <classes>
-      <class name="org.openecomp.sdc.externalApis.GetAssetServlet">
+      <class name="GetAssetServlet">
         <methods>
           <include name="getResourceAssetSuccess"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetFilteredAssetServlet">
+      <class name="GetFilteredAssetServlet">
         <methods>
           <include name="getResourceAssetBySpecifiedCategoryAndSubCategory"/>
           <include name="getServiceAssetBySpecifiedCategoryAndDistributionStatus"/>
         </methods>
       </class>
-      <class name="org.openecomp.sdc.externalApis.GetSpecificAssetMetadataServlet">
+      <class name="GetSpecificAssetMetadataServlet">
         <methods>
           <include name="getResourceAssetMetadataWithResourceInstancesSuccess"/>
           <include

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/service.xml b/test-apis-ci/src/main/resources/ci/testSuites/service.xml
index 4b2842d..89f4819 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/service.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/service.xml
@@ -4,8 +4,8 @@
   <test name="Service">
     <classes>
       <class name="org.openecomp.sdc.ci.tests.execute.service.ChangeServiceDistributionStatusApiTest"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.service.GetAllServiceVersions"/>
-      <class name="org.openecomp.sdc.ci.tests.execute.interfaceoperation.InterfaceOperationsTest">
+      <class name="GetAllServiceVersions"/>
+      <class name="InterfaceOperationsTest">
         <methods>
           <include name="addInterfaceOperationsOnService"/>
           <include name="getInterfaceOperationsFromService"/>

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
index 7f1cba4..f65ef78 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/testngLifeCycle.xml
@@ -3,7 +3,7 @@
 <suite name="lifeCycle">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+      <class name="LCSbaseTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- lifeCycle -->

diff --git a/test-apis-ci/src/main/resources/ci/testSuites/user.xml b/test-apis-ci/src/main/resources/ci/testSuites/user.xml
index 3ab1f97..b4a5b93 100644 (file)
--- a/test-apis-ci/src/main/resources/ci/testSuites/user.xml
+++ b/test-apis-ci/src/main/resources/ci/testSuites/user.xml
@@ -3,7 +3,7 @@
 <suite name="User">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.user.ActivateDeActivateDeleteUser"/>
+      <class name="ActivateDeActivateDeleteUser"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- User -->

diff --git a/test-apis-ci/testngLifeCycle.xml b/test-apis-ci/testngLifeCycle.xml
index 005bdba..6188116 100644 (file)
--- a/test-apis-ci/testngLifeCycle.xml
+++ b/test-apis-ci/testngLifeCycle.xml
@@ -3,7 +3,7 @@
 <suite name="lifeCycle" parallel="none">
   <test name="Test">
     <classes>
-      <class name="org.openecomp.sdc.ci.tests.execute.lifecycle.LCSbaseTest"/>
+      <class name="LCSbaseTest"/>
     </classes>
   </test> <!-- Test -->
 </suite> <!-- lifeCycle -->