diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2020-01-29 17:38:07 +0000 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-02-18 16:06:10 +0000 |
| commit | 4aa20bc42b7bd98dde15f7594084669eb92412c2 (patch) | |
| tree | 65e9a29c54a600bb2f81bfd36cb15a606f88993a /catalog-be | |
| parent | b2b6accda7c04a5df5029dcf250b8138c231f38e (diff) | |
Configuration file runtime reload
Reloads the backend configuration file when the file
listener catches a change.
Forces validations errors when the configuration file
could not be parsed.
Remove not used configurations.
Change-Id: Ic6fcb2b557d52ec53074c38ab8e0fcfa96e9be67
Issue-ID: SDC-2758
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-be')
5 files changed, 2 insertions, 9 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 07f660b39e..1acae3261b 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -624,8 +624,6 @@ resourceInformationalArtifacts: - CVFC - PNF -resourceInformationalDeployedArtifacts: - unLoggedUrls: - /sdc2/rest/monitoring - /sdc2/rest/healthCheck diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java index 3fd8579c2c..f4eb081b99 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java @@ -33,6 +33,7 @@ import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.util.YamlToObjectConverter; +import org.openecomp.sdc.exception.YamlConversionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -76,7 +77,7 @@ public class DistributionEngine implements IDistributionEngine { * The main method for testing only * @param args */ - public static void main(String[] args) { + public static void main(String[] args) throws YamlConversionException { List<String> servers = new ArrayList<>(); String server = "uebsb91kcdc.it.att.com:3904"; diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 3dca45840a..972f625662 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -614,8 +614,6 @@ resourceInformationalArtifacts: - VFC - CVFC -resourceInformationalDeployedArtifacts: - unLoggedUrls: - /sdc2/rest/healthCheck diff --git a/catalog-be/src/test/resources/config/catalog-be/auth/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/auth/configuration.yaml index 6cbad54ffc..0e68b3294b 100644 --- a/catalog-be/src/test/resources/config/catalog-be/auth/configuration.yaml +++ b/catalog-be/src/test/resources/config/catalog-be/auth/configuration.yaml @@ -508,8 +508,6 @@ resourceInformationalArtifacts: - VFC - CVFC -resourceInformationalDeployedArtifacts: - unLoggedUrls: - /sdc2/rest/healthCheck diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml index b982c384ef..9bd8849ce4 100644 --- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml +++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml @@ -516,8 +516,6 @@ resourceInformationalArtifacts: validForResourceTypes: - PNF -resourceInformationalDeployedArtifacts: - unLoggedUrls: - /sdc2/rest/healthCheck |