aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/onap')
-rw-r--r--src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java18
-rw-r--r--src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java72
-rw-r--r--src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java7
-rw-r--r--src/main/java/org/onap/clamp/policy/Policy.java23
-rw-r--r--src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java19
-rw-r--r--src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java16
6 files changed, 115 insertions, 40 deletions
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java b/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
index 032edbaa..b0bf8278 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
@@ -23,19 +23,24 @@
package org.onap.clamp.clds.tosca.update;
+import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
import org.yaml.snakeyaml.Yaml;
public class Extractor {
-
- private LinkedHashMap<String, Component> allItems = new LinkedHashMap<>();
+ private LinkedHashMap<String, Component> allItems;
private String source;
+ private String nativeComponent;
@SuppressWarnings("unchecked")
- public Extractor(String toParse) {
+ public Extractor(String toParse, String nativeComponent) throws IOException {
+
this.source = toParse;
+ this.nativeComponent = nativeComponent;
+ allItems = new LinkedHashMap<String, Component>();
getAllAsMaps();
+
}
public LinkedHashMap<String, Component> getAllItems() {
@@ -60,10 +65,17 @@ public class Extractor {
(LinkedHashMap<String, LinkedHashMap<String, Object>>) contentFile;
// Get DataTypes
LinkedHashMap<String, Object> dataTypes = file.get("data_types");
+ dataTypes = (dataTypes == null) ? (new LinkedHashMap<>()) : dataTypes;
// Get Policies : first, get topology and after extract policies from it
LinkedHashMap<String, Object> policyTypes = file.get("policy_types");
// Put the policies and datatypes in the same collection
dataTypes.putAll(policyTypes);
+
+ Object contentNativeFile = yaml.load(nativeComponent);
+ LinkedHashMap<String, Object> dataTypesEmbedded =
+ ((LinkedHashMap<String, LinkedHashMap<String, Object>>) contentNativeFile).get("data_types");
+ dataTypes.putAll(dataTypesEmbedded);
+
parseInComponent(dataTypes);
return dataTypes;
}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java b/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
index 6da55eae..7bf629d6 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
@@ -45,14 +45,16 @@ public class ParserToJson {
* @param nameComponent name components
* @return return
*/
- public JsonObject getJsonProcess(String nameComponent) {
- JsonObject glob = this.getGeneralField(matchComponent(nameComponent));
- if (templates.get("object").hasFields("required")) {
- glob.add("required", this.getRequirements(nameComponent));
+ public JsonObject getJsonProcess(String nameComponent, String typeComponent) {
+ JsonObject glob = new JsonObject();
+
+ if (typeComponent.equals("object")) {
+ glob = this.getFieldAsObject(matchComponent(nameComponent));
}
- if (templates.get("object").hasFields("properties")) {
- glob.add("properties", this.deploy(nameComponent));
+ else {
+ /*glob = this.getFieldAsArray(matchComponent(nameComponent));*/
}
+
return glob;
}
@@ -62,7 +64,7 @@ public class ParserToJson {
* @param component the compo
* @return a json object
*/
- public JsonObject getGeneralField(Component component) {
+ public JsonObject getFieldAsObject(Component component) {
JsonObject globalFields = new JsonObject();
if (templates.get("object").hasFields("title")) {
@@ -76,6 +78,12 @@ public class ParserToJson {
globalFields.addProperty("description", component.getDescription());
}
}
+ if (templates.get("object").hasFields("required")) {
+ globalFields.add("required", this.getRequirements(component.getName()));
+ }
+ if (templates.get("object").hasFields("properties")) {
+ globalFields.add("properties", this.deploy(component.getName()));
+ }
return globalFields;
}
@@ -124,7 +132,7 @@ public class ParserToJson {
for (Entry<String, Property> property : toParse.getProperties().entrySet()) {
if (matchComponent((String) property.getValue().getItems().get("type")) != null) {
jsonSchema.add(property.getValue().getName(),
- this.getJsonProcess((String) property.getValue().getItems().get("type")));
+ this.getJsonProcess((String) property.getValue().getItems().get("type"), "object"));
}
else {
jsonSchema.add(property.getValue().getName(), this.complexParse(property.getValue()));
@@ -166,8 +174,11 @@ public class ParserToJson {
switch (propertyField) {
case "type":
if (currentPropertyTemplate.hasFields(propertyField)) {
- switch ((String) property.getItems().get(propertyField)) {
+ String fieldtype = (String) property.getItems().get(propertyField);
+ switch (fieldtype.toLowerCase()) {
case "list":
+ propertiesInJson.addProperty("type", "array");
+ break;
case "map":
propertiesInJson.addProperty("type", "object");
break;
@@ -180,6 +191,9 @@ public class ParserToJson {
propertiesInJson.addProperty("type", "string");
propertiesInJson.addProperty("format", "date-time");
break;
+ case "float":
+ propertiesInJson.addProperty("type", "number");
+ break;
case "range":
propertiesInJson.addProperty("type", "integer");
if (!checkConstraintPresence(property, "greater_than")
@@ -205,16 +219,38 @@ public class ParserToJson {
currentPropertyTemplate);
break;
case "entry_schema":
+ //Here, a way to check if entry is a component (datatype) or a simple string
if (matchComponent(this.extractSpecificFieldFromMap(property, "entry_schema")) != null) {
+ String nameComponent = this.extractSpecificFieldFromMap(property, "entry_schema");
ParserToJson child = new ParserToJson(components, templates);
- JsonObject componentAsProperty =
- child.getJsonProcess(this.extractSpecificFieldFromMap(property, "entry_schema"));
JsonObject propertiesContainer = new JsonObject();
- propertiesContainer
- .add(this.extractSpecificFieldFromMap(property, "entry_schema"), componentAsProperty);
- if (currentPropertyTemplate.hasFields("properties")) {
- propertiesInJson.add("properties", propertiesContainer);
+
+ switch ((String) property.getItems().get("type")) {
+ case "map": // Get it as an object
+ JsonObject componentAsProperty = child.getJsonProcess(nameComponent,"object");
+ propertiesContainer.add(nameComponent, componentAsProperty);
+ if (currentPropertyTemplate.hasFields("properties")) {
+ propertiesInJson.add("properties", propertiesContainer);
+ }
+ break;
+ default://list : get it as an Array
+ JsonObject componentAsItem = child.getJsonProcess(nameComponent, "object");
+ if (currentPropertyTemplate.hasFields("properties")) {
+ propertiesInJson.add("items", componentAsItem);
+ }
+ break;
}
+
+ }
+ // Native cases
+ else if (property.getItems().get("type").equals("list")) {
+ JsonObject itemContainer = new JsonObject();
+ String valueInEntrySchema = this.extractSpecificFieldFromMap(property, "entry_schema");
+ itemContainer.addProperty("type", valueInEntrySchema);
+ propertiesInJson.add("items", itemContainer);
+ }
+ else {//map
+ // propertiesInJson.add("key?", valueInEntrySchema);
}
break;
default://Each classical field : type, description, default..
@@ -236,8 +272,10 @@ public class ParserToJson {
*/
public Component matchComponent(String name) {
Component correspondingComponent = null;
- Collection<Component> listofComponent = components.values();
- for (Component component : listofComponent) {
+ if (components == null) {
+ return null;
+ }
+ for (Component component : components.values()) {
if (component.getName().equals(name)) {
correspondingComponent = component;
}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
index 4b510cb7..ce5cdb81 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
@@ -46,9 +46,10 @@ public class TemplateManagement {
* @param templateProperties template properties as string
* @throws IOException in case of failure
*/
- public TemplateManagement(String yamlContent, String templateProperties) throws IOException {
+ public TemplateManagement(String yamlContent, String nativeComponent, String templateProperties)
+ throws IOException {
if (yamlContent != null && !yamlContent.isEmpty()) {
- this.extractor = new Extractor(yamlContent);
+ this.extractor = new Extractor(yamlContent, nativeComponent);
this.components = extractor.getAllItems();
this.templates = initializeTemplates(templateProperties);
}
@@ -155,7 +156,7 @@ public class TemplateManagement {
if (parserToJson.matchComponent(componentName) == null) {
throw new UnknownComponentException(componentName);
}
- return parserToJson.getJsonProcess(componentName);
+ return parserToJson.getJsonProcess(componentName, "object");
}
/**
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
index ebeb84fd..004c450a 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -30,7 +30,7 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
-
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Map;
import javax.persistence.Column;
@@ -44,6 +44,9 @@ import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
import org.json.JSONObject;
+import org.onap.clamp.clds.tosca.update.TemplateManagement;
+import org.onap.clamp.clds.tosca.update.UnknownComponentException;
+import org.onap.clamp.clds.util.ResourceFileUtil;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
import org.onap.clamp.loop.common.AuditEntity;
import org.onap.clamp.loop.template.LoopElementModel;
@@ -284,4 +287,22 @@ public abstract class Policy extends AuditEntity {
return buffer.toString().replace('.', '_').replaceAll(" ", "");
}
+ /**
+ * This method can be used to generate the json Schema used by the UI.
+ *
+ * @param policyToscaModel The tosca model as String that must be converted
+ * @param policyModelType The tosca model type (the policy_type entry in the tosca) that will used to create the
+ * json schema
+ * @return THe Json Schema as JsonObject
+ * @throws IOException In case of failure when opening the templates.properties file
+ * @throws UnknownComponentException If the policyModelType is not found in the tosca model
+ */
+ public static JsonObject generateJsonRepresentationFromToscaModel(String policyToscaModel,
+ String policyModelType)
+ throws IOException, UnknownComponentException {
+ return new TemplateManagement(policyToscaModel,ResourceFileUtil.getResourceAsString(
+ "clds/tosca_update/defaultToscaTypes.yaml"),
+ ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"))
+ .launchTranslation(policyModelType);
+ }
}
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index c4037ffb..96b3a09b 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -27,6 +27,7 @@ import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
+import java.io.IOException;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
@@ -39,8 +40,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.tosca.update.UnknownComponentException;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
import org.onap.clamp.loop.Loop;
import org.onap.clamp.loop.template.LoopElementModel;
@@ -104,9 +104,16 @@ public class MicroServicePolicy extends Policy implements Serializable {
* @param shared The flag indicate whether the MicroService is shared
*/
public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared, LoopElementModel loopElementModel) {
- this(name, policyModel, shared, JsonUtils.GSON_JPA_MODEL
- .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
- policyModel.getPolicyModelType()), JsonObject.class), loopElementModel,null,null);
+ this.name = name;
+ this.setPolicyModel(policyModel);
+ this.shared = shared;
+ try {
+ this.setJsonRepresentation(Policy.generateJsonRepresentationFromToscaModel(policyModel.getPolicyModelTosca(),policyModel.getPolicyModelType()));
+ } catch (UnknownComponentException | NullPointerException | IOException e) {
+ logger.error("Unable to generate the microservice policy Schema ... ", e);
+ this.setJsonRepresentation(new JsonObject());
+ }
+ this.setLoopElementModel(loopElementModel);
}
/**
@@ -116,7 +123,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
* @param name The name of the MicroService
* @param policyModel The policy model type of the MicroService
* @param shared The flag indicate whether the MicroService is
- * shared
+ * shared
* @param jsonRepresentation The UI representation in json format
* @param loopElementModel The loop element model from which this instance should be created
* @param pdpGroup The Pdp Group info
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index b0e8b0c3..9cf51633 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -45,14 +45,12 @@ import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.tosca.update.UnknownComponentException;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
import org.onap.clamp.loop.Loop;
import org.onap.clamp.loop.template.LoopElementModel;
@@ -120,17 +118,15 @@ public class OperationalPolicy extends Policy implements Serializable {
if (isLegacy()) {
// Op policy Legacy case
LegacyOperationalPolicy.preloadConfiguration(jsonReturned, loop);
- this.setJsonRepresentation(
- OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+ jsonReturned =
+ OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService());
} else {
// Generic Case
- this.setJsonRepresentation(JsonUtils.GSON
- .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
- policyModel.getPolicyModelType()), JsonObject.class));
+ jsonReturned = Policy.generateJsonRepresentationFromToscaModel(policyModel.getPolicyModelTosca(),
+ policyModel.getPolicyModelType());
}
- } catch (JsonSyntaxException | IOException | NullPointerException e) {
+ } catch (UnknownComponentException | IOException | NullPointerException e) {
logger.error("Unable to generate the operational policy Schema ... ", e);
- this.setJsonRepresentation(new JsonObject());
}
return jsonReturned;
}