aboutsummaryrefslogtreecommitdiffstats
path: root/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp
diff options
context:
space:
mode:
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp')
-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
2 files changed, 24 insertions, 19 deletions
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