diff options
Diffstat (limited to 'common/openecomp-common-configuration-management/openecomp-configuration-management-test')
108 files changed, 0 insertions, 2572 deletions
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/pom.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/pom.xml deleted file mode 100644 index 2dcde64b07..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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> - - <name>openecomp-configuration-management-test</name> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-test</artifactId> - - <parent> - <artifactId>openecomp-common-configuration-management</artifactId> - <groupId>org.openecomp.sdc.common</groupId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - - <dependencies> - <dependency> - <groupId>org.openecomp.sdc.common</groupId> - <artifactId>openecomp-configuration-management-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin--> - <!--<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${mvn.surefire.version}</version> - </plugin>--> - <!-- any other plugins --> - <!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>${mvn.shade.version}</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <excludes> - <exclude>com.google.guava:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin>--> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${mvn.surefire.version}</version> - <configuration> - <skipTests>true</skipTests> - <systemPropertyVariables> - <config.location>${project.basedir}/src/test/resources</config.location> - <node.config.location>${user.home}/TestResources</node.config.location> - </systemPropertyVariables> - <includes> - <include>**/TestCMSuite.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/TestCMSuite.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/TestCMSuite.java deleted file mode 100644 index 4ef46f6c9d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/TestCMSuite.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.openecomp.config; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.test.*; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * Created by sheetalm on 10/25/2016. - */ - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - JAVAPropertiesConfigTest.class, - JSONConfigTest.class, - XMLConfigTest.class, - YAMLConfigTest.class, - CLIFallbackAndLookupTest.class, - CLITest.class, - ConfigSourceLocationTest.class, - DynamicConfigurationTest.class, - FallbackConfigTest.class, - FallbackToGlobalNSTest.class, - GlobalAndNSConfigTest.class, - ModeAsConfigPropTest.class, - MultiTenancyConfigTest.class, - NodeSpecificCLITest.class, - NotificationForNodeConfigTest.class, - NotificationOnPropValTest.class, - ResourceChangeNotificationTest.class, - UnregisterNotificationTest.class, - ValidateDefaultModeTest.class, - ValidateNodeConfigTest.class, - LoadOrderMergeAndOverrideTest.class - - -}) - -public class TestCMSuite extends junit.framework.TestSuite { - - private TestCMSuite() { - - } - - @AfterClass - public static void tearDown(){ - try { - ConfigurationUtils.executeDdlSql("truncate dox.configuration_change"); - ConfigurationUtils.executeDdlSql("truncate dox.configuration"); - } - catch(Exception e){ - e.printStackTrace(); - } - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLIFallbackAndLookupTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLIFallbackAndLookupTest.java deleted file mode 100644 index 4f7ab92dd0..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLIFallbackAndLookupTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.Assert; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import javax.management.JMX; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.Map; - - - -/** - * Created by sheetalm on 10/18/2016. - * Scenario 21, Scenario 23 - * 21 - Verify the CLI fetches only the current value unless the fallback option is specified - * 23 - Fetch value using CLI for a key with underlying resource - */ -public class CLIFallbackAndLookupTest { - - public final static String NAMESPACE = "CLIFallback"; - public final static String TENANT = "OPENECOMP"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testCLIFallbackAndLookup() throws Exception{ - - //Verify without fallback - Map<String, Object> input = new HashMap<>(); - input.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - input.put("tenant", TENANT); - input.put("namespace", NAMESPACE); - input.put("key", ConfigTestConstant.ARTIFACT_MAXSIZE); - - MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); - ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); - ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, true); - String maxSizeWithNoFallback = conf.getConfigurationValue(input); - Assert.assertEquals("",maxSizeWithNoFallback); - - //Verify underlying resource without lookup switch - input.put("key", ConfigTestConstant.ARTIFACT_JSON_SCHEMA); - String jsonSchema = conf.getConfigurationValue(input); - System.out.println("jsonSchema=="+jsonSchema); - Assert.assertEquals("@"+System.getProperty("user.home")+"/TestResources/GeneratorsList.json" , jsonSchema); - - //Verify underlying resource with lookup switch - input.put("externalLookup", true); - jsonSchema = conf.getConfigurationValue(input); - System.out.println("jsonSchema=="+jsonSchema); - Assert.assertEquals("{name:\"SCM\"}" , jsonSchema); - - //Verify with fallback - Map<String, Object> fallbackInput = new HashMap<>(); - fallbackInput.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - fallbackInput.put("fallback", true); - fallbackInput.put("tenant", TENANT); - fallbackInput.put("namespace", NAMESPACE); - fallbackInput.put("key", ConfigTestConstant.ARTIFACT_MAXSIZE); - - String maxSizeWithFallback = conf.getConfigurationValue(fallbackInput); - Assert.assertEquals("1024",maxSizeWithFallback); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLITest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLITest.java deleted file mode 100644 index ff04873b42..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/CLITest.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import javax.management.JMX; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.Map; - -import static org.openecomp.config.util.ConfigTestConstant.*; - -/** - * Created by sheetalm on 10/18/2016. - * Scenario 17 - * Verify Configuration Management System - Command Line Interface for query, update and list operations - */ -public class CLITest { - - public final static String NAMESPACE = "CLI"; - public final static String TENANT = "OPENECOMP"; - private String updatedValue = ""; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testCLIApi() throws Exception{ - //Verify without fallback - Map<String, Object> input = new HashMap<>(); - input.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - input.put("tenant", TENANT); - input.put("namespace", NAMESPACE); - input.put("key", ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH); - - MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); - ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); - ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, true); - String maxLength = conf.getConfigurationValue(input); - Assert.assertEquals("14",maxLength); - - conf.addConfigurationChangeListener(TENANT,NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, new CLIListener()); - - - //Update maxlength - input.put("ImplClass", "org.openecomp.config.type.ConfigurationUpdate"); - input.put("value", "24"); - conf.updateConfigurationValue(input); - - Thread.sleep(35000); - - Assert.assertEquals("24",updatedValue); - - //Reset value and fetch updated value again - input.put("value", ""); - input.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - String updatedMaxLength = conf.getConfigurationValue(input); - Assert.assertEquals("24",updatedMaxLength); - - Map<String, String> outputMap = conf.listConfiguration(input); - for(Map.Entry<String, String> entry : outputMap.entrySet()){ - System.out.println(entry.getKey()+" : "+entry.getValue()); - validateCLIListConfig(outputMap); - } - } - - private class CLIListener implements ConfigurationChangeListener { - @Override - public void notify(String key, Object oldValue, Object newValue) { - System.out.println("received notification::oldValue=="+oldValue+" newValue=="+newValue); - updatedValue = newValue.toString(); - } - } - - private void validateCLIListConfig(Map<String, String> outputMap ) { - - Assert.assertEquals("@"+System.getProperty("user.home")+"/TestResources/GeneratorsList.json" , outputMap.get(ARTIFACT_JSON_SCHEMA)); - Assert.assertEquals("appc,catalog", outputMap.get(ARTIFACT_CONSUMER)); - Assert.assertEquals("6", outputMap.get(ARTIFACT_NAME_MINLENGTH)); - Assert.assertEquals("true", outputMap.get(ARTIFACT_ENCODED)); - Assert.assertEquals("24", outputMap.get(ARTIFACT_NAME_MAXLENGTH)); - Assert.assertEquals("pdf,zip,xml,pdf,tgz,xls", outputMap.get(ARTIFACT_EXT)); - Assert.assertEquals("Base64,MD5", outputMap.get(ARTIFACT_ENC)); - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json", outputMap.get(ARTIFACT_XML_SCHEMA)); - Assert.assertEquals("a-zA-Z_0-9", outputMap.get(ARTIFACT_NAME_UPPER)); - Assert.assertEquals("/opt/spool,"+System.getProperty("user.home")+"/asdc", outputMap.get(ARTIFACT_LOC)); - Assert.assertEquals("deleted,Deleted", outputMap.get(ARTIFACT_STATUS)); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ConfigSourceLocationTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ConfigSourceLocationTest.java deleted file mode 100644 index 731826b53c..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ConfigSourceLocationTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; - -import java.io.File; -import java.io.IOException; -import java.util.Properties; -import java.io.OutputStream; -import java.io.FileOutputStream; - -/** - * Created by sheetalm on 10/14/2016. - * Scenario 11 - * Validate conventional and configurational source location - * - * Pre-requisite - set -Dconfig.location=${"user.home"}/TestResources/ while running test - */ -public class ConfigSourceLocationTest { - public final static String NAMESPACE = "SourceLocation"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - - Properties props = new Properties(); - props.setProperty("maxCachedBufferSize", "1024"); - props.setProperty("artifact.maxsize", "1024"); - File f = new File(TestUtil.jsonSchemaLoc + "config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Config Property at Conventional Resource"); - } - } - - @Test - public void testMergeStrategyInConfig() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals("a-zA-Z_0-9", config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_UPPER)); - Assert.assertEquals("1024", config.getAsString(ConfigTestConstant.ARTIFACT_MAXSIZE)); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/DynamicConfigurationTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/DynamicConfigurationTest.java deleted file mode 100644 index 2140e84873..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/DynamicConfigurationTest.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.api.DynamicConfiguration; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Properties; - -/** - * Created by sheetalm on 10/17/2016. - * Pre-requisite - set -Dconfig.location=${"user.home"}/TestResources/ while running test - * Scenario 20 - * Update the central configuration and fetch the Dynamic Configuration - */ -public class DynamicConfigurationTest { - - public final static String NAMESPACE = "DynamicConfiguration"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testDynamicConfig() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - Properties props = new Properties(); - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, "20"); - props.setProperty("_config.namespace",NAMESPACE); - props.setProperty("_config.mergeStrategy","override"); - File f = new File(TestUtil.jsonSchemaLoc + "config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Override Config Property at Conventional Resource"); - } - - //Verify configuration with Configuration without wait. This should fetch cached value - Assert.assertEquals("14" , config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - Thread.sleep(10000); - - DynamicConfiguration dynaConfig = config.getDynamicConfiguration(NAMESPACE,ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH,String.class,"14"); - //Verify configuration with DynamicConfiguration This should fetch values from DB - Assert.assertEquals("20" , dynaConfig.get()); - - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - if(f.exists()) { - f.delete(); - } - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackConfigTest.java deleted file mode 100644 index 09fca879b0..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackConfigTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; - -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/14/2016. - * - * Validate configuration with properties,xml,json,yaml file format with mode - */ -public class FallbackConfigTest { - - public static final String NAMESPACE = "fallback"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithFallbackFileFormat(){ - validateConfiguraton(NAMESPACE); - } - - @After - public void tearDown() throws Exception { - String data = "{name:\"SCM\"}"; - writeFile(data); - //ConfigurationUtils.executeDDLSQL("truncate dox.configuration"); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackToGlobalNSTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackToGlobalNSTest.java deleted file mode 100644 index 1efc462d4e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/FallbackToGlobalNSTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; - -import java.io.IOException; - -/** - * Scenario 12 - * Verify configuration value fallback to the global namespace if the configuraton property doesnot exist in the namespace configuration - * Created by sheetalm on 10/14/2016. - */ -public class FallbackToGlobalNSTest { - - public final static String NAMESPACE = "FallbackToGlobalNS"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testFallbackToGlobalNS() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals("14",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - Assert.assertEquals("1024",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_MAXSIZE)); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } - - -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/GlobalAndNSConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/GlobalAndNSConfigTest.java deleted file mode 100644 index 87324aa35c..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/GlobalAndNSConfigTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by sheetalm on 10/13/2016. - * Scenario 10 Verify configuration present in both global and defined namespace - */ -public class GlobalAndNSConfigTest { - - public final static String NAMESPACE = "GlobalAndNSConfig"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testNamespaceInConfig() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - Assert.assertEquals("a-zA-Z",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_UPPER )); - Assert.assertEquals("a-zA-Z_0-9",config.getAsString(ConfigTestConstant.ARTIFACT_NAME_UPPER )); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } - - - - -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JAVAPropertiesConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JAVAPropertiesConfigTest.java deleted file mode 100644 index 23c5fa3130..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JAVAPropertiesConfigTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; - -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/13/2016. - * - * Scenario 1 - * Validate configuration with Java Properties file format with mode - */ -public class JAVAPropertiesConfigTest { - - public static final String NAMESPACE = "javaProperties"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithPropertiesFileFormat(){ - validateConfiguraton(NAMESPACE); - } - - - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JSONConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JSONConfigTest.java deleted file mode 100644 index 5f2d24e67f..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/JSONConfigTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; - -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/14/2016. - * - * Scenario 3 - * Validate configuration with JSON file format with mode - */ -public class JSONConfigTest { - - public static final String NAMESPACE = "JSONConfig"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithJSONFileFormat(){ - validateConfiguraton(NAMESPACE); - } - - - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/LoadOrderMergeAndOverrideTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/LoadOrderMergeAndOverrideTest.java deleted file mode 100644 index 7ce508a063..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/LoadOrderMergeAndOverrideTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.openecomp.config.test; - -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.TestUtil; - -import java.io.IOException; - -/** - * Scenario - * Check loadorder for merge and overide. Higher loadorder takes precedence for override - * LoWer loadorder takes precedence for merge. - */ -public class LoadOrderMergeAndOverrideTest { - - public static final String NAMESPACE = "LoadOrderConfiguration"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithPropertiesFileFormat(){ - Configuration config = ConfigurationManager.lookup(); - - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "14"); - Assert.assertEquals("5", config.getAsString(NAMESPACE, "artifact.length")); - Assert.assertEquals("56", config.getAsString(NAMESPACE, "artifact.size")); - } - - - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ModeAsConfigPropTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ModeAsConfigPropTest.java deleted file mode 100644 index 470694e355..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ModeAsConfigPropTest.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -/** - * Scenario 8 - * Validate configuration with mode specified as a configuration property - */ - -public class ModeAsConfigPropTest { - - String newValue = null; - - public final static String NAMESPACE = "ModeAsConfigProp"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testMergeStrategyInConfig() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - - Assert.assertEquals("14",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - Assert.assertEquals("1048",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_MAXSIZE)); - - List<String> expectedExtList = new ArrayList<String>(); - expectedExtList.add("pdf"); - expectedExtList.add("zip"); - expectedExtList.add("xml"); - expectedExtList.add("pdf"); - expectedExtList.add("tgz"); - expectedExtList.add("xls"); - List<String> extList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_EXT); - Assert.assertEquals(expectedExtList, extList); - - List<String> expectedEncList = new ArrayList<String>(); - expectedEncList.add("Base64"); - expectedEncList.add("MD5"); - List<String> encList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_ENC); - Assert.assertEquals(expectedEncList, encList); - - String newValue = config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_JSON_SCHEMA); - Assert.assertEquals("{name:\"SCM\"}",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_JSON_SCHEMA)); - - Assert.assertEquals("a-zA-Z_0-9",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_UPPER )); - - Assert.assertEquals("Deleted",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_STATUS) ); - - List<String> expectedLocList = new ArrayList<String>(); - expectedLocList.add("/opt/spool"); - expectedLocList.add(System.getProperty("user.home")+"/asdc"); - List<String> locList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_LOC); - Assert.assertEquals(expectedLocList, locList); - - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); - - List<String> artifactConsumer = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_CONSUMER ); - Assert.assertEquals(config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_CONSUMER_APPC ), artifactConsumer); - - Assert.assertEquals(config.getAsBooleanValue(NAMESPACE, ConfigTestConstant.ARTIFACT_MANDATORY_NAME ), true); - - Assert.assertEquals(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MINLENGTH ), "6"); - - Assert.assertEquals(config.getAsBooleanValue(NAMESPACE, ConfigTestConstant.ARTIFACT_ENCODED ), true); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } - -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/MultiTenancyConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/MultiTenancyConfigTest.java deleted file mode 100644 index 66feea3928..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/MultiTenancyConfigTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import static org.openecomp.config.util.ConfigTestConstant.*; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_ENCODED; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_MANDATORY_NAME; -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/14/2016. - * - * Scenario 17 - * Verify Configuration management System - Support for Multi-Tenancy - */ -public class MultiTenancyConfigTest { - - public static final String NAMESPACE = "tenancy"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithMultiTenancyFileFormat(){ - Configuration config = ConfigurationManager.lookup(); - - Assert.assertEquals(config.getAsString("OPENECOMP",NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "20"); - - Assert.assertEquals(config.getAsString("Telefonica",NAMESPACE, ARTIFACT_STATUS ), "Deleted"); - - Assert.assertEquals(config.getAsString("TID",NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "14"); - - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NodeSpecificCLITest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NodeSpecificCLITest.java deleted file mode 100644 index 43729cbaf2..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NodeSpecificCLITest.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.Constants; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Test; - -import javax.management.JMX; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -/** - * Created by sheetalm on 10/19/2016. - * Scenario 19 - * Pre-requisite - set -Dnode.config.location=${"user.home"}/TestResources/ while running test - * Verify node specific override using CLI - */ -public class NodeSpecificCLITest { - - public final static String NAMESPACE = "NodeCLI"; - private String updatedValue = ""; - - @Test - public void testCLIApi() throws Exception{ - //Verify without fallback - Map<String, Object> input = new HashMap<>(); - input.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - input.put("namespace", NAMESPACE); - input.put("key", ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH); - - MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer(); - ObjectName mbeanName = new ObjectName(Constants.MBEAN_NAME); - ConfigurationManager conf = JMX.newMBeanProxy(mbsc, mbeanName, org.openecomp.config.api.ConfigurationManager.class, true); - String maxLength = conf.getConfigurationValue(input); - - //Verify Property from Namespace configurations - Assert.assertEquals("30",maxLength); - - //Add node specific configurations - Properties props = new Properties(); - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, "50"); - props.setProperty("_config.namespace",NAMESPACE); - File f = new File(TestUtil.jsonSchemaLoc + "config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Node Config Property"); - } - - Thread.sleep(35000); - - //Verify property from node specific configuration - input.put("nodeSpecific", true); - String nodeVal = conf.getConfigurationValue(input); - Assert.assertEquals("50", nodeVal); - - //Add Change Listener - conf.addConfigurationChangeListener(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, new CLINodeListener()); - - //Update maxlength - input.put("ImplClass", "org.openecomp.config.type.ConfigurationUpdate"); - input.put("nodeOverride", true); - input.put("nodeSpecific", false); - input.put("value", "60"); - conf.updateConfigurationValue(input); - - Thread.sleep(35000); - - Assert.assertEquals("60",updatedValue); - - //Fetch the updated nodespecific value - input.put("nodeOverride", false); - input.put("nodeSpecific", true); - input.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - String updatedMaxLength = conf.getConfigurationValue(input); - Assert.assertEquals("60",updatedMaxLength); - - //Verify maxlength on other nodes by deleting node specific configuration - if(f.exists()) { - f.delete(); - } - - Thread.sleep(35000); - - input.put("ImplClass", "org.openecomp.config.type.ConfigurationQuery"); - input.put("nodeOverride", false); - input.put("nodeSpecific", false); - System.out.println("val on other node is::"+conf.getConfigurationValue(input)); - Assert.assertEquals("30",conf.getConfigurationValue(input)); - } - - @AfterClass - public static void tearDown() throws Exception { - TestUtil.cleanUp(); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - if(f.exists()) { - f.delete(); - } - } - - private class CLINodeListener implements ConfigurationChangeListener { - @Override - public void notify(String key, Object oldValue, Object newValue) { - System.out.println("received notification::oldValue=="+oldValue+" newValue=="+newValue); - updatedValue = newValue.toString(); - } - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationForNodeConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationForNodeConfigTest.java deleted file mode 100644 index 9d719103df..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationForNodeConfigTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Properties; - -/** - * Scenario 15 - * Update and Verify Change Notifications for any change in the registered key for node specific configuration - * Pre-requisite - set -Dnode.config.location=${"user.home"}/TestResources/ while running test - * Created by sheetalm on 10/17/2016. - */ -public class NotificationForNodeConfigTest { - public final static String NAMESPACE = "NotificationForNodeConfig"; - - private String updatedValue = null; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testNotificationForNode() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - - System.out.println(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - Properties props = new Properties(); - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, "30"); - props.setProperty("_config.namespace",NAMESPACE); - File f = new File(TestUtil.jsonSchemaLoc + "config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Node Config Property"); - } - - Thread.sleep(35000); - - //Verify property from node specific configuration - Assert.assertEquals("30", config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - config.addConfigurationChangeListener(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, new NodePropValListener()); - - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, "80"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Updated Node Config Property"); - } - - Thread.sleep(35000); - - //Verify change listenere is invoked when node specific configuration is changed. - Assert.assertEquals("80", updatedValue); - - } - - private class NodePropValListener implements ConfigurationChangeListener { - @Override - public void notify(String key, Object oldValue, Object newValue) { - System.out.println("received notification::oldValue=="+oldValue+" newValue=="+newValue); - updatedValue = newValue.toString(); - } - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - if(f.exists()) { - f.delete(); - } - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationOnPropValTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationOnPropValTest.java deleted file mode 100644 index 7354cd19f7..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/NotificationOnPropValTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Properties; - -/** - * Pre-requisite - set -Dconfig.location=${"user.home"}/TestResources/ while running test - * Scenario 14 - Verify Change Notifications for any change in the registered key - * Created by sheetalm on 10/14/2016. - */ -public class NotificationOnPropValTest { - - public final static String NAMESPACE = "NotificationOnPropVal"; - - private String updatedValue = null; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testNotification() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - - System.out.println(config.getAsString(NAMESPACE,ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - config.addConfigurationChangeListener(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, new PropValListener()); - - Properties props = new Properties(); - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, "20"); - props.setProperty("_config.namespace",NAMESPACE); - props.setProperty("_config.mergeStrategy","override"); - File f = new File(TestUtil.jsonSchemaLoc + "config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Override Config Property at Conventional Resource"); - } - - Thread.sleep(35000); - - System.out.println(config.getAsString(NAMESPACE,ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - Assert.assertEquals("20" , updatedValue); - } - - private class PropValListener implements ConfigurationChangeListener { - @Override - public void notify(String key, Object oldValue, Object newValue) { - System.out.println("received notification::oldValue=="+oldValue+" newValue=="+newValue); - updatedValue = newValue.toString(); - } - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - if(f.exists()) { - f.delete(); - } - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ResourceChangeNotificationTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ResourceChangeNotificationTest.java deleted file mode 100644 index e3e4e24f28..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ResourceChangeNotificationTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.openecomp.config.test; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.ConfigTestConstant; - -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; - -/** - * Scenario 7 - * Test to Validate notification on changes to the underlying source - * Resource here is GeneratorsList.json ehich is created in test itself - */ - -public class ResourceChangeNotificationTest { - - String newValue = null; - - public final static String NAMESPACE = "Notification"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testNotification() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - config.addConfigurationChangeListener(NAMESPACE,ConfigTestConstant.ARTIFACT_JSON_SCHEMA, new MyListener()); - updateJsonInFile(); - Thread.sleep(35000); - String newValue = config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_JSON_SCHEMA); - - Assert.assertEquals("{name:\"updated SCM\"}",newValue); - - Assert.assertEquals( "14",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH )); - - Assert.assertEquals( "a-zA-Z", config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_UPPER )); - - String artifactConsumer = config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_CONSUMER ); - Assert.assertEquals(artifactConsumer,config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_CONSUMER_APPC )); - - List<String> expectedExtList = new ArrayList<String>(); - expectedExtList.add("pdf"); expectedExtList.add("zip"); expectedExtList.add("xml"); - List<String> extList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_EXT); - Assert.assertEquals(expectedExtList, extList); - - List<String> expectedEncList = new ArrayList<String>(); - expectedEncList.add("Base64"); expectedEncList.add("MD5"); - List<String> encList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_ENC); - Assert.assertEquals(expectedEncList, encList); - - List<String> expectedLocList = new ArrayList<String>(); - expectedLocList.add("/opt/spool"); expectedLocList.add(System.getProperty("user.home")+"/asdc"); - List<String> locList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_LOC); - Assert.assertEquals(expectedLocList, locList); - - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); - } - - class MyListener implements ConfigurationChangeListener{ - @Override - public void notify(String key, Object oldValue, Object newValue) { - System.out.println("received notification::oldValue=="+oldValue+" newValue=="+newValue); - } - } - - private void updateJsonInFile() throws IOException{ - String data = "{name:\"updated SCM\"}"; - TestUtil.writeFile(data); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/UnregisterNotificationTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/UnregisterNotificationTest.java deleted file mode 100644 index e387f13e93..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/UnregisterNotificationTest.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationChangeListener; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Properties; - -/** - * Pre-requisite - set -Dconfig.location=${"user.home"}/TestResources/ while running test - * Created by sheetalm on 10/19/2016. - * Scenario 24 - * Unregister notification and verify listener - */ -public class UnregisterNotificationTest { - public final static String NAMESPACE = "UnregisterNotification"; - - private String updatedValue = null; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testNotification() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - - System.out.println(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - PropertyListener propListener = new PropertyListener(); - config.addConfigurationChangeListener(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH,propListener); - - updateValue("20"); - - Thread.sleep(35000); - - System.out.println(config.getAsString(NAMESPACE,ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - //Verify listener is invoked and updated value to 20 - Assert.assertEquals("20" , updatedValue); - - config.removeConfigurationChangeListener(NAMESPACE,ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH,propListener); - - updateValue("22"); - - Thread.sleep(35000); - - //When listener is unregistered updating value does not invoke any listener and value from listener should remain unchanged - Assert.assertEquals("20" , updatedValue); - - //Verify value is updated even if listener is unregistered - Assert.assertEquals("22" , config.getAsString(NAMESPACE,ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - } - - private void updateValue(String newValue) throws IOException { - Properties props = new Properties(); - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, newValue); - props.setProperty("_config.namespace",NAMESPACE); - props.setProperty("_config.mergeStrategy","override"); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Override Config Property at Conventional Resource"); - } - } - - private class PropertyListener implements ConfigurationChangeListener { - @Override - public void notify(String key, Object oldValue, Object newValue) { - System.out.println("received notification::oldValue=="+oldValue+" newValue=="+newValue); - updatedValue = newValue.toString(); - } - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - if(f.exists()) { - f.delete(); - } - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateDefaultModeTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateDefaultModeTest.java deleted file mode 100644 index 7ae2e0a644..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateDefaultModeTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import static org.openecomp.config.util.ConfigTestConstant.*; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/17/2016. - * - * Scenario 22 - * Validate the default mode if the mode is not set - */ -public class ValidateDefaultModeTest { - - public static final String NAMESPACE = "defaultmode"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithValidateDefaultMode(){ - Configuration config = ConfigurationManager.lookup(); - - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_NAME_MAXLENGTH ), "14"); - - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_MAXSIZE ), "1048"); - - List<String> expectedExtList = new ArrayList<String>(); - expectedExtList.add("pdf"); - expectedExtList.add("tgz"); - expectedExtList.add("xls"); - List<String> extList = config.getAsStringValues(NAMESPACE, ConfigTestConstant.ARTIFACT_EXT); - Assert.assertEquals(expectedExtList, extList); - - Assert.assertEquals(config.getAsString(NAMESPACE, ARTIFACT_NAME_MINLENGTH ), "6"); - - } - - @After - public void tearDown() throws Exception { - String data = "{name:\"SCM\"}"; - writeFile(data); - // ConfigurationUtils.executeDDLSQL("truncate dox.configuration"); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateNodeConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateNodeConfigTest.java deleted file mode 100644 index 8f7d703468..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/ValidateNodeConfigTest.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.openecomp.config.util.ConfigTestConstant; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Properties; - -/** - * Scenario 13 - * Validate node specific configuration - * Pre-requisite - set -Dnode.config.location=${"user.home"}/TestResources/ while running test - * - * Created by sheetalm on 10/14/2016. - */ -public class ValidateNodeConfigTest { - - public final static String NAMESPACE = "ValidateNodeConfig"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - } - - @Test - public void testValidateNodeConfig() throws IOException, InterruptedException { - Configuration config = ConfigurationManager.lookup(); - - Properties props = new Properties(); - props.setProperty(ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH, "56"); - props.setProperty("_config.namespace","ValidateNodeConfig"); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - try (OutputStream out = new FileOutputStream(f)) { - props.store(out, "Node Config Property"); - } - - System.out.println(System.getProperty("node.config.location")); - - Thread.sleep(35000); - - //Verify property from node specific configuration - Assert.assertEquals("56", config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH)); - - //Verify if property is not in node specific then fetch from namespace - //Assert.assertEquals("a-zA-Z",config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_UPPER)); - - //Verify if property is not in node specific and namespace then fetch from global - Assert.assertEquals("1024", config.getAsString(NAMESPACE, "maxCachedBufferSize")); - - //Deleting node configurations to test property is fetched from namespace configuration when node configuration is not present - if(f.exists()) { - boolean isDeleted = f.delete(); - System.out.println(isDeleted); - } - - Thread.sleep(35000); - - Assert.assertEquals(config.getAsString(NAMESPACE, ConfigTestConstant.ARTIFACT_NAME_MAXLENGTH), "14"); - } - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - File f = new File(TestUtil.jsonSchemaLoc+"config.properties"); - if(f.exists()) { - f.delete(); - } - } - -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/XMLConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/XMLConfigTest.java deleted file mode 100644 index 8af5ebf89d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/XMLConfigTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; - -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/14/2016. - * - * Scenario 2 - * Validate configuration with XML file format with mode - */ -public class XMLConfigTest { - - public static final String NAMESPACE = "XMLConfig"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithXMLFileFormat(){ - validateConfiguraton(NAMESPACE); - } - - - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/YAMLConfigTest.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/YAMLConfigTest.java deleted file mode 100644 index bc172b0eb7..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/test/YAMLConfigTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.openecomp.config.test; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; - -import static org.openecomp.config.util.TestUtil.validateConfiguraton; -import static org.openecomp.config.util.TestUtil.writeFile; - -/** - * Created by ARR on 10/14/2016. - * - * Scenario 4 - * Validate configuration with YAML file format with mode - */ -public class YAMLConfigTest { - - public static final String NAMESPACE = "YAMLConfig"; - - @Before - public void setUp() throws IOException { - String data = "{name:\"SCM\"}"; - writeFile(data); - } - - @Test - public void testConfigurationWithYAMLFileFormat(){ - validateConfiguraton(NAMESPACE); - } - - - - @After - public void tearDown() throws Exception { - TestUtil.cleanUp(); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/ConfigTestConstant.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/ConfigTestConstant.java deleted file mode 100644 index d639ccad42..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/ConfigTestConstant.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.openecomp.config.util; - -public class ConfigTestConstant { - - public static final String ARTIFACT_NAME_MAXLENGTH = "artifact.name.maxlength"; - public static final String ARTIFACT_MAXSIZE = "artifact.maxsize"; - public static final String ARTIFACT_EXT = "artifact.extension"; - public static final String ARTIFACT_ENC = "artifact.supportedEncryption"; - public static final String ARTIFACT_NAME_UPPER = "artifact.name.allowedChar"; - public static final String ARTIFACT_NAME_LOWER = "artifact.name.allowedchar"; - public static final String ARTIFACT_STATUS = "artifact.status"; - public static final String ARTIFACT_LOC = "artifact.persistLocation"; - public static final String ARTIFACT_JSON_SCHEMA = "artifact.jsonSchema"; - public static final String ARTIFACT_XML_SCHEMA = "artifact.xmlSchema"; - public static final String ARTIFACT_CONSUMER_APPC = "artifact.consumerAPPC"; - public static final String ARTIFACT_CONSUMER = "artifact.consumer"; - public static final String ARTIFACT_MANDATORY_NAME = "artifact.mandatory.name"; - public static final String ARTIFACT_NAME_MINLENGTH = "artifact.name.minlength"; - public static final String ARTIFACT_ENCODED = "artifact.encoded"; - - public static final String ONBOARDING_NAMESPACE = "onboarding"; - -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/TestUtil.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/TestUtil.java deleted file mode 100644 index a04f14cb84..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/java/org/openecomp/config/util/TestUtil.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.openecomp.config.util; - -import org.openecomp.config.ConfigurationUtils; -import org.openecomp.config.api.Configuration; -import org.openecomp.config.api.ConfigurationManager; -import org.junit.Assert; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import static org.openecomp.config.util.ConfigTestConstant.*; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_ENCODED; -import static org.openecomp.config.util.ConfigTestConstant.ARTIFACT_MANDATORY_NAME; - -/** - * Created by sheetalm on 10/13/2016. - */ -public class TestUtil { - - public final static String jsonSchemaLoc = System.getProperty("user.home")+"/TestResources/"; - public static FileWriter fileWriter ; - - public static void writeFile(String data) throws IOException { - File dir = new File(jsonSchemaLoc); - File file = null; - dir.mkdirs(); - file = new File(jsonSchemaLoc+"/GeneratorsList.json"); - file.createNewFile(); - fileWriter = new FileWriter(file); - fileWriter.write(data); - fileWriter.close(); - } - - public static void cleanUp() throws Exception { - String data = "{name:\"SCM\"}"; - TestUtil.writeFile(data); - //ConfigurationUtils.executeDdlSql("truncate dox.configuration"); - try{ - ConfigurationUtils.executeDdlSql("truncate dox.configuration_change"); - } - catch(Exception e){ - e.printStackTrace(); - } - - } - - public static void validateConfiguraton(String nameSpace) { - Configuration config = ConfigurationManager.lookup(); - - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_MAXLENGTH ), "14"); - - // First value from list is picked from Merge properties - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_MAXSIZE ), "1048576"); - - List<String> expectedExtList = new ArrayList<String>(); - expectedExtList.add("pdf"); - expectedExtList.add("zip"); - expectedExtList.add("xml"); - expectedExtList.add("pdf"); - expectedExtList.add("tgz"); - expectedExtList.add("xls"); - List<String> extList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_EXT); - Assert.assertEquals(expectedExtList, extList); - - List<String> expectedEncList = new ArrayList<String>(); - expectedEncList.add("Base64"); - expectedEncList.add("MD5"); - List<String> encList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_ENC); - Assert.assertEquals(expectedEncList, encList); - - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_UPPER ), "a-zA-Z_0-9"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_LOWER ), "a-zA-Z"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_STATUS ), "deleted"); - - List<String> expectedLocList = new ArrayList<String>(); - expectedLocList.add("/opt/spool"); - expectedLocList.add(System.getProperty("user.home")+"/asdc"); - List<String> locList = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_LOC); - Assert.assertEquals(expectedLocList, locList); - - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_JSON_SCHEMA ), "@GeneratorList.json"); - - Assert.assertEquals("@"+System.getenv("Path")+"/myschema.json",config.getAsString(nameSpace, ConfigTestConstant.ARTIFACT_XML_SCHEMA)); - - List<String> artifactConsumer = config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER ); - Assert.assertEquals(config.getAsStringValues(nameSpace, ConfigTestConstant.ARTIFACT_CONSUMER_APPC ), artifactConsumer); - - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_NAME_MINLENGTH ), "6"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_MANDATORY_NAME ), "true"); - Assert.assertEquals(config.getAsString(nameSpace, ARTIFACT_ENCODED ), "true"); - } -} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config-NS.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config-NS.properties deleted file mode 100644 index a50cabc151..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config-NS.properties +++ /dev/null @@ -1,12 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=OPENECOMP:CLI
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.json deleted file mode 100644 index 5d98a327db..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{"namespace": "OPENECOMP:CLI", "mergeStrategy": "union"} - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -maxCachedBufferSize=1024 -artifact.maxsize=1024 -artifact.name.maxlength=28
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.xml deleted file mode 100644 index 2f09871bd5..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - <_config> - <namespace>OPENECOMP:CLI</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> - </artifact> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.yaml deleted file mode 100644 index 4333f3e83e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLI/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" -_config: - namespace: "OPENECOMP:CLI" - mergeStrategy: "override"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties deleted file mode 100644 index 32da54ffbc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties +++ /dev/null @@ -1,12 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=OPENECOMP:CLIFallback
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.json deleted file mode 100644 index a1db251671..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{"namespace": "OPENECOMP:CLIFallback", "mergeStrategy": "union"} - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -maxCachedBufferSize=1024 -artifact.maxsize=1024 -artifact.name.maxlength=28
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.xml deleted file mode 100644 index 4c46762cdd..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - <_config> - <namespace>OPENECOMP:CLIFallback</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> - </artifact> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.yaml deleted file mode 100644 index b0b195f354..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/CLIFallback/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" -_config: - namespace: "OPENECOMP:CLIFallback" - mergeStrategy: "override"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.json deleted file mode 100644 index c909fe8466..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config": {"namespace": "DynamicConfiguration", "mergeStrategy": "union"} -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties deleted file mode 100644 index c3825487a9..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties +++ /dev/null @@ -1,13 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=DynamicConfiguration
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml deleted file mode 100644 index 3f046e232b..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - <_config> - <namespace>DynamicConfiguration</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> - </artifact> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml deleted file mode 100644 index 12ba1f093e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" -encoded: true -consumer: "appc,catalog" -_config: - namespace: "DynamicConfiguration" - mergeStrategy: "override" diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties deleted file mode 100644 index b7e985b90a..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties +++ /dev/null @@ -1,13 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=FallbackToGlobalNS
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json deleted file mode 100644 index 6f3d68ab75..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{"namespace": "FallbackToGlobalNS" , "mergeStrategy": "union"} - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -maxCachedBufferSize=1024 -artifact.maxsize=1024 -artifact.name.maxlength=28
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml deleted file mode 100644 index 9a881ab4a7..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>FallbackToGlobalNS</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> - -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml deleted file mode 100644 index 46f50b6087..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" - _config: - namespace: "FallbackToGlobalNS" - mergeStrategy: "override" diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json deleted file mode 100644 index e59e65855c..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { "mergeStrategy": "union","namespace":"GlobalAndNSConfig" } - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties deleted file mode 100644 index 1a86f68a65..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties +++ /dev/null @@ -1,10 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64, MD5 -artifact.name.allowedChar=a-zA-Z -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=GlobalAndNSConfig
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml deleted file mode 100644 index d8292c167e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>GlobalAndNSConfig</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml deleted file mode 100644 index bbbdde22a4..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml +++ /dev/null @@ -1,7 +0,0 @@ - artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" - _config: - mergeStrategy: "override"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json deleted file mode 100644 index 9c335724bc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "artifact": { - "name": { "maxlength": "28" }, - "maxsize": "1048576", - "extension": "gz,tgz", - "supportedencryption": "Base64", - "status": "deleted", - "mandatory": { "name": "true" } - }, - "_config": { - "namespace": "JSONConfig", - "mergeStrategy": "merge" - } - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json deleted file mode 100644 index c324fc777c..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "artifact": { - "name": { "allowedChar": "a-zA-Z_0-9" }, - "encoded": "true", - "consumer": "appc,catalog" - }, - "_config": { - "namespace": "JSONConfig", - "mergeStrategy": "override" - } -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json deleted file mode 100644 index 05a7e2d7ff..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { - "namespace": "JSONConfig", - "mergeStrategy": "union" - } -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config.json deleted file mode 100644 index 0538ba1717..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/JSONConfiguration/config.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "artifact": { - "name": { - "maxlength": "14", - "allowedChar": "a-zA-Z", - "allowedchar": "a-zA-Z" - }, - "extension": [ - "pdf", - "zip,xml" - - ], - "supportedEncryption": [ - "Base64", - "MD5" - ], - "status": [ - "deleted", - "Deleted" - ], - "persistLocation": "/opt/spool,${sys:user.home}/asdc", - "jsonSchema": "@GeneratorList.json", - "xmlSchema": "@${env:path}/myschema.json", - "consumerAPPC": "${artifact.consumer}" - - }, - "_config": { - "namespace": "JSONConfig" - } -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties deleted file mode 100644 index 5082081102..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties +++ /dev/null @@ -1,9 +0,0 @@ -artifact.name.maxlength=28 -artifact.maxsize=1048576 -artifact.extension=gz, tgz -artifact.supportedencryption=Base64 -artifact.mandatory.name=true -artifact.length=2 -_config.namespace=LoadOrderConfiguration -_config.mergeStrategy=merge -_config.loadOrder=2
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties deleted file mode 100644 index 45018269dd..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties +++ /dev/null @@ -1,7 +0,0 @@ -artifact.name.allowedChar=a-zA-Z_0-9 -artifact.encoded=true -artifact.consumer=appc, catalog -artifact.size=75 -_config.namespace=LoadOrderConfiguration -_config.mergeStrategy=override -_config.loadOrder=1
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties deleted file mode 100644 index cb5d5968f5..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties +++ /dev/null @@ -1,5 +0,0 @@ -artifact.maxsize=1048 -artifact.extension=pdf,tgz, xls -artifact.name.minlength=6 -_config.namespace=LoadOrderConfiguration -_config.mergeStrategy=union
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties deleted file mode 100644 index 79d0815a39..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties +++ /dev/null @@ -1,9 +0,0 @@ -artifact.name.maxlength=28 -artifact.maxsize=1048576 -artifact.extension=gz, tgz -artifact.supportedencryption=Base64 -artifact.mandatory.name=true -artifact.length=5 -_config.namespace=LoadOrderConfiguration -_config.mergeStrategy=merge -_config.loadOrder=1
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties deleted file mode 100644 index 164706dba7..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties +++ /dev/null @@ -1,7 +0,0 @@ -artifact.name.allowedChar=a-zA-Z_0-9 -artifact.encoded=true -artifact.consumer=appc, catalog -artifact.size=56 -_config.namespace=LoadOrderConfiguration -_config.mergeStrategy=override -_config.loadOrder=2
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties deleted file mode 100644 index ae1f445efd..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties +++ /dev/null @@ -1,14 +0,0 @@ -artifact.name.maxlength=14 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=LoadOrderConfiguration diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json deleted file mode 100644 index 7c6d552b82..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { "mergeStrategy": "union" , "namespace":"ModeAsConfigProp" } -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties deleted file mode 100644 index a82e6b23fe..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties +++ /dev/null @@ -1,10 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf,zip,xml -artifact.supportedEncryption=Base64,MD5 -artifact.name.allowedChar=a-zA-Z -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=ModeAsConfigProp
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml deleted file mode 100644 index 2d05d2724c..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>ModeAsConfigProp</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml deleted file mode 100644 index ef08bba6ce..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" -_config: - mergeStrategy: "override" - namespace: "ModeAsConfigProp"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NodeCLI/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NodeCLI/config.properties deleted file mode 100644 index 435f98ab39..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NodeCLI/config.properties +++ /dev/null @@ -1,9 +0,0 @@ -artifact.name.maxlength=30 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.name.allowedChar=a-zA-Z -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=NodeCLI
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/Notification/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/Notification/config.properties deleted file mode 100644 index 4076eefa58..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/Notification/config.properties +++ /dev/null @@ -1,15 +0,0 @@ -artifact.name.maxlength=14 -artifact.consumer=APPC -artifact.maxsize=1048 -artifact.extension=pdf,zip,xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool,${sys:user.home}/asdc -artifact.jsonSchema=@${sys:user.home}/TestResources/GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=Notification
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip Binary files differdeleted file mode 100644 index 42d14a64db..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip +++ /dev/null diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json deleted file mode 100644 index 0d6395af4f..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{ - "namespace": "NotificationForNodeConfig", - "mergestrategy": "union" - } - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties deleted file mode 100644 index d2c41aa4b5..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties +++ /dev/null @@ -1,14 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=NotificationForNodeConfig - diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml deleted file mode 100644 index 20768aa949..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>NotificationForNodeConfig</namespace> - <mergestrategy>merge</mergestrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml deleted file mode 100644 index ee85a0c68d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" -_config: - namespace: "NotificationForNodeConfig" - mergestrategy: "override"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties deleted file mode 100644 index 279d407664..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties +++ /dev/null @@ -1,13 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=NotificationOnPropVal
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json deleted file mode 100644 index fc7f2347aa..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - - "_config": { "mergeStrategy": "union","namespace":"NotificationOnPropVal" } - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -maxCachedBufferSize=1024 -artifact.maxsize=1024 -artifact.name.maxlength=28
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml deleted file mode 100644 index e3a24fbc32..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>NotificationOnPropVal</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> - </configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml deleted file mode 100644 index 7283df4ecb..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml +++ /dev/null @@ -1,9 +0,0 @@ - - artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" - _config: - mergeStrategy: "override" - namespace: "NotificationOnPropVal"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json deleted file mode 100644 index 42c6be91b9..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { "mergeStrategy": "union","namespace":"SourceLocation" } - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties deleted file mode 100644 index 22c9840fad..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties +++ /dev/null @@ -1,14 +0,0 @@ -artifact.name.maxlength=14 -artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=SourceLocation
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml deleted file mode 100644 index 1162af576e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <maxsize>1048576</maxsize> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>SourceLocation</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml deleted file mode 100644 index 4e073ce7f9..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml +++ /dev/null @@ -1,8 +0,0 @@ -artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" -_config: - mergeStrategy: "override" - namespace: "SourceLocation"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties deleted file mode 100644 index 40b4518945..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties +++ /dev/null @@ -1,13 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=UnregisterNotification
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.json deleted file mode 100644 index 3e0464016d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - - "_config": { "mergeStrategy": "union","namespace":"UnregisterNotification" } - -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -maxCachedBufferSize=1024 -artifact.maxsize=1024 -artifact.name.maxlength=28
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.xml deleted file mode 100644 index 1153658161..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>UnregisterNotification</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> - </configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml deleted file mode 100644 index 1deb37ac7a..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml +++ /dev/null @@ -1,9 +0,0 @@ - - artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" - _config: - mergeStrategy: "override" - namespace: "UnregisterNotification"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json deleted file mode 100644 index 72833024c4..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "artifact": { - "name": { - "minlength": "6" - }, - "extension": "pdf,tgz,xls" - } -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties deleted file mode 100644 index c857da38e9..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties +++ /dev/null @@ -1,2 +0,0 @@ -artifact.name.maxlength=14 -artifact.maxsize=1048
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties deleted file mode 100644 index a782e25835..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties +++ /dev/null @@ -1,13 +0,0 @@ -artifact.name.maxlength=14 -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorsList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=ValidateNodeConfig
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties +++ /dev/null @@ -1,3 +0,0 @@ -maxCachedBufferSize=1024 -artifact.maxsize=1024 -artifact.name.maxlength=28
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml deleted file mode 100644 index 320e53348d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <maxsize>1048576</maxsize> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> - <_config> - <namespace>XMLConfig</namespace> - <mergeStrategy>merge</mergeStrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml deleted file mode 100644 index 508c920b83..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <allowedChar>a-zA-Z_0-9</allowedChar> - </name> - <encoded>true</encoded> - <consumer>appc,catalog</consumer> - </artifact> - <_config> - <namespace>XMLConfig</namespace> - <mergeStrategy>override</mergeStrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml deleted file mode 100644 index 962bd342f3..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <minlength>6</minlength> - </name> - <maxsize>1048</maxsize> - <extension>pdf,tgz,xls</extension> - </artifact> - <_config> - <namespace>XMLConfig</namespace> - <mergeStrategy>union</mergeStrategy> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config.xml deleted file mode 100644 index 2fff65b2e0..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/XMLConfiguration/config.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>14</maxlength> - <allowedChar>a-zA-Z</allowedChar> - <allowedchar>a-zA-Z</allowedchar> - </name> - <!-- <maxsize></maxsize>--> - <extension>pdf</extension> - <extension>zip,xml</extension> - - <supportedEncryption>Base64</supportedEncryption> - <supportedEncryption>MD5</supportedEncryption> - <status>deleted</status> - <status>Deleted</status> - <persistLocation>/opt/spool,${sys:user.home}/asdc</persistLocation> - <jsonSchema>@GeneratorList.json</jsonSchema> - <xmlSchema>@${env:path}/myschema.json</xmlSchema> - <consumerAPPC>${artifact.consumer}</consumerAPPC> - </artifact> - <_config> - <namespace>XMLConfig</namespace> - </_config> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml deleted file mode 100644 index 8ff08cdc43..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml +++ /dev/null @@ -1,12 +0,0 @@ - artifact: - name: - maxlength: 28 - maxsize: 1048576 - extension: "gz,tgz" - supportedencryption: Base64 - status: deleted - mandatory: - name: true - _config: - namespace: YAMLConfig - mergeStrategy: merge
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml deleted file mode 100644 index 051d41d76b..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml +++ /dev/null @@ -1,8 +0,0 @@ - artifact: - name: - allowedChar: "a-zA-Z_0-9" - encoded: true - consumer: "appc,catalog" - _config: - namespace: YAMLConfig - mergeStrategy: override
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml deleted file mode 100644 index 8a9ab0e13e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml +++ /dev/null @@ -1,8 +0,0 @@ - artifact: - name: - minlength: 6 - maxsize: 1048 - extension: "pdf,tgz,xls" - _config: - namespace: YAMLConfig - mergeStrategy: union
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml deleted file mode 100644 index 706b22db5e..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -artifact: - name: - maxlength: 14 - allowedChar: "a-zA-Z" - allowedchar: "a-zA-Z" - #maxsize: "" - extension: - - - pdf - - - zip,xml - supportedEncryption: - - - Base64 - - - MD5 - status: - - - deleted - - - Deleted - persistLocation: "/opt/spool,${sys:user.home}/asdc" - jsonSchema: "@GeneratorList.json" - xmlSchema: "@${env:path}/myschema.json" - consumerAPPC: "${artifact.consumer}" -_config: - namespace: YAMLConfig
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties deleted file mode 100644 index cfe91e6c7d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/config-system.properties +++ /dev/null @@ -1,22 +0,0 @@ -driverClassName=com.github.adejanovski.cassandra.jdbc.CassandraDriver -jdbcURL=jdbc:${dbname}://${dbhost}:${dbport}/${configdb} -dbuser= -dbpassword= -config.Table=configuration -config.monitor.Table=configuration_change -configKey=key -configValue=value -configNameColumn=name -configdb=dox -dbhost= -dbport=9042 -dbname=cassandra -createtablecql=create table if not exists ${configdb}.${config.Table} (name text\, key text\, value text\, PRIMARY KEY (name\, key)) with clustering order by (key asc) -createmonitoringtablecql=create table if not exists ${configdb}.${config.monitor.Table} (name text\, changed_when bigint\, key text\, old_value text\, new_value text\, PRIMARY KEY (name\, changed_when)) with clustering order by (changed_when desc) -insertconfigurationchangecql=insert into ${configdb}.${config.monitor.Table} (name\, changed_when\, key\, old_value\, new_value) values(?\, ?\, ?\, ?\, ?) -fetchkeysql=select ${configKey} from ${config.Table} where ${configNameColumn}=? -fetchlastchangecql=select changed_when from ${configdb}.${config.monitor.Table} where name=? limit 1 -fetchnamescql=select distinct name from ${configdb}.${config.Table} -config.size.max=100 -config.refresh.interval=30000 -event.fetch.delay=5000
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml deleted file mode 100644 index 3595efd87b..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <artifact> - <name> - <maxlength>28</maxlength> - </name> - <maxsize>1048576</maxsize> - <extension>gz,tgz</extension> - <supportedencryption>Base64</supportedencryption> - <status>deleted</status> - <mandatory> - <name>true</name> - </mandatory> - </artifact> -</configuration>
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-override.json b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-override.json deleted file mode 100644 index dd6087b70c..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-override.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "artifact": { - "name": { "allowedChar": "a-zA-Z_0-9" }, - "encoded": "true", - "consumer": "appc,catalog" - } -}
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml deleted file mode 100644 index 957b75d40a..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml +++ /dev/null @@ -1,5 +0,0 @@ - artifact: - name: - minlength: 6 - maxsize: 1048 - extension: "pdf,tgz,xls"
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback.properties deleted file mode 100644 index 7839839258..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/fallback/config-fallback.properties +++ /dev/null @@ -1,13 +0,0 @@ -artifact.name.maxlength=14 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-M.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-M.properties deleted file mode 100644 index 8a571ebc89..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-M.properties +++ /dev/null @@ -1,7 +0,0 @@ -artifact.name.maxlength=28 -artifact.maxsize=1048576 -artifact.extension=gz, tgz -artifact.supportedencryption=Base64 -artifact.mandatory.name=true -_config.namespace=javaProperties -_config.mergeStrategy=merge
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-O.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-O.properties deleted file mode 100644 index b27c67a78d..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-O.properties +++ /dev/null @@ -1,5 +0,0 @@ -artifact.name.allowedChar=a-zA-Z_0-9 -artifact.encoded=true -artifact.consumer=appc, catalog -_config.namespace=javaProperties -_config.mergeStrategy=override
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-U.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-U.properties deleted file mode 100644 index 615f2a2093..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config-U.properties +++ /dev/null @@ -1,5 +0,0 @@ -artifact.maxsize=1048 -artifact.extension=pdf,tgz, xls -artifact.name.minlength=6 -_config.namespace=javaProperties -_config.mergeStrategy=union
\ No newline at end of file diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config.properties deleted file mode 100644 index d9051f6ec4..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/java-properties/config.properties +++ /dev/null @@ -1,14 +0,0 @@ -artifact.name.maxlength=14 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z -artifact.name.allowedchar=a-zA-Z -artifact.status=deleted -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=javaProperties diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-at.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-at.properties deleted file mode 100644 index 3bc773369b..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-at.properties +++ /dev/null @@ -1,11 +0,0 @@ -artifact.name.maxlength=20 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.name.allowedChar=a-zA-Z -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=OPENECOMP:tenancy diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-tf.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-tf.properties deleted file mode 100644 index 196bafe4e4..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-tf.properties +++ /dev/null @@ -1,10 +0,0 @@ -artifact.name.maxlength=30 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.name.allowedChar=a-zA-Z -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=Telefonica:tenancy diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-vf.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-vf.properties deleted file mode 100644 index 4c0c6ad897..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config-vf.properties +++ /dev/null @@ -1,11 +0,0 @@ -artifact.name.maxlength=24 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.name.allowedChar=a-zA-Z -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=Vodafone:tenancy diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config.properties b/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config.properties deleted file mode 100644 index 8ed2485dc2..0000000000 --- a/common/openecomp-common-configuration-management/openecomp-configuration-management-test/src/test/resources/multitenancy/config.properties +++ /dev/null @@ -1,11 +0,0 @@ -artifact.name.maxlength=14 -#artifact.maxsize= -artifact.extension=pdf, zip, xml -artifact.supportedEncryption=Base64 -artifact.name.allowedChar=a-zA-Z -artifact.status=Deleted -artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc -artifact.jsonSchema=@GeneratorList.json -artifact.xmlSchema=@${env:path}/myschema.json -artifact.consumerAPPC=${artifact.consumer} -_config.namespace=tenancy |