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.json16
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json16
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json16
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json17
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json19
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml26
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json20
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json20
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json54
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json17
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml26
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json20
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json17
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml32
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json19
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml30
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json17
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml32
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json12
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml32
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml22
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml22
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml42
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml24
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json12
31 files changed, 399 insertions, 361 deletions
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
index 5d98a327db..6fb2d5e786 100644
--- 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
@@ -1,8 +1,12 @@
{
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
- "_config":{"namespace": "OPENECOMP:CLI", "mergeStrategy": "union"}
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml
index 2f09871bd5..4f01b69ead 100644
--- 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
@@ -1,18 +1,18 @@
<?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>
+ <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/CLIFallback/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
index a1db251671..00c1555526 100644
--- 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
@@ -1,8 +1,12 @@
{
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
- "_config":{"namespace": "OPENECOMP:CLIFallback", "mergeStrategy": "union"}
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml
index 4c46762cdd..696f73f68a 100644
--- 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
@@ -1,18 +1,18 @@
<?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>
+ <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/DynamicConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
index c909fe8466..7075a6a531 100644
--- 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
@@ -1,8 +1,12 @@
{
-
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
- "_config": {"namespace": "DynamicConfiguration", "mergeStrategy": "union"}
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml
index 3f046e232b..4ad707d21f 100644
--- 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
@@ -1,18 +1,18 @@
<?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>
+ <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/FallbackToGlobalNS/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
index 6f3d68ab75..165e318d38 100644
--- 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
@@ -1,9 +1,12 @@
{
-
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
- "_config":{"namespace": "FallbackToGlobalNS" , "mergeStrategy": "union"}
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml
index 9a881ab4a7..9e45acf8d4 100644
--- 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
@@ -1,19 +1,19 @@
<?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>
+ <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/GlobalAndNSConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
index e59e65855c..26a5fcac0e 100644
--- 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
@@ -1,10 +1,13 @@
{
-
- "artifact": {
- "name": { "minlength": "6" },
- "maxsize": "1048",
- "extension": "pdf,tgz,xls"
- },
- "_config": { "mergeStrategy": "union","namespace":"GlobalAndNSConfig" }
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml
index d8292c167e..427766bfac 100644
--- 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
@@ -1,16 +1,16 @@
<?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>
+ <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/JSONConfiguration/config-M.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
index 9c335724bc..eb657ec497 100644
--- 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
@@ -1,16 +1,18 @@
{
-
- "artifact": {
- "name": { "maxlength": "28" },
- "maxsize": "1048576",
- "extension": "gz,tgz",
- "supportedencryption": "Base64",
- "status": "deleted",
- "mandatory": { "name": "true" }
- },
- "_config": {
- "namespace": "JSONConfig",
- "mergeStrategy": "merge"
- }
-
+ "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
index c324fc777c..a397a1bcd5 100644
--- 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
@@ -1,11 +1,13 @@
{
- "artifact": {
- "name": { "allowedChar": "a-zA-Z_0-9" },
- "encoded": "true",
- "consumer": "appc,catalog"
- },
- "_config": {
- "namespace": "JSONConfig",
- "mergeStrategy": "override"
- }
+ "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
index 05a7e2d7ff..18fbfb3670 100644
--- 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
@@ -1,11 +1,13 @@
{
- "artifact": {
- "name": { "minlength": "6" },
- "maxsize": "1048",
- "extension": "pdf,tgz,xls"
- },
- "_config": {
- "namespace": "JSONConfig",
- "mergeStrategy": "union"
- }
+ "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
index 0538ba1717..1bb4e330b1 100644
--- 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
@@ -1,30 +1,28 @@
{
- "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"
- }
+ "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/MergeStrategyAsConfigProp/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
index 7c6d552b82..5540296ee4 100644
--- 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
@@ -1,8 +1,13 @@
{
- "artifact": {
- "name": { "minlength": "6" },
- "maxsize": "1048",
- "extension": "pdf,tgz,xls"
- },
- "_config": { "mergeStrategy": "union" , "namespace":"ModeAsConfigProp" }
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml
index 2d05d2724c..74a999a0a5 100644
--- 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
@@ -1,16 +1,16 @@
<?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>
+ <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/NotificationForNodeConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json
index 0d6395af4f..cc6a033b70 100644
--- 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
@@ -1,12 +1,12 @@
{
-
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
- "_config":{
- "namespace": "NotificationForNodeConfig",
- "mergestrategy": "union"
- }
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml
index 20768aa949..7448cb0444 100644
--- 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
@@ -1,18 +1,18 @@
<?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>
+ <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/NotificationOnPropVal/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
index fc7f2347aa..1027e072cc 100644
--- 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
@@ -1,9 +1,12 @@
{
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
-
- "_config": { "mergeStrategy": "union","namespace":"NotificationOnPropVal" }
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml
index e3a24fbc32..cb88bb3363 100644
--- 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
@@ -1,18 +1,18 @@
<?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
+ <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/SourceLocation/appjarconfig.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
index 42c6be91b9..0a955a1396 100644
--- 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
@@ -1,10 +1,13 @@
{
-
- "artifact": {
- "name": { "minlength": "6" },
- "maxsize": "1048",
- "extension": "pdf,tgz,xls"
- },
- "_config": { "mergeStrategy": "union","namespace":"SourceLocation" }
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml
index 1162af576e..11add8c624 100644
--- 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
@@ -1,19 +1,19 @@
<?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>
+ <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>
+ <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/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
index 3e0464016d..998bba0e34 100644
--- 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
@@ -1,9 +1,12 @@
{
- "artifact": {
- "name": { "minlength": "6" },
- "extension": "pdf,tgz,xls"
- },
-
- "_config": { "mergeStrategy": "union","namespace":"UnregisterNotification" }
-
+ "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.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml
index 1153658161..7f929af1bd 100644
--- 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
@@ -1,18 +1,18 @@
<?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
+ <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/ValidateDefaultMode/config-defaultmode.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json
index 72833024c4..19ca08fd1d 100644
--- 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
@@ -1,8 +1,8 @@
{
- "artifact": {
- "name": {
- "minlength": "6"
- },
- "extension": "pdf,tgz,xls"
- }
+ "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/XMLConfiguration/config-M.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml
index 320e53348d..ef9d2e37de 100644
--- 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
@@ -1,19 +1,19 @@
<?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>
+ <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
index 508c920b83..868e2013bf 100644
--- 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
@@ -1,14 +1,14 @@
<?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>
+ <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
index 962bd342f3..6d0192c142 100644
--- 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
@@ -1,14 +1,14 @@
<?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>
+ <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
index 2fff65b2e0..5c6151f880 100644
--- 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
@@ -1,25 +1,25 @@
<?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>
+ <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>
+ <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/fallback/config-fallback-merge.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml
index 3595efd87b..7872097491 100644
--- 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
@@ -1,15 +1,15 @@
<?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>
+ <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
index dd6087b70c..7cdc7632e6 100644
--- 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
@@ -1,7 +1,9 @@
{
- "artifact": {
- "name": { "allowedChar": "a-zA-Z_0-9" },
- "encoded": "true",
- "consumer": "appc,catalog"
- }
+ "artifact": {
+ "name": {
+ "allowedChar": "a-zA-Z_0-9"
+ },
+ "encoded": "true",
+ "consumer": "appc,catalog"
+ }
} \ No newline at end of file