diff options
author | vempo <vitaliy.emporopulo@amdocs.com> | 2018-10-28 14:45:46 +0200 |
---|---|---|
committer | vempo <vitaliy.emporopulo@amdocs.com> | 2018-10-28 14:45:46 +0200 |
commit | 2074ab2e8b4416126542c09205d3ca6646ed6718 (patch) | |
tree | ab4e013ce2d30d8e87221b58d673b6525d952dd9 /common/onap-common-configuration-management/onap-configuration-management-core/src/test | |
parent | 313e73a58a9a01bbceb007b6de617fda521bdd6e (diff) |
Removed support of dynamic configuration
Configuration framework will not poll configuration
for changes, and will not notify client code of them.
Also minor cleanup, added unit tests.
Change-Id: I428b23f7acb13c6610390f46aae6e011d6b0ee80
Issue-ID: SDC-1867
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/test')
15 files changed, 1 insertions, 66 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties index abab7891ca..bcc44a7ddd 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/LoadOrderConfiguration/config.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=14 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.supportedEncryption=MD5 diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config-NS.properties deleted file mode 100644 index 87e98be115..0000000000 --- a/common/onap-common-configuration-management/onap-configuration-management-core/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-core/src/test/resources/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.json deleted file mode 100644 index 998bba0e34..0000000000 --- a/common/onap-common-configuration-management/onap-configuration-management-core/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-core/src/test/resources/UnregisterNotification/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.properties deleted file mode 100644 index 4daad19dcc..0000000000 --- a/common/onap-common-configuration-management/onap-configuration-management-core/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-core/src/test/resources/UnregisterNotification/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.xml deleted file mode 100644 index 7f929af1bd..0000000000 --- a/common/onap-common-configuration-management/onap-configuration-management-core/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-core/src/test/resources/UnregisterNotification/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/UnregisterNotification/config.yaml deleted file mode 100644 index 1deb37ac7a..0000000000 --- a/common/onap-common-configuration-management/onap-configuration-management-core/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-core/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml index 10c7c20620..d1441ef0a9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/XMLConfiguration/config.xml @@ -6,7 +6,6 @@ <allowedChar>a-zA-Z</allowedChar> <allowedchar>a-zA-Z</allowedchar> </name> - <!-- <maxsize></maxsize> --> <extension>pdf</extension> <extension>zip,xml</extension> diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml index f483f36734..b28066c78a 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/YAMLConfiguration/config.yaml @@ -3,7 +3,6 @@ artifact: maxlength: 14 allowedChar: "a-zA-Z" allowedchar: "a-zA-Z" - #maxsize: "" extension: - pdf diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties index f8222a3e0c..785b0f94cc 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties @@ -1,3 +1,2 @@ config.size.max=100 -config.refresh.interval=30000 -event.fetch.delay=5000
\ No newline at end of file +config.refresh.interval=30000
\ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties index 0cd81fd212..803403ee82 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/fallback/config-fallback.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=14 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.supportedEncryption=MD5 diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties index 7d6c84b2e9..2f0b132de9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/java-properties/config.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=14 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.supportedEncryption=MD5 diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties index 0c484a640b..6cc0cfbc19 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-at.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=20 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.name.allowedChar=a-zA-Z diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties index d39e688f4c..9abab7446d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-tf.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=30 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.name.allowedChar=a-zA-Z diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties index 3fc228ed16..3ac9aeda84 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config-vf.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=24 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.name.allowedChar=a-zA-Z diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties index cafafccb0a..db64ba7b66 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/multitenancy/config.properties @@ -1,5 +1,4 @@ artifact.name.maxlength=14 -#artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.name.allowedChar=a-zA-Z |