From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 29 Jul 2018 16:13:45 +0300 Subject: re base code Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- .../test/resources/JSONConfiguration/config-M.json | 30 ++++++------ .../test/resources/JSONConfiguration/config-O.json | 20 ++++---- .../test/resources/JSONConfiguration/config-U.json | 20 ++++---- .../test/resources/JSONConfiguration/config.json | 54 +++++++++++----------- 4 files changed, 64 insertions(+), 60 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration') 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 -- cgit 1.2.3-korg