diff options
Diffstat (limited to 'src')
4 files changed, 22 insertions, 3 deletions
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java index b81e46bf..81e30cf4 100644 --- a/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java +++ b/src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java @@ -60,6 +60,7 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess { private static void generatePayload(JsonObject childObject, Service serviceModel) { generatePayloadPerResource(childObject, "VF", serviceModel); generatePayloadPerResource(childObject, "PNF", serviceModel); + addToJsonArray(childObject, "anyOf", createBlankEntry()); } private static void generateOperation(JsonObject childObject, Service serviceModel) { @@ -113,6 +114,15 @@ public class ToscaMetadataCdsProcess extends ToscaMetadataProcess { addToJsonArray(childObject, "anyOf", schemaAnyOf); } + private static JsonArray createBlankEntry() { + JsonArray result = new JsonArray(); + JsonObject blankObject = new JsonObject(); + blankObject.addProperty("title", "User defined"); + blankObject.add("properties", new JsonObject()); + result.add(blankObject); + return result; + } + private static JsonObject createPayloadProperty(JsonObject workFlow, JsonObject controllerProperties) { JsonObject payloadResult = new JsonObject(); diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java b/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java index e1d493a3..9721e33d 100644 --- a/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java +++ b/src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java @@ -259,6 +259,7 @@ public class ToscaConverterToJsonSchema { JsonObject componentAsItem = child.getJsonSchemaOfToscaElement(nameComponent); if (currentPropertyJsonTemplate.hasFields("properties")) { propertiesInJson.add("items", componentAsItem); + propertiesInJson.addProperty("format", "tabs-top"); } break; } @@ -271,6 +272,7 @@ public class ToscaConverterToJsonSchema { this.extractSpecificFieldFromMap(toscaElementProperty, "entry_schema"); itemContainer.addProperty("type", valueInEntrySchema); propertiesInJson.add("items", itemContainer); + propertiesInJson.addProperty("format", "tabs-top"); } // MAP Case, for now nothing diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.json b/src/test/resources/tosca/new-converter/tca-with-metadata.json index 1b95f8c9..3a700c8e 100644 --- a/src/test/resources/tosca/new-converter/tca-with-metadata.json +++ b/src/test/resources/tosca/new-converter/tca-with-metadata.json @@ -170,7 +170,8 @@ "description": "Version number associated with the threshold" } } - } + }, + "format": "tabs-top" }, "context": { "type": "string", @@ -212,7 +213,8 @@ } } } - } + }, + "format": "tabs-top" } } } diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json index 4cb5bd8c..58dff236 100644 --- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json +++ b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json @@ -292,6 +292,10 @@ } } } + }, + { + "title": "User defined", + "properties": {} } ] }, @@ -588,7 +592,8 @@ "default": "final_success" } } - } + }, + "format": "tabs-top" }, "trigger": { "type": "string", |