From 848e92cfd43797c891399319752c9fd07b036f19 Mon Sep 17 00:00:00 2001 From: Tomasz Pietruszkiewicz Date: Wed, 27 Jan 2021 08:12:10 +0100 Subject: Add support for config_volume in blueprint generator Change-Id: I8160df49d20722d393eacd27049aabbb637ae6f1 Issue-ID: DCAEGEN2-2546 Signed-off-by: Tomasz Pietruszkiewicz --- .../model/componentspec/common/ConfigVolume.java | 36 ++++++++++++++++++++++ .../model/componentspec/common/Volumes.java | 5 +++ .../blueprintgenerator/test/OnapTestUtils.java | 7 +++++ .../src/test/resources/componentspecs/ves.json | 4 +++ 4 files changed, 52 insertions(+) create mode 100644 mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/ConfigVolume.java (limited to 'mod/bpgenerator') diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/ConfigVolume.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/ConfigVolume.java new file mode 100644 index 0000000..23842cc --- /dev/null +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/ConfigVolume.java @@ -0,0 +1,36 @@ +/* + * + * * ============LICENSE_START======================================================= + * * org.onap.dcae + * * ================================================================================ + * * Copyright (c) 2021 Nokia. 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. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END========================================================= + * + * + */ +package org.onap.blueprintgenerator.model.componentspec.common; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@JsonInclude(value = JsonInclude.Include.NON_NULL) +@EqualsAndHashCode +public class ConfigVolume { + + private String name; + +} diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/Volumes.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/Volumes.java index 9e9f9b1..3dd756f 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/Volumes.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/Volumes.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 Nokia. 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. @@ -25,6 +26,7 @@ package org.onap.blueprintgenerator.model.componentspec.common; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -44,6 +46,9 @@ public class Volumes { private Host host; + @JsonProperty("config_volume") + private ConfigVolume configVolume; + private String type; private String name; diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java index 01845ab..4b37ed8 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java @@ -4,6 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. + * * Copyright (c) 2021 Nokia. 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. @@ -44,6 +45,7 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; +import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -364,6 +366,11 @@ public class OnapTestUtils extends BlueprintGeneratorTests { assertNotNull( type + " Blueprint:NodeTemplates:DockerConfig:LiveHealthcheck Section is NULL", onapVolumes); + assertNotNull(type + " Blueprint:NodeTemplates:DockerConfig:Volumes:ConfigVolume:GetName Section is NULL", Arrays.stream(onapVolumes) + .filter(c -> c.getConfigVolume() != null) + .filter(c -> c.getName() != null) + .filter(c -> c.equals("myConfig")) + .findAny()); } /** diff --git a/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json b/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json index 822a7b1..8a64e71 100644 --- a/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json +++ b/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json @@ -316,6 +316,10 @@ "host": { "path": "/opt/logs/DCAE/VESCollector/etc" } + }, + { + "container": { "bind": "/opt/app/etc/config" }, + "config_volume": { "name":"myConfig" } } ], "ports": [ -- cgit 1.2.3-korg