aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGervais-Martial Ngueko <gervais-martial.ngueko@intl.att.com>2020-04-02 13:42:00 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-02 13:42:00 +0000
commit8d446271551b11cac19a4f2c848c648f542bf721 (patch)
tree9943f61671a468f9ab6a9bd3debdd4a6325b52ae
parent399e0085449bbf1e3c7fe29e67049a0bcf38860e (diff)
parentf4c8c80c3b6e4da48592fed9de79d285e29744b5 (diff)
Merge "Change generated json schema"
-rw-r--r--src/main/java/org/onap/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java10
-rw-r--r--src/main/java/org/onap/clamp/clds/tosca/update/parser/ToscaConverterToJsonSchema.java2
-rw-r--r--src/test/resources/tosca/new-converter/tca-with-metadata.json6
-rw-r--r--src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json7
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 b81e46bf4..81e30cf43 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 e1d493a35..9721e33d9 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 1b95f8c95..3a700c8ee 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 4cb5bd8c1..58dff236e 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",