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;
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
*** to be completed on release ***
-SDC@lists.openecomp.org
+SDC@lists.onap.org
SDC Javadoc and Maven site
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>
<!--<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>
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
<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>
</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>
<configuration>
<classifier>spring-boot</classifier>
<mainClass>
- org.openecomp.test.ClientTest
+ org.onap.test.ClientTest
</mainClass>
</configuration>
</execution>
* ============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;
/**
*
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import java.util.ArrayList;
import java.util.List;
* ============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 {
-package org.openecomp.test;\r
-\r
-import java.io.File;\r
-import java.io.FileWriter;\r
-import java.io.IOException;\r
-import java.text.SimpleDateFormat;\r
-import java.util.Arrays;\r
-import java.util.Date;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;\r
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;\r
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;\r
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;\r
-import org.openecomp.sdc.toscaparser.api.Group;\r
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;\r
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;\r
-import org.openecomp.sdc.toscaparser.api.parameters.Input;\r
-import org.openecomp.sdc.toscaparser.api.utils.ThreadLocalsHolder;\r
-\r
-public class CsarToscaTester {\r
- public static void main(String[] args) throws Exception {\r
- System.out.println("CsarToscaParser - path to CSAR's Directory is " + Arrays.toString(args));\r
- SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();\r
-\r
- File folder = new File(args[0]);\r
- File[] listOfFiles = folder.listFiles();\r
- Date now = new Date();\r
- SimpleDateFormat dateFormat = new SimpleDateFormat("d-MM-y-HH_mm_ss");\r
- String time = dateFormat.format(now);\r
- String csarsDir = args[1] + "/csar-reports-" + time;\r
- File dir = new File(csarsDir);\r
- dir.mkdir();\r
-\r
-\r
- for (File file : listOfFiles) {\r
- if (file.isFile()) { \r
- System.out.println("File " + file.getAbsolutePath());\r
- String name = file.getName();\r
- String currentCsarDir = csarsDir+"/"+name+"-"+time;\r
- dir = new File(currentCsarDir);\r
- dir.mkdir();\r
- try {\r
- processCsar(factory, file);\r
- } catch (SdcToscaParserException e){\r
- System.out.println("SdcToscaParserException caught. Code: "+e.getCode()+", message: "+ e.getMessage());\r
- }\r
- List<String> validationIssueReport = ThreadLocalsHolder.getCollector().getValidationIssueReport();\r
- System.out.println("Validation issues during CSAR parsing are: " + (validationIssueReport != null ? validationIssueReport.toString() : "none"));\r
-\r
- try {\r
- generateReport(time, name, currentCsarDir, validationIssueReport, "validationIssues");\r
-\r
- } catch (IOException ex) {\r
- ex.printStackTrace();\r
- }\r
- }\r
-\r
- } \r
- }\r
-\r
- private static void processCsar(SdcToscaParserFactory factory, File file) throws SdcToscaParserException {\r
- ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(file.getAbsolutePath());\r
- //Service level\r
- System.out.println("Invoking sdc-tosca methods on this CSAR....");\r
- String conformanceLevel = sdcCsarHelper.getConformanceLevel();\r
- System.out.println("getConformanceLevel() - conformance level is "+conformanceLevel);\r
- String serviceSubstitutionMappingsTypeName = sdcCsarHelper.getServiceSubstitutionMappingsTypeName();\r
- System.out.println("serviceSubstitutionMappingsTypeName() - subst mappings type of service is "+serviceSubstitutionMappingsTypeName);\r
- List<Input> serviceInputs = sdcCsarHelper.getServiceInputs();\r
- System.out.println("getServiceInputs() - service inputs are "+serviceInputs);\r
- Metadata serviceMetadata = sdcCsarHelper.getServiceMetadata();\r
- System.out.println("getServiceMetadata() - service metadata is "+serviceMetadata);\r
- Map<String, Object> serviceMetadataProperties = sdcCsarHelper.getServiceMetadataProperties();\r
- System.out.println("getServiceMetadataProperties() - service metadata properties is "+serviceMetadataProperties);\r
- List<NodeTemplate> allottedResources = sdcCsarHelper.getAllottedResources();\r
- System.out.println("getAllottedResources() - service allotted resources are "+allottedResources);\r
- List<NodeTemplate> serviceVfList = sdcCsarHelper.getServiceVfList();\r
- System.out.println("getServiceVfList() - VF list is "+serviceVfList);\r
- List<NodeTemplate> serviceNodeTemplateBySdcType = sdcCsarHelper.getServiceNodeTemplateBySdcType(SdcTypes.VF);\r
- System.out.println("getServiceNodeTemplateBySdcType() - VF list is "+serviceNodeTemplateBySdcType);\r
- List<NodeTemplate> serviceNodeTemplates = sdcCsarHelper.getServiceNodeTemplates();\r
- System.out.println("getServiceNodeTemplates() - all node templates list of service is "+serviceNodeTemplates);\r
- \r
- serviceVfList.forEach(x -> {\r
- String nodeTemplateCustomizationUuid = sdcCsarHelper.getNodeTemplateCustomizationUuid(x);\r
- System.out.println("getNodeTemplateCustomizationUuid() - VF ID is "+nodeTemplateCustomizationUuid);\r
- String typeOfNodeTemplate = sdcCsarHelper.getTypeOfNodeTemplate(x);\r
- System.out.println("getTypeOfNodeTemplate() - VF tosca type is "+typeOfNodeTemplate);\r
- List<Group> vfModulesByVf = sdcCsarHelper.getVfModulesByVf(nodeTemplateCustomizationUuid);\r
- System.out.println("getVfModulesByVf() - VF modules list is "+vfModulesByVf);\r
- vfModulesByVf.forEach(y -> {\r
- List<NodeTemplate> membersOfVfModule = sdcCsarHelper.getMembersOfVfModule(x, y);\r
- System.out.println("getMembersOfVfModule() - members of VfModule are "+membersOfVfModule);\r
- });\r
- List<NodeTemplate> vfcListByVf = sdcCsarHelper.getVfcListByVf(nodeTemplateCustomizationUuid);\r
- System.out.println("getVfcListByVf() - VFC list is "+vfcListByVf);\r
- vfcListByVf.forEach(z -> {\r
- List<NodeTemplate> nodeTemplateBySdcType = sdcCsarHelper.getNodeTemplateBySdcType(z, SdcTypes.CP);\r
- System.out.println("getNodeTemplateBySdcType() - CP children node templates of this VFC are "+nodeTemplateBySdcType);\r
- Map<String, Map<String, Object>> cpPropertiesFromVfcAsObject = sdcCsarHelper.getCpPropertiesFromVfcAsObject(z);\r
- System.out.println("getCpPropertiesFromVfcAsObject() - consolidated CP properties for this VFC are "+cpPropertiesFromVfcAsObject);\r
- boolean hasTopology = sdcCsarHelper.hasTopology(z);\r
- System.out.println("hasTopology() - this VFC is "+(hasTopology ? "nested" : "not nested"));\r
- }); \r
- });\r
- \r
- }\r
-\r
- private static void generateReport(String time, String name, String currentCsarDir, List<String> criticalsReport, String type)\r
- throws IOException {\r
- FileWriter fw;\r
- fw = new FileWriter(new File(currentCsarDir + "/" + criticalsReport.size() + "-"+type+"-" + name +"-"+time + ".txt"));\r
- for (String exception : criticalsReport) {\r
- fw.write(exception);\r
- fw.write("\r\n");\r
- }\r
- fw.close();\r
- }\r
-}\r
+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();
+ }
+}
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import java.io.BufferedReader;
import java.io.FileReader;
* ============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;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.test;
+package org.onap.test;
import static org.junit.Assert.assertEquals;
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;
/**
*
* ============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{
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
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
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
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.ci.tests.execute.downloadArtifactUGN;
+package org.onap.sdc.ci.tests.execute.downloadArtifactUGN;
import org.junit.Test;
<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>
* ============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 {
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api;
+package org.onap.sdc.api;
public interface IDistributionStatusMessageJsonBuilder {
String build();
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.asdc;
+package org.onap.sdc.api.asdc;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.asdc;
+package org.onap.sdc.api.asdc;
import java.util.List;
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
public interface IComponentDoneStatusMessage extends IDistributionStatusMessageBasic {
String getComponentName();
* ============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 {
/**
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
public interface IDistributionStatusMessage extends IDistributionStatusMessageBasic{
-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 {
/**
-package org.openecomp.sdc.api.consumer;
+package org.onap.sdc.api.consumer;
* ============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 {
* ============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
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.api.notification;
+package org.onap.sdc.api.notification;
import java.util.List;
* ============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 {
/**
* ============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*/
* ============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{
* ============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();
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
public class AsdcUrls {
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.io.FileInputStream;
import java.io.IOException;
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;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.util.Map;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.util.Map;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import java.io.IOException;
import java.io.InputStream;
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;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
public class TopicRegistrationResponse {
String distrNotificationTopicName;
* ============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 {
* ============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 {
* ============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);
}
* ============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(){
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static java.util.Objects.isNull;
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;
* ============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 {
* ============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 {
* ============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;
* ============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;
* ============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;
* ============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 {
* ============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;
* ============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;
* ============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(){
* ============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 {
* ============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
* ============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) {
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public enum ArtifactTypeEnum {
HEAT,
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public enum DistributionActionResultEnum {
SUCCESS,
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.util.regex.Pattern;
* ============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*/
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.net.InetAddress;
import java.net.UnknownHostException;
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;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
public final class Pair<F, S> {
private final F first;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
/**
* Very Basic Wrapper class.
* @author mshitrit
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils;
+package org.onap.sdc.utils;
import java.beans.IntrospectionException;
import java.io.File;
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;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.Map;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.ArrayList;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.utils.heat;
+package org.onap.sdc.utils.heat;
import java.util.List;
import java.util.Map;
* ============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;
-package org.openecomp.sdc.http;
+package org.onap.sdc.http;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
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;
-package org.openecomp.sdc.impl;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertNull;\r
-\r
-import org.junit.BeforeClass;\r
-import org.junit.Test;\r
-import org.openecomp.sdc.utils.DistributionActionResultEnum;\r
-\r
-\r
-public class DistributionClientDownloadResultTest {\r
- \r
- public static DistributionClientDownloadResultImpl distributionClientDownloadResult;\r
- \r
- @BeforeClass\r
- public static void init(){\r
- distributionClientDownloadResult = new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, "");\r
- }\r
- \r
- @Test\r
- public void testNonHeaderFilename(){\r
- distributionClientDownloadResult.setArtifactName("service-BkPerformanceSrvs-csar.csar");\r
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());\r
- }\r
- \r
- @Test\r
- public void testNullFilename(){\r
- distributionClientDownloadResult.setArtifactName(null);\r
- assertNull(distributionClientDownloadResult.getArtifactFilename());\r
- }\r
- \r
- @Test\r
- public void testFilenameFromHeaderNoSpace(){\r
- distributionClientDownloadResult.setArtifactName("attachment;filename=\"service-BkPerformanceSrvs-csar.csar\"");\r
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());\r
- }\r
- \r
- @Test\r
- public void testFilenameFromHeaderOneSpace(){\r
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");\r
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());\r
- }\r
- \r
- @Test\r
- public void testFilenameFromHeaderManySpaces(){\r
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"service-BkPerformanceSrvs-csar.csar\"");\r
- assertEquals("service-BkPerformanceSrvs-csar.csar", distributionClientDownloadResult.getArtifactFilename());\r
- }\r
- \r
- @Test\r
- public void testFilenameEmpty(){\r
- distributionClientDownloadResult.setArtifactName("attachment; filename=\"\"");\r
- assertEquals("", distributionClientDownloadResult.getArtifactFilename());\r
- }\r
-}\r
+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());
+ }
+}
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
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;
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
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.junit.Assert.*;
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;
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
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;
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();
* ============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 {
* ============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 {
* ============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{
# 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}
Code Review / sdc / sdc-distribution-client.git / commitdiff