summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2021-01-27 19:14:55 +0000
committerGerrit Code Review <gerrit@onap.org>2021-01-27 19:14:55 +0000
commit0a405a9b4515f960d36d254032db680e97ab1e94 (patch)
tree6b8bd025230355eb1caf07885dee14c8d476812c
parenta958d9600cec4c9599d517178457228577542829 (diff)
parent848e92cfd43797c891399319752c9fd07b036f19 (diff)
Merge "Add support for config_volume in blueprint generator"
-rw-r--r--mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/ConfigVolume.java36
-rw-r--r--mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/componentspec/common/Volumes.java5
-rw-r--r--mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java7
-rw-r--r--mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json4
-rw-r--r--mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json55
-rw-r--r--mod/runtimeapi/runtime-core/src/test/data/blueprints/helloworld_no_edits.yaml4
-rw-r--r--mod/runtimeapi/runtime-web/src/test/data/compspecs/componentSpec_hello_world.json6
7 files changed, 105 insertions, 12 deletions
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": [
diff --git a/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json b/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
index 7d576c0..56dbf3a 100644
--- a/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
+++ b/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json
@@ -874,17 +874,10 @@
"type": "array",
"items": {
"type": "object",
- "properties": {
- "host":{
- "type":"object",
- "path": {"type": "string"}
- },
- "container":{
- "type":"object",
- "bind": { "type": "string"},
- "mode": { "type": "string"}
- }
- }
+ "oneOf": [
+ { "$ref": "#/definitions/host_path_volume" },
+ { "$ref": "#/definitions/config_map_volume" }
+ ]
}
}
},
@@ -893,6 +886,46 @@
],
"additionalProperties": false
},
+ "host_path_volume": {
+ "type": "object",
+ "properties": {
+ "host": {
+ "type": "object",
+ "path": {
+ "type": "string"
+ }
+ },
+ "container": {
+ "type": "object",
+ "bind": {
+ "type": "string"
+ },
+ "mode": {
+ "type": "string"
+ }
+ }
+ }
+ },
+ "config_map_volume": {
+ "type": "object",
+ "properties": {
+ "config_volume": {
+ "type": "object",
+ "name": {
+ "type": "string"
+ }
+ },
+ "container": {
+ "type": "object",
+ "bind": {
+ "type": "string"
+ },
+ "mode": {
+ "type": "string"
+ }
+ }
+ }
+ },
"docker_healthcheck_http": {
"properties": {
"type": {
diff --git a/mod/runtimeapi/runtime-core/src/test/data/blueprints/helloworld_no_edits.yaml b/mod/runtimeapi/runtime-core/src/test/data/blueprints/helloworld_no_edits.yaml
index 2bf4bea..6198f36 100644
--- a/mod/runtimeapi/runtime-core/src/test/data/blueprints/helloworld_no_edits.yaml
+++ b/mod/runtimeapi/runtime-core/src/test/data/blueprints/helloworld_no_edits.yaml
@@ -181,6 +181,10 @@ node_templates:
bind: /opt/app/vcc/archive/data
host:
path: /opt/data/DCAE/helloworldpm/vcc-archive
+ - container:
+ bind: /opt/app/etc/config
+ config_volume:
+ name: myConfig
image:
get_input: image
location_id:
diff --git a/mod/runtimeapi/runtime-web/src/test/data/compspecs/componentSpec_hello_world.json b/mod/runtimeapi/runtime-web/src/test/data/compspecs/componentSpec_hello_world.json
index cd394f8..62470ef 100644
--- a/mod/runtimeapi/runtime-web/src/test/data/compspecs/componentSpec_hello_world.json
+++ b/mod/runtimeapi/runtime-web/src/test/data/compspecs/componentSpec_hello_world.json
@@ -126,7 +126,11 @@
"host": {
"path": "/opt/data/DCAE/helloworldpm/vcc-archive"
}
- }
+ },
+ {
+ "container": { "bind": "/opt/app/etc/config" },
+ "config_volume": { "name":"myConfig" }
+ }
]
},