diff options
| author |   Michael Lando <ml636r@att.com> | 2018-07-29 16:13:45 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-07-29 16:20:34 +0300 |
| commit | 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch) | |
| tree | 2f9dfc45191e723da69cf74be7829784e9741b94 /common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp | |
| parent | 9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff) | |
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp')
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 |