start better handling of tosca types

Author: bernardodemarco

engine/schema/src/main/resources/nimble/resource-types/auto-scaling-vm-profile.yaml

@@ -42,24 +42,6 @@ node_types:
         type: string
         description: Service offering ID for the VMs in the auto scaling VM profile.
         required: true
-      template-id:
-        type: string
-        description: The ID of the template from which the VMs will be launched.
-        required: true
-      user-data-id:
-        type: string
-        description: The ID of the user data.
-        required: false
-      user-data-details:
-        type: map
-        entry_schema:
-          type: string
-        description: User data details.
-        required: false
-      user-data:
-        type: string
-        description: User data.
-        required: false
       other-deploy-params:
         type: list
         entry_schema:

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaAttributeDefinition.java

@@ -1,7 +1,7 @@
 package org.apache.cloudstack.tosca.model;
 
 public class ToscaAttributeDefinition extends ToscaFieldDefinition {
-    public ToscaAttributeDefinition(String name, String description, ToscaPrimitiveType type) {
+    public ToscaAttributeDefinition(String name, String description, ToscaTypeDefinition type) {
         super(name, description, type);
     }
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaCollectionType.java

@@ -0,0 +1,5 @@
+package org.apache.cloudstack.tosca.model;
+
+public enum ToscaCollectionType {
+    MAP, LIST
+}

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaDataTypeDefinition.java

@@ -0,0 +1,13 @@
+package org.apache.cloudstack.tosca.model;
+
+import java.util.List;
+
+public class ToscaDataTypeDefinition {
+    private final String name;
+    private final List<ToscaPropertyDefinition> properties;
+
+    public ToscaDataTypeDefinition(String name, List<ToscaPropertyDefinition> properties) {
+        this.name = name;
+        this.properties = properties;
+    }
+}

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaFieldDefinition.java

@@ -5,9 +5,9 @@
 public abstract class ToscaFieldDefinition {
     private String name;
     private String description;
-    private ToscaPrimitiveType type;
+    private ToscaTypeDefinition type;
 
-    public ToscaFieldDefinition(String name, String description, ToscaPrimitiveType type) {
+    public ToscaFieldDefinition(String name, String description, ToscaTypeDefinition type) {
         this.name = name;
         this.description = description;
         this.type = type;
@@ -21,7 +21,7 @@ public String getDescription() {
         return description;
     }
 
-    public ToscaPrimitiveType getType() {
+    public ToscaTypeDefinition getType() {
         return type;
     }
 

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaPrimitiveType.java

@@ -1,5 +1,5 @@
 package org.apache.cloudstack.tosca.model;
 
 public enum ToscaPrimitiveType {
-    STRING, INTEGER, FLOAT, BOOLEAN, LIST
+    STRING, INTEGER, FLOAT, BOOLEAN
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaPropertyDefinition.java

@@ -4,7 +4,7 @@ public class ToscaPropertyDefinition extends ToscaFieldDefinition {
     private boolean required;
     private Object validation;
 
-    public ToscaPropertyDefinition(String name, String description, ToscaPrimitiveType type, boolean required, Object validation) {
+    public ToscaPropertyDefinition(String name, String description, ToscaTypeDefinition type, boolean required, Object validation) {
         super(name, description, type);
         this.required = required;
         this.validation = validation;

plugins/iac/nimble/src/main/java/org/apache/cloudstack/tosca/model/ToscaTypeDefinition.java

@@ -0,0 +1,40 @@
+package org.apache.cloudstack.tosca.model;
+
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+
+public class ToscaTypeDefinition {
+    private enum Kind {
+        PRIMITIVE, COLLECTION, DATA_TYPE
+    }
+
+    private final Kind kind;
+    private final ToscaPrimitiveType primitiveType;
+    private final ToscaCollectionType collectionType;
+    private final ToscaTypeDefinition entrySchema;
+    private final ToscaDataTypeDefinition dataType;
+
+    public static ToscaTypeDefinition ofPrimitive(ToscaPrimitiveType type) {
+        return new ToscaTypeDefinition(Kind.PRIMITIVE, type, null, null, null);
+    }
+
+    public static ToscaTypeDefinition ofCollection(ToscaCollectionType collectionType, ToscaTypeDefinition entrySchema) {
+        return new ToscaTypeDefinition(Kind.COLLECTION, null, collectionType, entrySchema, null);
+    }
+
+    public static ToscaTypeDefinition ofDataType(ToscaDataTypeDefinition dataType) {
+        return new ToscaTypeDefinition(Kind.DATA_TYPE, null, null, null, dataType);
+    }
+
+    private ToscaTypeDefinition(Kind kind, ToscaPrimitiveType type, ToscaCollectionType collectionType, ToscaTypeDefinition entrySchema, ToscaDataTypeDefinition dataType) {
+        this.primitiveType = type;
+        this.collectionType = collectionType;
+        this.entrySchema = entrySchema;
+        this.dataType = dataType;
+        this.kind = kind;
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "type");
+    }
+}