summaryrefslogtreecommitdiffstats
path: root/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources
diff options
context:
space:
mode:
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources')
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties3
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties3
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties3
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml19
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties10
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml16
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml7
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json28
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties9
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties7
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties5
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties9
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties7
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties14
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties10
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml16
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties9
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties15
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zipbin1705 -> 0 bytes
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties14
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties3
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml9
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties14
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml19
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties3
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml18
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml9
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties2
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties3
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml19
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml14
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml14
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml25
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml8
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml27
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties22
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml15
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json9
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml5
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties13
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties7
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties5
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties5
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties14
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties11
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties10
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties11
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties11
83 files changed, 0 insertions, 959 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config-NS.properties
deleted file mode 100644
index a50cabc151..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json
deleted file mode 100644
index 6fb2d5e786..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json
+++ /dev/null
@@ -1,12 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.properties
deleted file mode 100644
index 4daad19dcc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml
deleted file mode 100644
index 4f01b69ead..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.yaml
deleted file mode 100644
index 4333f3e83e..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config-NS.properties
deleted file mode 100644
index 32da54ffbc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
deleted file mode 100644
index 00c1555526..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
+++ /dev/null
@@ -1,12 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.properties
deleted file mode 100644
index 4daad19dcc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml
deleted file mode 100644
index 696f73f68a..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.yaml
deleted file mode 100644
index b0b195f354..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
deleted file mode 100644
index 7075a6a531..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
+++ /dev/null
@@ -1,12 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.properties
deleted file mode 100644
index c3825487a9..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml
deleted file mode 100644
index 4ad707d21f..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.yaml
deleted file mode 100644
index 12ba1f093e..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config-NS.properties
deleted file mode 100644
index b7e985b90a..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
deleted file mode 100644
index 165e318d38..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
+++ /dev/null
@@ -1,12 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.properties
deleted file mode 100644
index 4daad19dcc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml
deleted file mode 100644
index 9e45acf8d4..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.yaml
deleted file mode 100644
index 46f50b6087..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
deleted file mode 100644
index 26a5fcac0e..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
+++ /dev/null
@@ -1,13 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.properties
deleted file mode 100644
index 1a86f68a65..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml
deleted file mode 100644
index 427766bfac..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.yaml
deleted file mode 100644
index bbbdde22a4..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
deleted file mode 100644
index eb657ec497..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
+++ /dev/null
@@ -1,18 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json
deleted file mode 100644
index a397a1bcd5..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json
+++ /dev/null
@@ -1,13 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json
deleted file mode 100644
index 18fbfb3670..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json
+++ /dev/null
@@ -1,13 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json
deleted file mode 100644
index 1bb4e330b1..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json
+++ /dev/null
@@ -1,28 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-M.properties
deleted file mode 100644
index 5082081102..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-O.properties
deleted file mode 100644
index 45018269dd..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-U.properties
deleted file mode 100644
index cb5d5968f5..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-M.properties
deleted file mode 100644
index 79d0815a39..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config-loadorder-O.properties
deleted file mode 100644
index 164706dba7..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/LoadOrderConfiguration/config.properties
deleted file mode 100644
index ae1f445efd..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
deleted file mode 100644
index 5540296ee4..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
+++ /dev/null
@@ -1,13 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.properties
deleted file mode 100644
index a82e6b23fe..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml
deleted file mode 100644
index 74a999a0a5..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.yaml
deleted file mode 100644
index ef08bba6ce..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NodeCLI/config.properties
deleted file mode 100644
index 435f98ab39..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/Notification/config.properties
deleted file mode 100644
index 4076eefa58..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip
deleted file mode 100644
index 42d14a64db..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig.zip
+++ /dev/null
Binary files differ
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json
deleted file mode 100644
index cc6a033b70..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.properties
deleted file mode 100644
index d2c41aa4b5..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml
deleted file mode 100644
index 7448cb0444..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.yaml
deleted file mode 100644
index ee85a0c68d..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config-NS.properties
deleted file mode 100644
index 279d407664..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
deleted file mode 100644
index 1027e072cc..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
+++ /dev/null
@@ -1,12 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.properties
deleted file mode 100644
index 4daad19dcc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml
deleted file mode 100644
index cb88bb3363..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.yaml
deleted file mode 100644
index 7283df4ecb..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
deleted file mode 100644
index 0a955a1396..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
+++ /dev/null
@@ -1,13 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.properties
deleted file mode 100644
index 22c9840fad..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml
deleted file mode 100644
index 11add8c624..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.yaml
deleted file mode 100644
index 4e073ce7f9..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config-NS.properties
deleted file mode 100644
index 40b4518945..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
deleted file mode 100644
index 998bba0e34..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
+++ /dev/null
@@ -1,12 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.properties
deleted file mode 100644
index 4daad19dcc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml
deleted file mode 100644
index 7f929af1bd..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.yaml
deleted file mode 100644
index 1deb37ac7a..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json
deleted file mode 100644
index 19ca08fd1d..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.properties
deleted file mode 100644
index c857da38e9..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config-NS.properties
deleted file mode 100644
index a782e25835..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateNodeConfig/config.properties
deleted file mode 100644
index 4daad19dcc..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml
deleted file mode 100644
index ef9d2e37de..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml
deleted file mode 100644
index 868e2013bf..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml
deleted file mode 100644
index 6d0192c142..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml
deleted file mode 100644
index 5c6151f880..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-M.yaml
deleted file mode 100644
index 8ff08cdc43..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-O.yaml
deleted file mode 100644
index 051d41d76b..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config-U.yaml
deleted file mode 100644
index 8a9ab0e13e..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/YAMLConfiguration/config.yaml
deleted file mode 100644
index 706b22db5e..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/config-system.properties
deleted file mode 100644
index cfe91e6c7d..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml
deleted file mode 100644
index 7872097491..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json
deleted file mode 100644
index 7cdc7632e6..0000000000
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json
+++ /dev/null
@@ -1,9 +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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-union.yaml
deleted file mode 100644
index 957b75d40a..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback.properties
deleted file mode 100644
index 7839839258..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-M.properties
deleted file mode 100644
index 8a571ebc89..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-O.properties
deleted file mode 100644
index b27c67a78d..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config-U.properties
deleted file mode 100644
index 615f2a2093..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/java-properties/config.properties
deleted file mode 100644
index d9051f6ec4..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-at.properties
deleted file mode 100644
index 3bc773369b..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-tf.properties
deleted file mode 100644
index 196bafe4e4..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config-vf.properties
deleted file mode 100644
index 4c0c6ad897..0000000000
--- a/common/onap-common-configuration-management/onap-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/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/multitenancy/config.properties
deleted file mode 100644
index 8ed2485dc2..0000000000
--- a/common/onap-common-configuration-management/onap-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