diff options
Diffstat (limited to 'mod2/helm-generator/helmchartgenerator-core/src')
3 files changed, 10 insertions, 6 deletions
diff --git a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java index 82d70c8..91fedf5 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java +++ b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java @@ -1,6 +1,6 @@ /* * # ============LICENSE_START======================================================= - * # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved. + * # Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved. * # ================================================================================ * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -96,7 +96,9 @@ public class ComponentSpecParser { utils.putIfNotNull(outerValues, "tlsServer", cs.getAuxilary().getTlsInfo().getUseTls()); } if(cs.getAuxilary() != null && cs.getAuxilary().getLogInfo() != null) { - utils.putIfNotNull(outerValues,"logDirectory", cs.getAuxilary().getLogInfo().get("log_directory")); + Map<String, Object> logPath = new LinkedHashMap<>(); + logPath.put("path", cs.getAuxilary().getLogInfo().get("log_directory")); + outerValues.put("log", logPath); } if(imageUriExistsForFirstArtifact(cs)){ utils.putIfNotNull(outerValues,"image", cs.getArtifacts()[0].getUri()); diff --git a/mod2/helm-generator/helmchartgenerator-core/src/test/input/blueprint/base/values.yaml b/mod2/helm-generator/helmchartgenerator-core/src/test/input/blueprint/base/values.yaml index ea82bbe..cd4c1bf 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/test/input/blueprint/base/values.yaml +++ b/mod2/helm-generator/helmchartgenerator-core/src/test/input/blueprint/base/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -50,7 +50,8 @@ postgres: # log directory where logging sidecar should look for log files # if absent, no sidecar will be deployed -#logDirectory: TBD #/opt/app/VESCollector/logs #DONE +#log: +# path: TBD #/opt/app/VESCollector/logs #DONE # directory where TLS certs should be stored # if absent, no certs will be retrieved and stored diff --git a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java index 8b26d25..e7d8cf2 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java +++ b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java @@ -1,6 +1,6 @@ /* * # ============LICENSE_START======================================================= - * # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved. + * # Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved. * # ================================================================================ * # Licensed under the Apache License, Version 2.0 (the "License"); * # you may not use this file except in compliance with the License. @@ -78,7 +78,8 @@ class ComponentSpecParserTest { private void assertOuterKeyValues(ChartInfo chartInfo) { Map<String, Object> outerKv = chartInfo.getValues(); assertThat(outerKv.get("image")).isEqualTo("nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest"); - assertThat(outerKv.get("logDirectory")).isEqualTo("/opt/app/VESCollector/logs/"); + Map<String, Object> logPath = (Map<String, Object>) chartInfo.getValues().get("log"); + assertThat(logPath.get("path")).isEqualTo("/opt/app/VESCollector/logs/"); assertThat(outerKv.get("certDirectory")).isEqualTo("/opt/app/dcae-certificate/"); assertTrue((Boolean) outerKv.get("tlsServer")); assertTrue((Boolean) outerKv.get("useCmpv2Certificates")); |