aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md10
-rw-r--r--pom.xml6
-rw-r--r--sdc-distribution-ci/log4j.properties2
-rw-r--r--sdc-distribution-ci/pom.xml12
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/AdvanceCallBack.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/AdvanceCallBack.java)8
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/ArtifactTypeEnum.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/ArtifactTypeEnum.java)2
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/ClientTest.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/ClientTest.java)18
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/CsarToscaTester.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java)242
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/Decoder.java)2
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/NotificationCallback.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/NotificationCallback.java)6
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/SimpleCallback.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java)26
-rw-r--r--sdc-distribution-ci/src/main/java/org/onap/test/SimpleConfiguration.java (renamed from sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleConfiguration.java)4
-rw-r--r--sdc-distribution-ci/src/main/resources/ci/conf/attsdc-packages.yaml18
-rw-r--r--sdc-distribution-ci/src/main/resources/ci/conf/log4j.properties4
-rw-r--r--sdc-distribution-ci/src/main/resources/ci/scripts/startTest.sh2
-rw-r--r--sdc-distribution-ci/src/test/java/org/onap/sdc/ci/tests/execute/downloadArtifactUGN/ClientDownloadArtifact.java (renamed from sdc-distribution-ci/src/test/java/org/openecomp/sdc/ci/tests/execute/downloadArtifactUGN/ClientDownloadArtifact.java)2
-rw-r--r--sdc-distribution-client/pom.xml4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionClient.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionClient.java)14
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionStatusMessageJsonBuilder.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionStatusMessageJsonBuilder.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/RegistrationRequest.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/RegistrationRequest.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/ServerListResponse.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/ServerListResponse.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IComponentDoneStatusMessage.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IComponentDoneStatusMessage.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IConfiguration.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IConfiguration.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessage.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessage.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessageBasic.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessageBasic.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IFinalDistrStatusMessage.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IFinalDistrStatusMessage.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/INotificationCallback.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/INotificationCallback.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IStatusCallback.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IStatusCallback.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IArtifactInfo.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IArtifactInfo.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/INotificationData.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/INotificationData.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IResourceInstance.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IResourceInstance.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IStatusData.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IStatusData.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IVfModuleMetadata.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IVfModuleMetadata.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientDownloadResult.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientDownloadResult.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientResult.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientResult.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/http/AsdcUrls.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/http/AsdcUrls.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcClient.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcClient.java)6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcResponse.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcResponse.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/http/IHttpAsdcClient.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/http/IHttpAsdcClient.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/http/SdcConnectorClient.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/http/SdcConnectorClient.java)24
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/http/TopicRegistrationResponse.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/http/TopicRegistrationResponse.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/ArtifactInfoImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/ArtifactInfoImpl.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/Configuration.java)9
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientDownloadResultImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientDownloadResultImpl.java)10
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientFactory.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientFactory.java)6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java)29
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientResultImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientResultImpl.java)6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageImpl.java)10
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java)12
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/JsonContainerResourceInstance.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/JsonContainerResourceInstance.java)8
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationConsumer.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationConsumer.java)16
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationDataImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationDataImpl.java)8
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusConsumer.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusConsumer.java)6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusDataImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusDataImpl.java)8
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/VfModuleMetadata.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/VfModuleMetadata.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientResultStubImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientResultStubImpl.java)6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientStubImpl.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientStubImpl.java)18
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/ArtifactTypeEnum.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/ArtifactTypeEnum.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionActionResultEnum.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionClientConstants.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionClientConstants.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionStatusEnum.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/GeneralUtils.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java)6
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/Pair.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Pair.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/Wrapper.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Wrapper.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/YamlToObjectConverter.java)4
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatConfiguration.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatConfiguration.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameter.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameter.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameterConstraint.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameterConstraint.java)2
-rw-r--r--sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParser.java (renamed from sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParser.java)4
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/http/SdcConnectorClientTest.java)10
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientDownloadResultTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientDownloadResultTest.java)110
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientTest.java)32
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/impl/HeatParserTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/HeatParserTest.java)8
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/NotificationConsumerTest.java)18
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/utils/ArtifactsUtils.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/ArtifactsUtils.java)6
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestConfiguration.java)4
-rw-r--r--sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestNotificationCallback.java (renamed from sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestNotificationCallback.java)6
-rw-r--r--version.properties4
79 files changed, 429 insertions, 431 deletions
diff --git a/README.md b/README.md
index 38c70ec..5f32672 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,13 @@ activateServerTLSAuth : Sets whether ASDC server TLS authentication is activated
Example of configuration file implementing IConfiguration interface:
--------------------------------------------------------------------
-package org.openecomp.conf;
+package org.onap.conf;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.asdc.api.consumer.IConfiguration;
-import org.openecomp.asdc.utils.ArtifactTypeEnum;
+import org.onap.asdc.api.consumer.IConfiguration;
+import org.onap.asdc.utils.ArtifactTypeEnum;
public class SimpleConfiguration implements IConfiguration{
int randomSeed;
@@ -116,7 +116,7 @@ Loggin can be done using log4j
Example of log.properties file:
-------------------------------
log4j.rootCategory=DEBUG, CONSOLE, LOGFILE
-log4j.logger.org.openecomp=TRACE, CONSOLE, LOGFILE
+log4j.logger.org.onap=TRACE, CONSOLE, LOGFILE
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
@@ -137,7 +137,7 @@ log4j.appender.LOGFILE.MaxBackupIndex=10
*** to be completed on release ***
-SDC@lists.openecomp.org
+SDC@lists.onap.org
SDC Javadoc and Maven site
diff --git a/pom.xml b/pom.xml
index a9390d4..2996647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+ <groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-main-distribution-client</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdc-sdc-distribution-client</name>
@@ -40,7 +40,7 @@
<!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>-->
<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
- <sitePath>/content/sites/site/org/openecomp/sdc/sdc-distribution-client/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org/onap/sdc/sdc-distribution-client/${project.version}</sitePath>
<snapshots.path>snapshots</snapshots.path>
<releases.path>releases</releases.path>
<staging.profile.id>176c31dfe190a</staging.profile.id>
diff --git a/sdc-distribution-ci/log4j.properties b/sdc-distribution-ci/log4j.properties
index 80b2ca8..f71e8ce 100644
--- a/sdc-distribution-ci/log4j.properties
+++ b/sdc-distribution-ci/log4j.properties
@@ -1,6 +1,6 @@
log4j.rootCategory=DEBUG, CONSOLE, LOGFILE
-log4j.logger.org.openecomp.sdc=TRACE, CONSOLE, LOGFILE
+log4j.logger.org.onap.sdc=TRACE, CONSOLE, LOGFILE
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
diff --git a/sdc-distribution-ci/pom.xml b/sdc-distribution-ci/pom.xml
index 326bdb9..1914d07 100644
--- a/sdc-distribution-ci/pom.xml
+++ b/sdc-distribution-ci/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+ <groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-main-distribution-client</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>sdc-distribution-ci</artifactId>
@@ -23,16 +23,16 @@
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+ <groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.sdc-tosca</groupId>
+ <groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>1.1.55-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -87,7 +87,7 @@
<configuration>
<classifier>spring-boot</classifier>
<mainClass>
- org.openecomp.test.ClientTest
+ org.onap.test.ClientTest
</mainClass>
</configuration>
</execution>
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/AdvanceCallBack.java b/sdc-distribution-ci/src/main/java/org/onap/test/AdvanceCallBack.java
index faabaeb..a122ca0 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/AdvanceCallBack.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/AdvanceCallBack.java
@@ -18,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
/**
*
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/ArtifactTypeEnum.java b/sdc-distribution-ci/src/main/java/org/onap/test/ArtifactTypeEnum.java
index 5c4c9e2..1f5e799 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/ArtifactTypeEnum.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/ArtifactTypeEnum.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import java.util.ArrayList;
import java.util.List;
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/ClientTest.java b/sdc-distribution-ci/src/main/java/org/onap/test/ClientTest.java
index 872240b..24160b5 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/ClientTest.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/ClientTest.java
@@ -18,16 +18,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.IComponentDoneStatusMessage;
-import org.openecomp.sdc.api.consumer.IStatusCallback;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IStatusData;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientFactory;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
+import org.onap.sdc.api.consumer.IStatusCallback;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IStatusData;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientFactory;
+import org.onap.sdc.utils.DistributionStatusEnum;
public class ClientTest {
public static void main(String[] args) throws Exception {
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java b/sdc-distribution-ci/src/main/java/org/onap/test/CsarToscaTester.java
index 98072fa..1102150 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/CsarToscaTester.java
@@ -1,121 +1,121 @@
-package org.openecomp.test;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
-import org.openecomp.sdc.toscaparser.api.utils.ThreadLocalsHolder;
-
-public class CsarToscaTester {
- public static void main(String[] args) throws Exception {
- System.out.println("CsarToscaParser - path to CSAR's Directory is " + Arrays.toString(args));
- SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
-
- File folder = new File(args[0]);
- File[] listOfFiles = folder.listFiles();
- Date now = new Date();
- SimpleDateFormat dateFormat = new SimpleDateFormat("d-MM-y-HH_mm_ss");
- String time = dateFormat.format(now);
- String csarsDir = args[1] + "/csar-reports-" + time;
- File dir = new File(csarsDir);
- dir.mkdir();
-
-
- for (File file : listOfFiles) {
- if (file.isFile()) {
- System.out.println("File " + file.getAbsolutePath());
- String name = file.getName();
- String currentCsarDir = csarsDir+"/"+name+"-"+time;
- dir = new File(currentCsarDir);
- dir.mkdir();
- try {
- processCsar(factory, file);
- } catch (SdcToscaParserException e){
- System.out.println("SdcToscaParserException caught. Code: "+e.getCode()+", message: "+ e.getMessage());
- }
- List<String> validationIssueReport = ThreadLocalsHolder.getCollector().getValidationIssueReport();
- System.out.println("Validation issues during CSAR parsing are: " + (validationIssueReport != null ? validationIssueReport.toString() : "none"));
-
- try {
- generateReport(time, name, currentCsarDir, validationIssueReport, "validationIssues");
-
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- }
- }
-
- private static void processCsar(SdcToscaParserFactory factory, File file) throws SdcToscaParserException {
- ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(file.getAbsolutePath());
- //Service level
- System.out.println("Invoking sdc-tosca methods on this CSAR....");
- String conformanceLevel = sdcCsarHelper.getConformanceLevel();
- System.out.println("getConformanceLevel() - conformance level is "+conformanceLevel);
- String serviceSubstitutionMappingsTypeName = sdcCsarHelper.getServiceSubstitutionMappingsTypeName();
- System.out.println("serviceSubstitutionMappingsTypeName() - subst mappings type of service is "+serviceSubstitutionMappingsTypeName);
- List<Input> serviceInputs = sdcCsarHelper.getServiceInputs();
- System.out.println("getServiceInputs() - service inputs are "+serviceInputs);
- Metadata serviceMetadata = sdcCsarHelper.getServiceMetadata();
- System.out.println("getServiceMetadata() - service metadata is "+serviceMetadata);
- Map<String, Object> serviceMetadataProperties = sdcCsarHelper.getServiceMetadataProperties();
- System.out.println("getServiceMetadataProperties() - service metadata properties is "+serviceMetadataProperties);
- List<NodeTemplate> allottedResources = sdcCsarHelper.getAllottedResources();
- System.out.println("getAllottedResources() - service allotted resources are "+allottedResources);
- List<NodeTemplate> serviceVfList = sdcCsarHelper.getServiceVfList();
- System.out.println("getServiceVfList() - VF list is "+serviceVfList);
- List<NodeTemplate> serviceNodeTemplateBySdcType = sdcCsarHelper.getServiceNodeTemplateBySdcType(SdcTypes.VF);
- System.out.println("getServiceNodeTemplateBySdcType() - VF list is "+serviceNodeTemplateBySdcType);
- List<NodeTemplate> serviceNodeTemplates = sdcCsarHelper.getServiceNodeTemplates();
- System.out.println("getServiceNodeTemplates() - all node templates list of service is "+serviceNodeTemplates);
-
- serviceVfList.forEach(x -> {
- String nodeTemplateCustomizationUuid = sdcCsarHelper.getNodeTemplateCustomizationUuid(x);
- System.out.println("getNodeTemplateCustomizationUuid() - VF ID is "+nodeTemplateCustomizationUuid);
- String typeOfNodeTemplate = sdcCsarHelper.getTypeOfNodeTemplate(x);
- System.out.println("getTypeOfNodeTemplate() - VF tosca type is "+typeOfNodeTemplate);
- List<Group> vfModulesByVf = sdcCsarHelper.getVfModulesByVf(nodeTemplateCustomizationUuid);
- System.out.println("getVfModulesByVf() - VF modules list is "+vfModulesByVf);
- vfModulesByVf.forEach(y -> {
- List<NodeTemplate> membersOfVfModule = sdcCsarHelper.getMembersOfVfModule(x, y);
- System.out.println("getMembersOfVfModule() - members of VfModule are "+membersOfVfModule);
- });
- List<NodeTemplate> vfcListByVf = sdcCsarHelper.getVfcListByVf(nodeTemplateCustomizationUuid);
- System.out.println("getVfcListByVf() - VFC list is "+vfcListByVf);
- vfcListByVf.forEach(z -> {
- List<NodeTemplate> nodeTemplateBySdcType = sdcCsarHelper.getNodeTemplateBySdcType(z, SdcTypes.CP);
- System.out.println("getNodeTemplateBySdcType() - CP children node templates of this VFC are "+nodeTemplateBySdcType);
- Map<String, Map<String, Object>> cpPropertiesFromVfcAsObject = sdcCsarHelper.getCpPropertiesFromVfcAsObject(z);
- System.out.println("getCpPropertiesFromVfcAsObject() - consolidated CP properties for this VFC are "+cpPropertiesFromVfcAsObject);
- boolean hasTopology = sdcCsarHelper.hasTopology(z);
- System.out.println("hasTopology() - this VFC is "+(hasTopology ? "nested" : "not nested"));
- });
- });
-
- }
-
- private static void generateReport(String time, String name, String currentCsarDir, List<String> criticalsReport, String type)
- throws IOException {
- FileWriter fw;
- fw = new FileWriter(new File(currentCsarDir + "/" + criticalsReport.size() + "-"+type+"-" + name +"-"+time + ".txt"));
- for (String exception : criticalsReport) {
- fw.write(exception);
- fw.write("\r\n");
- }
- fw.close();
- }
-}
+package org.onap.test;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.toscaparser.api.parameters.Input;
+import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder;
+
+public class CsarToscaTester {
+ public static void main(String[] args) throws Exception {
+ System.out.println("CsarToscaParser - path to CSAR's Directory is " + Arrays.toString(args));
+ SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
+
+ File folder = new File(args[0]);
+ File[] listOfFiles = folder.listFiles();
+ Date now = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("d-MM-y-HH_mm_ss");
+ String time = dateFormat.format(now);
+ String csarsDir = args[1] + "/csar-reports-" + time;
+ File dir = new File(csarsDir);
+ dir.mkdir();
+
+
+ for (File file : listOfFiles) {
+ if (file.isFile()) {
+ System.out.println("File " + file.getAbsolutePath());
+ String name = file.getName();
+ String currentCsarDir = csarsDir+"/"+name+"-"+time;
+ dir = new File(currentCsarDir);
+ dir.mkdir();
+ try {
+ processCsar(factory, file);
+ } catch (SdcToscaParserException e){
+ System.out.println("SdcToscaParserException caught. Code: "+e.getCode()+", message: "+ e.getMessage());
+ }
+ List<String> validationIssueReport = ThreadLocalsHolder.getCollector().getValidationIssueReport();
+ System.out.println("Validation issues during CSAR parsing are: " + (validationIssueReport != null ? validationIssueReport.toString() : "none"));
+
+ try {
+ generateReport(time, name, currentCsarDir, validationIssueReport, "validationIssues");
+
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ }
+ }
+
+ private static void processCsar(SdcToscaParserFactory factory, File file) throws SdcToscaParserException {
+ ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(file.getAbsolutePath());
+ //Service level
+ System.out.println("Invoking sdc-tosca methods on this CSAR....");
+ String conformanceLevel = sdcCsarHelper.getConformanceLevel();
+ System.out.println("getConformanceLevel() - conformance level is "+conformanceLevel);
+ String serviceSubstitutionMappingsTypeName = sdcCsarHelper.getServiceSubstitutionMappingsTypeName();
+ System.out.println("serviceSubstitutionMappingsTypeName() - subst mappings type of service is "+serviceSubstitutionMappingsTypeName);
+ List<Input> serviceInputs = sdcCsarHelper.getServiceInputs();
+ System.out.println("getServiceInputs() - service inputs are "+serviceInputs);
+ Metadata serviceMetadata = sdcCsarHelper.getServiceMetadata();
+ System.out.println("getServiceMetadata() - service metadata is "+serviceMetadata);
+ Map<String, Object> serviceMetadataProperties = sdcCsarHelper.getServiceMetadataProperties();
+ System.out.println("getServiceMetadataProperties() - service metadata properties is "+serviceMetadataProperties);
+ List<NodeTemplate> allottedResources = sdcCsarHelper.getAllottedResources();
+ System.out.println("getAllottedResources() - service allotted resources are "+allottedResources);
+ List<NodeTemplate> serviceVfList = sdcCsarHelper.getServiceVfList();
+ System.out.println("getServiceVfList() - VF list is "+serviceVfList);
+ List<NodeTemplate> serviceNodeTemplateBySdcType = sdcCsarHelper.getServiceNodeTemplateBySdcType(SdcTypes.VF);
+ System.out.println("getServiceNodeTemplateBySdcType() - VF list is "+serviceNodeTemplateBySdcType);
+ List<NodeTemplate> serviceNodeTemplates = sdcCsarHelper.getServiceNodeTemplates();
+ System.out.println("getServiceNodeTemplates() - all node templates list of service is "+serviceNodeTemplates);
+
+ serviceVfList.forEach(x -> {
+ String nodeTemplateCustomizationUuid = sdcCsarHelper.getNodeTemplateCustomizationUuid(x);
+ System.out.println("getNodeTemplateCustomizationUuid() - VF ID is "+nodeTemplateCustomizationUuid);
+ String typeOfNodeTemplate = sdcCsarHelper.getTypeOfNodeTemplate(x);
+ System.out.println("getTypeOfNodeTemplate() - VF tosca type is "+typeOfNodeTemplate);
+ List<Group> vfModulesByVf = sdcCsarHelper.getVfModulesByVf(nodeTemplateCustomizationUuid);
+ System.out.println("getVfModulesByVf() - VF modules list is "+vfModulesByVf);
+ vfModulesByVf.forEach(y -> {
+ List<NodeTemplate> membersOfVfModule = sdcCsarHelper.getMembersOfVfModule(x, y);
+ System.out.println("getMembersOfVfModule() - members of VfModule are "+membersOfVfModule);
+ });
+ List<NodeTemplate> vfcListByVf = sdcCsarHelper.getVfcListByVf(nodeTemplateCustomizationUuid);
+ System.out.println("getVfcListByVf() - VFC list is "+vfcListByVf);
+ vfcListByVf.forEach(z -> {
+ List<NodeTemplate> nodeTemplateBySdcType = sdcCsarHelper.getNodeTemplateBySdcType(z, SdcTypes.CP);
+ System.out.println("getNodeTemplateBySdcType() - CP children node templates of this VFC are "+nodeTemplateBySdcType);
+ Map<String, Map<String, Object>> cpPropertiesFromVfcAsObject = sdcCsarHelper.getCpPropertiesFromVfcAsObject(z);
+ System.out.println("getCpPropertiesFromVfcAsObject() - consolidated CP properties for this VFC are "+cpPropertiesFromVfcAsObject);
+ boolean hasTopology = sdcCsarHelper.hasTopology(z);
+ System.out.println("hasTopology() - this VFC is "+(hasTopology ? "nested" : "not nested"));
+ });
+ });
+
+ }
+
+ private static void generateReport(String time, String name, String currentCsarDir, List<String> criticalsReport, String type)
+ throws IOException {
+ FileWriter fw;
+ fw = new FileWriter(new File(currentCsarDir + "/" + criticalsReport.size() + "-"+type+"-" + name +"-"+time + ".txt"));
+ for (String exception : criticalsReport) {
+ fw.write(exception);
+ fw.write("\r\n");
+ }
+ fw.close();
+ }
+}
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/Decoder.java b/sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java
index 434952b..384d26d 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/Decoder.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/Decoder.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import java.io.BufferedReader;
import java.io.FileReader;
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/NotificationCallback.java b/sdc-distribution-ci/src/main/java/org/onap/test/NotificationCallback.java
index 3b2d772..48fda0a 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/NotificationCallback.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/NotificationCallback.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.notification.INotificationData;
public class NotificationCallback extends SimpleCallback{
INotificationData latestCallbackData;
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java b/sdc-distribution-ci/src/main/java/org/onap/test/SimpleCallback.java
index 0c03bb0..547dde2 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleCallback.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/SimpleCallback.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import static org.junit.Assert.assertEquals;
@@ -31,18 +31,18 @@ import java.util.stream.Collectors;
import org.json.JSONArray;
import org.json.JSONObject;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.ArtifactTypeEnum;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
/**
*
diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleConfiguration.java b/sdc-distribution-ci/src/main/java/org/onap/test/SimpleConfiguration.java
index 417f564..d22bcf2 100644
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/SimpleConfiguration.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/SimpleConfiguration.java
@@ -18,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.openecomp.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.consumer.IConfiguration;
public class SimpleConfiguration implements IConfiguration{
diff --git a/sdc-distribution-ci/src/main/resources/ci/conf/attsdc-packages.yaml b/sdc-distribution-ci/src/main/resources/ci/conf/attsdc-packages.yaml
index 34a78d9..65a38fa 100644
--- a/sdc-distribution-ci/src/main/resources/ci/conf/attsdc-packages.yaml
+++ b/sdc-distribution-ci/src/main/resources/ci/conf/attsdc-packages.yaml
@@ -1,10 +1,10 @@
packages:
- - org.openecomp.sdc.ci.tests.execute.general
- - org.openecomp.sdc.ci.tests.execute.user
- - org.openecomp.sdc.ci.tests.execute.property
- - org.openecomp.sdc.ci.tests.execute.lifecycle
- - org.openecomp.sdc.ci.tests.execute.resource
- - org.openecomp.sdc.ci.tests.execute.service
- - org.openecomp.sdc.ci.tests.execute.artifacts
- - org.openecomp.sdc.ci.tests.execute.imports
- - org.openecomp.sdc.ci.tests.execute.category \ No newline at end of file
+ - org.onap.sdc.ci.tests.execute.general
+ - org.onap.sdc.ci.tests.execute.user
+ - org.onap.sdc.ci.tests.execute.property
+ - org.onap.sdc.ci.tests.execute.lifecycle
+ - org.onap.sdc.ci.tests.execute.resource
+ - org.onap.sdc.ci.tests.execute.service
+ - org.onap.sdc.ci.tests.execute.artifacts
+ - org.onap.sdc.ci.tests.execute.imports
+ - org.onap.sdc.ci.tests.execute.category \ No newline at end of file
diff --git a/sdc-distribution-ci/src/main/resources/ci/conf/log4j.properties b/sdc-distribution-ci/src/main/resources/ci/conf/log4j.properties
index 3e159ec..bef72a9 100644
--- a/sdc-distribution-ci/src/main/resources/ci/conf/log4j.properties
+++ b/sdc-distribution-ci/src/main/resources/ci/conf/log4j.properties
@@ -28,7 +28,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:
log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG
log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout
-log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout
-log4j.additivity.org.openecomp.sdc.ci.tests.utils=false
+log4j.logger.org.onap.sdc.ci.tests.utils=TRACE, FILE, stdout
+log4j.additivity.org.onap.sdc.ci.tests.utils=false
diff --git a/sdc-distribution-ci/src/main/resources/ci/scripts/startTest.sh b/sdc-distribution-ci/src/main/resources/ci/scripts/startTest.sh
index 604903a..7fa5323 100644
--- a/sdc-distribution-ci/src/main/resources/ci/scripts/startTest.sh
+++ b/sdc-distribution-ci/src/main/resources/ci/scripts/startTest.sh
@@ -33,7 +33,7 @@ LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties
TARGET_DIR=${FULL_PATH}/target
CONF_FILE=${FULL_PATH}/conf/attsdc.yaml
DEBUG=true
-MainClass=org.openecomp.sdc.ci.tests.run.StartTest
+MainClass=org.onap.sdc.ci.tests.run.StartTest
JAR_FILE=$1
diff --git a/sdc-distribution-ci/src/test/java/org/openecomp/sdc/ci/tests/execute/downloadArtifactUGN/ClientDownloadArtifact.java b/sdc-distribution-ci/src/test/java/org/onap/sdc/ci/tests/execute/downloadArtifactUGN/ClientDownloadArtifact.java
index e52223d..22b1607 100644
--- a/sdc-distribution-ci/src/test/java/org/openecomp/sdc/ci/tests/execute/downloadArtifactUGN/ClientDownloadArtifact.java
+++ b/sdc-distribution-ci/src/test/java/org/onap/sdc/ci/tests/execute/downloadArtifactUGN/ClientDownloadArtifact.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.ci.tests.execute.downloadArtifactUGN;
+package org.onap.sdc.ci.tests.execute.downloadArtifactUGN;
import org.junit.Test;
diff --git a/sdc-distribution-client/pom.xml b/sdc-distribution-client/pom.xml
index d39e24f..4833175 100644
--- a/sdc-distribution-client/pom.xml
+++ b/sdc-distribution-client/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+ <groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-main-distribution-client</artifactId>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>sdc-distribution-client</artifactId>
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionClient.java
index 8caf109..d3a8188 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionClient.java
@@ -18,16 +18,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api;
+package org.onap.sdc.api;
import java.util.List;
-import org.openecomp.sdc.api.consumer.*;
-import org.openecomp.sdc.api.consumer.IStatusCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
public interface IDistributionClient {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionStatusMessageJsonBuilder.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionStatusMessageJsonBuilder.java
index 7c28271..6db00fa 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/IDistributionStatusMessageJsonBuilder.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/IDistributionStatusMessageJsonBuilder.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api;
+package org.onap.sdc.api;
public interface IDistributionStatusMessageJsonBuilder {
String build();
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/RegistrationRequest.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/RegistrationRequest.java
index 1e398be..6e64396 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/RegistrationRequest.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/RegistrationRequest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.asdc;
+package org.onap.sdc.api.asdc;
import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/ServerListResponse.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/ServerListResponse.java
index c131a95..8d3b823 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/asdc/ServerListResponse.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/asdc/ServerListResponse.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.asdc;
+package org.onap.sdc.api.asdc;
import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IComponentDoneStatusMessage.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IComponentDoneStatusMessage.java
index 25661bf..e9b4359 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IComponentDoneStatusMessage.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IComponentDoneStatusMessage.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
public interface IComponentDoneStatusMessage extends IDistributionStatusMessageBasic {
String getComponentName();
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IConfiguration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IConfiguration.java
index 51d219f..c5a1857 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IConfiguration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IConfiguration.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
import java.util.List;
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.INotificationData;
public interface IConfiguration {
/**
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessage.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessage.java
index ab3d6a7..fd73bac 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessage.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessage.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
public interface IDistributionStatusMessage extends IDistributionStatusMessageBasic{
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessageBasic.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessageBasic.java
index fb1194d..59dcc57 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IDistributionStatusMessageBasic.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IDistributionStatusMessageBasic.java
@@ -1,6 +1,6 @@
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
public interface IDistributionStatusMessageBasic {
/**
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IFinalDistrStatusMessage.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IFinalDistrStatusMessage.java
index 42affd7..0869a67 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IFinalDistrStatusMessage.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IFinalDistrStatusMessage.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/INotificationCallback.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/INotificationCallback.java
index 60666ed..5121407 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/INotificationCallback.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/INotificationCallback.java
@@ -18,9 +18,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.INotificationData;
/**When a relevant notification will be found activateCallback method will be activated with the notification data.<br>
* Please implement it according to your desired callback logic.*/
public interface INotificationCallback {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IStatusCallback.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IStatusCallback.java
index a889f52..5bcc4a2 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/consumer/IStatusCallback.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/consumer/IStatusCallback.java
@@ -18,9 +18,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
-import org.openecomp.sdc.api.notification.IStatusData;
+import org.onap.sdc.api.notification.IStatusData;
/**
* When a relevant status will be found activateCallback method will be
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IArtifactInfo.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IArtifactInfo.java
index f720e35..8c34185 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IArtifactInfo.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IArtifactInfo.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/INotificationData.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/INotificationData.java
index 74ebf65..ecc4a5b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/INotificationData.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/INotificationData.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IResourceInstance.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IResourceInstance.java
index a2f7828..0cc3ca4 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IResourceInstance.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IResourceInstance.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IStatusData.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IStatusData.java
index 7a46686..734c200 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IStatusData.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IStatusData.java
@@ -18,9 +18,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
public interface IStatusData {
/**
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IVfModuleMetadata.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IVfModuleMetadata.java
index a769d71..3613c94 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/notification/IVfModuleMetadata.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/notification/IVfModuleMetadata.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
/**VF Module in the resource (VF) context*/
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientDownloadResult.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientDownloadResult.java
index 6030b9e..47fe023 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientDownloadResult.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientDownloadResult.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.results;
+package org.onap.sdc.api.results;
/**Distribution Client Result For Download API*/
public interface IDistributionClientDownloadResult extends IDistributionClientResult{
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientResult.java b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientResult.java
index b4086ac..4f33555 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/api/results/IDistributionClientResult.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/api/results/IDistributionClientResult.java
@@ -18,9 +18,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.results;
+package org.onap.sdc.api.results;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionActionResultEnum;
/**General Distribution Client Result*/
public interface IDistributionClientResult {
DistributionActionResultEnum getDistributionActionResult();
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/AsdcUrls.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/AsdcUrls.java
index 320cade..72a51d3 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/AsdcUrls.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/AsdcUrls.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
public class AsdcUrls {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcClient.java
index c3a486a..c241bec 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcClient.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.io.FileInputStream;
import java.io.IOException;
@@ -59,8 +59,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.message.BasicHeader;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.TrustStrategy;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.utils.Pair;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.utils.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcResponse.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcResponse.java
index 9e48d5e..9734a32 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/HttpAsdcResponse.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/HttpAsdcResponse.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.util.Map;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/IHttpAsdcClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/IHttpAsdcClient.java
index aa62bac..a3cc5e5 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/IHttpAsdcClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/IHttpAsdcClient.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.util.Map;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/SdcConnectorClient.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/SdcConnectorClient.java
index 2ae78af..41d78ba 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/SdcConnectorClient.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/SdcConnectorClient.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.io.IOException;
import java.io.InputStream;
@@ -36,17 +36,17 @@ import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
-import org.openecomp.sdc.api.asdc.RegistrationRequest;
-import org.openecomp.sdc.api.asdc.ServerListResponse;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientDownloadResultImpl;
-import org.openecomp.sdc.impl.DistributionClientResultImpl;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
-import org.openecomp.sdc.utils.GeneralUtils;
-import org.openecomp.sdc.utils.Pair;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientResultImpl;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.GeneralUtils;
+import org.onap.sdc.api.asdc.RegistrationRequest;
+import org.onap.sdc.api.asdc.ServerListResponse;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.impl.DistributionClientDownloadResultImpl;
+import org.onap.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.utils.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/TopicRegistrationResponse.java b/sdc-distribution-client/src/main/java/org/onap/sdc/http/TopicRegistrationResponse.java
index 280d7da..e8d0545 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/http/TopicRegistrationResponse.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/http/TopicRegistrationResponse.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
public class TopicRegistrationResponse {
String distrNotificationTopicName;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/ArtifactInfoImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/ArtifactInfoImpl.java
index 64ff9a8..6a3da83 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/ArtifactInfoImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/ArtifactInfoImpl.java
@@ -18,12 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
class ArtifactInfoImpl implements IArtifactInfo {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/Configuration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
index 851a198..a33f911 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/Configuration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/Configuration.java
@@ -18,15 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.util.List;
-import fj.data.Either;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.api.consumer.IConfiguration;
public class Configuration implements IConfiguration {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientDownloadResultImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientDownloadResultImpl.java
index 0fa918a..6323113 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientDownloadResultImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientDownloadResultImpl.java
@@ -18,18 +18,18 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
-public class DistributionClientDownloadResultImpl extends DistributionClientResultImpl implements IDistributionClientDownloadResult{
+public class DistributionClientDownloadResultImpl extends DistributionClientResultImpl implements IDistributionClientDownloadResult {
byte[] artifactPayload;
String artifactName;
public DistributionClientDownloadResultImpl(
- DistributionActionResultEnum responseStatus, String responseMessage) {
+ DistributionActionResultEnum responseStatus, String responseMessage) {
super(responseStatus, responseMessage);
}
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientFactory.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientFactory.java
index 467f9cb..96aabc2 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientFactory.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientFactory.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.impl.mock.DistributionClientStubImpl;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.impl.mock.DistributionClientStubImpl;
public class DistributionClientFactory {
public static IDistributionClient createDistributionClient(){
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientImpl.java
index a8778e5..5d15046 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientImpl.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static java.util.Objects.isNull;
@@ -36,19 +36,20 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.IDistributionStatusMessageJsonBuilder;
-import org.openecomp.sdc.api.consumer.*;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.http.SdcConnectorClient;
-import org.openecomp.sdc.http.TopicRegistrationResponse;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
-import org.openecomp.sdc.utils.GeneralUtils;
-import org.openecomp.sdc.utils.Wrapper;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.IDistributionStatusMessageJsonBuilder;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.http.SdcConnectorClient;
+import org.onap.sdc.http.TopicRegistrationResponse;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionClientConstants;
+import org.onap.sdc.utils.GeneralUtils;
+import org.onap.sdc.utils.Wrapper;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientResultImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientResultImpl.java
index a5af31a..0df0b7b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientResultImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionClientResultImpl.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
public class DistributionClientResultImpl implements IDistributionClientResult {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageImpl.java
index d9ed654..d5bc4ce 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageImpl.java
@@ -18,12 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.consumer.IComponentDoneStatusMessage;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.IFinalDistrStatusMessage;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.utils.DistributionStatusEnum;
class DistributionStatusMessageImpl implements IDistributionStatusMessage {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java
index e2f9f89..d8c722d 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/DistributionStatusMessageJsonBuilderFactory.java
@@ -18,13 +18,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.IDistributionStatusMessageJsonBuilder;
-import org.openecomp.sdc.api.consumer.IComponentDoneStatusMessage;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.IFinalDistrStatusMessage;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.IDistributionStatusMessageJsonBuilder;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.utils.DistributionStatusEnum;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/JsonContainerResourceInstance.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/JsonContainerResourceInstance.java
index 0000806..92dad7b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/JsonContainerResourceInstance.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/JsonContainerResourceInstance.java
@@ -18,15 +18,15 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
-class JsonContainerResourceInstance implements IResourceInstance{
+class JsonContainerResourceInstance implements IResourceInstance {
JsonContainerResourceInstance (){}
private String resourceInstanceName;
private String resourceCustomizationUUID;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationConsumer.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationConsumer.java
index ccfc6ca..aab1e29 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationConsumer.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationConsumer.java
@@ -18,18 +18,18 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.utils.ArtifactTypeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationDataImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationDataImpl.java
index c60e2fd..7b7b532 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/NotificationDataImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/NotificationDataImpl.java
@@ -18,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
class NotificationDataImpl implements INotificationData {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusConsumer.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusConsumer.java
index 34d85ec..49ba428 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusConsumer.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusConsumer.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.consumer.IStatusCallback;
-import org.openecomp.sdc.api.notification.IStatusData;
+import org.onap.sdc.api.consumer.IStatusCallback;
+import org.onap.sdc.api.notification.IStatusData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusDataImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusDataImpl.java
index 119a7f3..70513fe 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/StatusDataImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/StatusDataImpl.java
@@ -18,12 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
-import org.openecomp.sdc.api.notification.IStatusData;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.onap.sdc.api.notification.IStatusData;
+import org.onap.sdc.utils.DistributionStatusEnum;
-public class StatusDataImpl implements IStatusData{
+public class StatusDataImpl implements IStatusData {
String distributionID;
String consumerID;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/VfModuleMetadata.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/VfModuleMetadata.java
index 3932253..fb745f3 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/VfModuleMetadata.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/VfModuleMetadata.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import java.util.List;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
final class VfModuleMetadata implements IVfModuleMetadata {
private VfModuleMetadata(){
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java
index aff0d0e..e0cd56e 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientDownloadResultStubImpl.java
@@ -18,9 +18,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl.mock;
+package org.onap.sdc.impl.mock;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
/** Mock Implementation */
public class DistributionClientDownloadResultStubImpl extends DistributionClientResultStubImpl implements IDistributionClientDownloadResult {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientResultStubImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientResultStubImpl.java
index 13d64a4..cf0466b 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientResultStubImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientResultStubImpl.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl.mock;
+package org.onap.sdc.impl.mock;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
/** Mock Implementation */
public class DistributionClientResultStubImpl implements IDistributionClientResult {
@Override
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientStubImpl.java b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientStubImpl.java
index 1730290..9049215 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/mock/DistributionClientStubImpl.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/impl/mock/DistributionClientStubImpl.java
@@ -18,18 +18,20 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl.mock;
+package org.onap.sdc.impl.mock;
import java.util.List;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.*;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.*;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.api.consumer.*;
+
/** Mock Implementation */
-public class DistributionClientStubImpl implements IDistributionClient{
+public class DistributionClientStubImpl implements IDistributionClient {
public IDistributionClientResult updateConfiguration(IConfiguration newConf) {
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/ArtifactTypeEnum.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/ArtifactTypeEnum.java
index ca5339f..8df257e 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/ArtifactTypeEnum.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/ArtifactTypeEnum.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public enum ArtifactTypeEnum {
HEAT,
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionActionResultEnum.java
index 6ac4d35..fe871f8 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionActionResultEnum.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public enum DistributionActionResultEnum {
SUCCESS,
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionClientConstants.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionClientConstants.java
index 37b8ae3..1dcbca3 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionClientConstants.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionClientConstants.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.util.regex.Pattern;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionStatusEnum.java
index 13fcfcc..e620195 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/DistributionStatusEnum.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public enum DistributionStatusEnum {
/**Can be sent when ONAP component successfully downloaded the specific artifact*/
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/GeneralUtils.java
index 0f76574..a69e479 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/GeneralUtils.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.commons.codec.binary.Base64;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientResultImpl;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientResultImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Pair.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Pair.java
index eca644a..097cafb 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Pair.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Pair.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public final class Pair<F, S> {
private final F first;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Wrapper.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Wrapper.java
index 047ea86..d1d799c 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/Wrapper.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/Wrapper.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
/**
* Very Basic Wrapper class.
* @author mshitrit
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/YamlToObjectConverter.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
index 50feb6c..9c294d2 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/YamlToObjectConverter.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/YamlToObjectConverter.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.beans.IntrospectionException;
import java.io.File;
@@ -28,7 +28,7 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
-import org.openecomp.sdc.utils.heat.HeatConfiguration;
+import org.onap.sdc.utils.heat.HeatConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.TypeDescription;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatConfiguration.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatConfiguration.java
index 6cd2de0..ee272f4 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatConfiguration.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatConfiguration.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.Map;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameter.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameter.java
index 954152d..3638bcf 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameter.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameter.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.ArrayList;
import java.util.List;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameterConstraint.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameterConstraint.java
index b89ad48..d618caf 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParameterConstraint.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParameterConstraint.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.List;
import java.util.Map;
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParser.java b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParser.java
index 5aa4968..340a59d 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/heat/HeatParser.java
+++ b/sdc-distribution-client/src/main/java/org/onap/sdc/utils/heat/HeatParser.java
@@ -18,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.Map;
-import org.openecomp.sdc.utils.YamlToObjectConverter;
+import org.onap.sdc.utils.YamlToObjectConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/http/SdcConnectorClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java
index 5ddc915..7b46f33 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/http/SdcConnectorClientTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/http/SdcConnectorClientTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -23,10 +23,10 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.openecomp.sdc.api.asdc.RegistrationRequest;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.impl.DistributionClientResultImpl;
-import org.openecomp.sdc.utils.Pair;
+import org.onap.sdc.impl.DistributionClientResultImpl;
+import org.onap.sdc.api.asdc.RegistrationRequest;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.utils.Pair;
import com.att.nsa.apiClient.credentials.ApiCredential;
import com.google.gson.Gson;
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientDownloadResultTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientDownloadResultTest.java
index 8f8fca2..d12d828 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientDownloadResultTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientDownloadResultTest.java
@@ -1,55 +1,55 @@
-package org.openecomp.sdc.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-
-
-public class DistributionClientDownloadResultTest {
-
- public static DistributionClientDownloadResultImpl distributionClientDownloadResult;
-
- @BeforeClass
- public static void init(){
- distributionClientDownloadResult = new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, "");
- }
-
- @Test
- public void testNonHeaderFilename(){
- distributionClientDownloadResult.setArtifactName("service-BkPerformanceSrvs-csar.csar");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testNullFilename(){
- distributionClientDownloadResult.setArtifactName(null);
- assertNull(distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameFromHeaderNoSpace(){
- distributionClientDownloadResult.setArtifactName("attachment;filename=\"service-BkPerformanceSrvs-csar.csar\"");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameFromHeaderOneSpace(){
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameFromHeaderManySpaces(){
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
- }
-
- @Test
- public void testFilenameEmpty(){
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"\"");
- assertEquals("", distributionClientDownloadResult.getArtifactFilename());
- }
-}
+package org.onap.sdc.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+
+
+public class DistributionClientDownloadResultTest {
+
+ public static DistributionClientDownloadResultImpl distributionClientDownloadResult;
+
+ @BeforeClass
+ public static void init(){
+ distributionClientDownloadResult = new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, "");
+ }
+
+ @Test
+ public void testNonHeaderFilename(){
+ distributionClientDownloadResult.setArtifactName("service-BkPerformanceSrvs-csar.csar");
+ assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
+ }
+
+ @Test
+ public void testNullFilename(){
+ distributionClientDownloadResult.setArtifactName(null);
+ assertNull(distributionClientDownloadResult.getArtifactFilename());
+ }
+
+ @Test
+ public void testFilenameFromHeaderNoSpace(){
+ distributionClientDownloadResult.setArtifactName("attachment;filename=\"service-BkPerformanceSrvs-csar.csar\"");
+ assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
+ }
+
+ @Test
+ public void testFilenameFromHeaderOneSpace(){
+ distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");
+ assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
+ }
+
+ @Test
+ public void testFilenameFromHeaderManySpaces(){
+ distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");
+ assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());
+ }
+
+ @Test
+ public void testFilenameEmpty(){
+ distributionClientDownloadResult.setArtifactName("attachment; filename=\"\"");
+ assertEquals("", distributionClientDownloadResult.getArtifactFilename());
+ }
+}
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java
index 81f9a17..e2bad5a 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/DistributionClientTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/DistributionClientTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -32,19 +32,19 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.http.SdcConnectorClient;
-import org.openecomp.sdc.http.TopicRegistrationResponse;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.ArtifactsUtils;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.TestConfiguration;
-import org.openecomp.sdc.utils.TestNotificationCallback;
-import org.openecomp.sdc.utils.Wrapper;
+import org.onap.sdc.utils.TestConfiguration;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.http.SdcConnectorClient;
+import org.onap.sdc.http.TopicRegistrationResponse;
+import org.onap.sdc.utils.ArtifactTypeEnum;
+import org.onap.sdc.utils.ArtifactsUtils;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.TestNotificationCallback;
+import org.onap.sdc.utils.Wrapper;
import com.att.nsa.apiClient.credentials.ApiCredential;
import com.att.nsa.apiClient.http.HttpException;
@@ -81,8 +81,8 @@ public class DistributionClientTest {
userConfig.setPollingTimeout(2);
DistributionActionResultEnum validationResult = client.validateAndInitConfiguration(new Wrapper<IDistributionClientResult>(), userConfig);
Assert.assertEquals(DistributionActionResultEnum.SUCCESS, validationResult);
- Assert.assertEquals(15, client.configuration.getPollingInterval());
- Assert.assertEquals(15, client.configuration.getPollingTimeout());
+ assertEquals(15, client.configuration.getPollingInterval());
+ assertEquals(15, client.configuration.getPollingTimeout());
}
@Test
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/HeatParserTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/HeatParserTest.java
index 3b5b1a1..815d749 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/HeatParserTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/HeatParserTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.junit.Assert.*;
@@ -30,9 +30,9 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.openecomp.sdc.utils.heat.HeatParameter;
-import org.openecomp.sdc.utils.heat.HeatParameterConstraint;
-import org.openecomp.sdc.utils.heat.HeatParser;
+import org.onap.sdc.utils.heat.HeatParser;
+import org.onap.sdc.utils.heat.HeatParameter;
+import org.onap.sdc.utils.heat.HeatParameterConstraint;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/NotificationConsumerTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
index 7fe125b..7603d0c 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/impl/NotificationConsumerTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
@@ -18,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -41,13 +41,13 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.ArtifactTypeEnum;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionClientConstants;
-import org.openecomp.sdc.utils.TestConfiguration;
+import org.onap.sdc.utils.TestConfiguration;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.ArtifactTypeEnum;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionClientConstants;
import com.att.nsa.cambria.client.CambriaConsumer;
import com.google.gson.Gson;
@@ -57,7 +57,7 @@ public class NotificationConsumerTest {
private CambriaConsumer cambriaConsumer = mock(CambriaConsumer.class);
private INotificationCallback clientCallback = spy(INotificationCallback.class);
private Queue<Iterable<String>> notificationsQueue = new ArrayQueue<>(100);
- private DistributionClientImpl distributionClient = spy(DistributionClientImpl.class);
+ private DistributionClientImpl distributionClient = Mockito.spy(DistributionClientImpl.class);
private List<String> artifactsTypes = Arrays.asList(ArtifactTypeEnum.HEAT.name());
private List<Boolean> notificationStatusResults = new ArrayList<>();
final static IDistributionClientResult DISTRIBUTION_SUCCESS_RESULT = buildSuccessResult();
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/ArtifactsUtils.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/ArtifactsUtils.java
index 5a24849..b562ab7 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/ArtifactsUtils.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/ArtifactsUtils.java
@@ -18,14 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import org.apache.commons.codec.binary.Base64;
-import org.openecomp.sdc.impl.mock.DistributionClientDownloadResultStubImpl;
-import org.openecomp.sdc.utils.GeneralUtils;
-
+import org.onap.sdc.impl.mock.DistributionClientDownloadResultStubImpl;
public class ArtifactsUtils {
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestConfiguration.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java
index 22814f4..0aa314e 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestConfiguration.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestConfiguration.java
@@ -18,12 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.consumer.IConfiguration;
public class TestConfiguration implements IConfiguration {
diff --git a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestNotificationCallback.java b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestNotificationCallback.java
index bef643a..32ce405 100644
--- a/sdc-distribution-client/src/test/java/org/openecomp/sdc/utils/TestNotificationCallback.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/utils/TestNotificationCallback.java
@@ -18,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.INotificationData;
public class TestNotificationCallback implements INotificationCallback{
diff --git a/version.properties b/version.properties
index 4d0ed8b..235314e 100644
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=2
-patch=3
+minor=3
+patch=0
base_version=${major}.${minor}.${patch}