changed types

drip-commons/src/main/java/nl/uva/sne/drip/model/Credentials.java

@@ -18,10 +18,10 @@ import org.springframework.data.annotation.Id;
  * Credentials
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T14:10:53.529Z")
 
 public class Credentials   {
-    /**
+        /**
      * @return the id
      */
     public String getId() {

drip-commons/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java

@@ -3,7 +3,6 @@ package nl.uva.sne.drip.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
@@ -13,51 +12,33 @@ import java.util.Map;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
-import org.springframework.data.annotation.Id;
 
 /**
  * NodeTemplate
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T14:10:53.529Z")
 
 public class NodeTemplate   {
-    /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Id
-    @JsonIgnore
-    private String id;
     
   @JsonProperty("derived_from")
   private String derivedFrom = null;
 
   @JsonProperty("properties")
   @Valid
-  private Map<String, Object> properties = null;
+  private Map<String, String> properties = null;
 
   @JsonProperty("requirements")
   @Valid
-  private List<Map<String, Object>> requirements = null;
+  private List<Map<String, String>> requirements = null;
 
   @JsonProperty("interfaces")
   @Valid
-  private Map<String, Object> interfaces = null;
+  private Map<String, String> interfaces = null;
 
   @JsonProperty("capabilities")
   @Valid
-  private Map<String, Object> capabilities = null;
+  private Map<String, String> capabilities = null;
 
   @JsonProperty("type")
   private String type = null;
@@ -71,11 +52,11 @@ public class NodeTemplate   {
 
   @JsonProperty("attributes")
   @Valid
-  private Map<String, Object> attributes = null;
+  private Map<String, String> attributes = null;
 
   @JsonProperty("artifacts")
   @Valid
-  private Map<String, Object> artifacts = null;
+  private Map<String, String> artifacts = null;
 
   public NodeTemplate derivedFrom(String derivedFrom) {
     this.derivedFrom = derivedFrom;
@@ -97,14 +78,14 @@ public class NodeTemplate   {
     this.derivedFrom = derivedFrom;
   }
 
-  public NodeTemplate properties(Map<String, Object> properties) {
+  public NodeTemplate properties(Map<String, String> properties) {
     this.properties = properties;
     return this;
   }
 
-  public NodeTemplate putPropertiesItem(String key, Object propertiesItem) {
+  public NodeTemplate putPropertiesItem(String key, String propertiesItem) {
     if (this.properties == null) {
-      this.properties = new HashMap<String, Object>();
+      this.properties = new HashMap<String, String>();
     }
     this.properties.put(key, propertiesItem);
     return this;
@@ -117,22 +98,22 @@ public class NodeTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public Map<String, Object> getProperties() {
+  public Map<String, String> getProperties() {
     return properties;
   }
 
-  public void setProperties(Map<String, Object> properties) {
+  public void setProperties(Map<String, String> properties) {
     this.properties = properties;
   }
 
-  public NodeTemplate requirements(List<Map<String, Object>> requirements) {
+  public NodeTemplate requirements(List<Map<String, String>> requirements) {
     this.requirements = requirements;
     return this;
   }
 
-  public NodeTemplate addRequirementsItem(Map<String, Object> requirementsItem) {
+  public NodeTemplate addRequirementsItem(Map<String, String> requirementsItem) {
     if (this.requirements == null) {
-      this.requirements = new ArrayList<Map<String, Object>>();
+      this.requirements = new ArrayList<Map<String, String>>();
     }
     this.requirements.add(requirementsItem);
     return this;
@@ -146,22 +127,22 @@ public class NodeTemplate   {
 
   @Valid
 
-  public List<Map<String, Object>> getRequirements() {
+  public List<Map<String, String>> getRequirements() {
     return requirements;
   }
 
-  public void setRequirements(List<Map<String, Object>> requirements) {
+  public void setRequirements(List<Map<String, String>> requirements) {
     this.requirements = requirements;
   }
 
-  public NodeTemplate interfaces(Map<String, Object> interfaces) {
+  public NodeTemplate interfaces(Map<String, String> interfaces) {
     this.interfaces = interfaces;
     return this;
   }
 
-  public NodeTemplate putInterfacesItem(String key, Object interfacesItem) {
+  public NodeTemplate putInterfacesItem(String key, String interfacesItem) {
     if (this.interfaces == null) {
-      this.interfaces = new HashMap<String, Object>();
+      this.interfaces = new HashMap<String, String>();
     }
     this.interfaces.put(key, interfacesItem);
     return this;
@@ -174,22 +155,22 @@ public class NodeTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public Map<String, Object> getInterfaces() {
+  public Map<String, String> getInterfaces() {
     return interfaces;
   }
 
-  public void setInterfaces(Map<String, Object> interfaces) {
+  public void setInterfaces(Map<String, String> interfaces) {
     this.interfaces = interfaces;
   }
 
-  public NodeTemplate capabilities(Map<String, Object> capabilities) {
+  public NodeTemplate capabilities(Map<String, String> capabilities) {
     this.capabilities = capabilities;
     return this;
   }
 
-  public NodeTemplate putCapabilitiesItem(String key, Object capabilitiesItem) {
+  public NodeTemplate putCapabilitiesItem(String key, String capabilitiesItem) {
     if (this.capabilities == null) {
-      this.capabilities = new HashMap<String, Object>();
+      this.capabilities = new HashMap<String, String>();
     }
     this.capabilities.put(key, capabilitiesItem);
     return this;
@@ -202,11 +183,11 @@ public class NodeTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public Map<String, Object> getCapabilities() {
+  public Map<String, String> getCapabilities() {
     return capabilities;
   }
 
-  public void setCapabilities(Map<String, Object> capabilities) {
+  public void setCapabilities(Map<String, String> capabilities) {
     this.capabilities = capabilities;
   }
 
@@ -278,14 +259,14 @@ public class NodeTemplate   {
     this.directives = directives;
   }
 
-  public NodeTemplate attributes(Map<String, Object> attributes) {
+  public NodeTemplate attributes(Map<String, String> attributes) {
     this.attributes = attributes;
     return this;
   }
 
-  public NodeTemplate putAttributesItem(String key, Object attributesItem) {
+  public NodeTemplate putAttributesItem(String key, String attributesItem) {
     if (this.attributes == null) {
-      this.attributes = new HashMap<String, Object>();
+      this.attributes = new HashMap<String, String>();
     }
     this.attributes.put(key, attributesItem);
     return this;
@@ -298,22 +279,22 @@ public class NodeTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public Map<String, Object> getAttributes() {
+  public Map<String, String> getAttributes() {
     return attributes;
   }
 
-  public void setAttributes(Map<String, Object> attributes) {
+  public void setAttributes(Map<String, String> attributes) {
     this.attributes = attributes;
   }
 
-  public NodeTemplate artifacts(Map<String, Object> artifacts) {
+  public NodeTemplate artifacts(Map<String, String> artifacts) {
     this.artifacts = artifacts;
     return this;
   }
 
-  public NodeTemplate putArtifactsItem(String key, Object artifactsItem) {
+  public NodeTemplate putArtifactsItem(String key, String artifactsItem) {
     if (this.artifacts == null) {
-      this.artifacts = new HashMap<String, Object>();
+      this.artifacts = new HashMap<String, String>();
     }
     this.artifacts.put(key, artifactsItem);
     return this;
@@ -326,11 +307,11 @@ public class NodeTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public Map<String, Object> getArtifacts() {
+  public Map<String, String> getArtifacts() {
     return artifacts;
   }
 
-  public void setArtifacts(Map<String, Object> artifacts) {
+  public void setArtifacts(Map<String, String> artifacts) {
     this.artifacts = artifacts;
   }
 

drip-commons/src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java

@@ -2,9 +2,6 @@ package nl.uva.sne.drip.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,39 +9,20 @@ import java.util.List;
 import java.util.Map;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
-import javax.validation.constraints.*;
-import org.springframework.data.annotation.Id;
 
 /**
  * TopologyTemplate
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T14:10:53.529Z")
 
 public class TopologyTemplate   {
-        /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Id
-    @JsonIgnore
-    private String id;
-    
   @JsonProperty("description")
   private String description = null;
 
   @JsonProperty("inputs")
-  private String inputs = null;
+  @Valid
+  private Map<String, String> inputs = null;
 
   @JsonProperty("node_templates")
   @Valid
@@ -52,20 +30,23 @@ public class TopologyTemplate   {
 
   @JsonProperty("relationship_templates")
   @Valid
-  private Map<String, Object> relationshipTemplates = null;
+  private Map<String, String> relationshipTemplates = null;
 
   @JsonProperty("outputs")
-  private String outputs = null;
+  @Valid
+  private Map<String, String> outputs = null;
 
   @JsonProperty("groups")
-  private String groups = null;
+  @Valid
+  private Map<String, String> groups = null;
 
   @JsonProperty("substitution_mappings")
-  private String substitutionMappings = null;
+  @Valid
+  private Map<String, String> substitutionMappings = null;
 
   @JsonProperty("policies")
   @Valid
-  private List<String> policies = null;
+  private List<Map<String, String>> policies = null;
 
   public TopologyTemplate description(String description) {
     this.description = description;
@@ -87,11 +68,19 @@ public class TopologyTemplate   {
     this.description = description;
   }
 
-  public TopologyTemplate inputs(String inputs) {
+  public TopologyTemplate inputs(Map<String, String> inputs) {
     this.inputs = inputs;
     return this;
   }
 
+  public TopologyTemplate putInputsItem(String key, String inputsItem) {
+    if (this.inputs == null) {
+      this.inputs = new HashMap<String, String>();
+    }
+    this.inputs.put(key, inputsItem);
+    return this;
+  }
+
   /**
    * Get inputs
    * @return inputs
@@ -99,11 +88,11 @@ public class TopologyTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public String getInputs() {
+  public Map<String, String> getInputs() {
     return inputs;
   }
 
-  public void setInputs(String inputs) {
+  public void setInputs(Map<String, String> inputs) {
     this.inputs = inputs;
   }
 
@@ -136,14 +125,14 @@ public class TopologyTemplate   {
     this.nodeTemplates = nodeTemplates;
   }
 
-  public TopologyTemplate relationshipTemplates(Map<String, Object> relationshipTemplates) {
+  public TopologyTemplate relationshipTemplates(Map<String, String> relationshipTemplates) {
     this.relationshipTemplates = relationshipTemplates;
     return this;
   }
 
-  public TopologyTemplate putRelationshipTemplatesItem(String key, Object relationshipTemplatesItem) {
+  public TopologyTemplate putRelationshipTemplatesItem(String key, String relationshipTemplatesItem) {
     if (this.relationshipTemplates == null) {
-      this.relationshipTemplates = new HashMap<String, Object>();
+      this.relationshipTemplates = new HashMap<String, String>();
     }
     this.relationshipTemplates.put(key, relationshipTemplatesItem);
     return this;
@@ -156,19 +145,27 @@ public class TopologyTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public Map<String, Object> getRelationshipTemplates() {
+  public Map<String, String> getRelationshipTemplates() {
     return relationshipTemplates;
   }
 
-  public void setRelationshipTemplates(Map<String, Object> relationshipTemplates) {
+  public void setRelationshipTemplates(Map<String, String> relationshipTemplates) {
     this.relationshipTemplates = relationshipTemplates;
   }
 
-  public TopologyTemplate outputs(String outputs) {
+  public TopologyTemplate outputs(Map<String, String> outputs) {
     this.outputs = outputs;
     return this;
   }
 
+  public TopologyTemplate putOutputsItem(String key, String outputsItem) {
+    if (this.outputs == null) {
+      this.outputs = new HashMap<String, String>();
+    }
+    this.outputs.put(key, outputsItem);
+    return this;
+  }
+
   /**
    * Get outputs
    * @return outputs
@@ -176,19 +173,27 @@ public class TopologyTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public String getOutputs() {
+  public Map<String, String> getOutputs() {
     return outputs;
   }
 
-  public void setOutputs(String outputs) {
+  public void setOutputs(Map<String, String> outputs) {
     this.outputs = outputs;
   }
 
-  public TopologyTemplate groups(String groups) {
+  public TopologyTemplate groups(Map<String, String> groups) {
     this.groups = groups;
     return this;
   }
 
+  public TopologyTemplate putGroupsItem(String key, String groupsItem) {
+    if (this.groups == null) {
+      this.groups = new HashMap<String, String>();
+    }
+    this.groups.put(key, groupsItem);
+    return this;
+  }
+
   /**
    * Get groups
    * @return groups
@@ -196,19 +201,27 @@ public class TopologyTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public String getGroups() {
+  public Map<String, String> getGroups() {
     return groups;
   }
 
-  public void setGroups(String groups) {
+  public void setGroups(Map<String, String> groups) {
     this.groups = groups;
   }
 
-  public TopologyTemplate substitutionMappings(String substitutionMappings) {
+  public TopologyTemplate substitutionMappings(Map<String, String> substitutionMappings) {
     this.substitutionMappings = substitutionMappings;
     return this;
   }
 
+  public TopologyTemplate putSubstitutionMappingsItem(String key, String substitutionMappingsItem) {
+    if (this.substitutionMappings == null) {
+      this.substitutionMappings = new HashMap<String, String>();
+    }
+    this.substitutionMappings.put(key, substitutionMappingsItem);
+    return this;
+  }
+
   /**
    * Get substitutionMappings
    * @return substitutionMappings
@@ -216,22 +229,22 @@ public class TopologyTemplate   {
   @ApiModelProperty(value = "")
 
 
-  public String getSubstitutionMappings() {
+  public Map<String, String> getSubstitutionMappings() {
     return substitutionMappings;
   }
 
-  public void setSubstitutionMappings(String substitutionMappings) {
+  public void setSubstitutionMappings(Map<String, String> substitutionMappings) {
     this.substitutionMappings = substitutionMappings;
   }
 
-  public TopologyTemplate policies(List<String> policies) {
+  public TopologyTemplate policies(List<Map<String, String>> policies) {
     this.policies = policies;
     return this;
   }
 
-  public TopologyTemplate addPoliciesItem(String policiesItem) {
+  public TopologyTemplate addPoliciesItem(Map<String, String> policiesItem) {
     if (this.policies == null) {
-      this.policies = new ArrayList<String>();
+      this.policies = new ArrayList<Map<String, String>>();
     }
     this.policies.add(policiesItem);
     return this;
@@ -243,12 +256,13 @@ public class TopologyTemplate   {
   **/
   @ApiModelProperty(value = "")
 
+  @Valid
 
-  public List<String> getPolicies() {
+  public List<Map<String, String>> getPolicies() {
     return policies;
   }
 
-  public void setPolicies(List<String> policies) {
+  public void setPolicies(List<Map<String, String>> policies) {
     this.policies = policies;
   }
 

drip-commons/src/main/java/nl/uva/sne/drip/model/User.java

 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.Objects;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
+import org.springframework.data.annotation.Id;
 
 /**
  * User
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T14:10:53.529Z")
 
 public class User   {
+        /**
+     * @return the id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Id
+    @JsonIgnore
+    private String id;
+    
 
   @Override
   public boolean equals(java.lang.Object o) {

drip-manager/src/main/java/nl/uva/sne/drip/service/ProvisionerService.java

@@ -5,6 +5,7 @@
  */
 package nl.uva.sne.drip.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.Map;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import nl.uva.sne.drip.commons.sure_tosca.client.ApiException;
 import nl.uva.sne.drip.commons.utils.ToscaHelper;
 import nl.uva.sne.drip.model.Message;
 import nl.uva.sne.drip.model.NodeTemplate;
@@ -40,7 +42,7 @@ public class ProvisionerService {
     ToscaHelper toscaHelper;
     private Integer toscaHelperID;
 
-    public String provision(String id) throws IOException {
+    public String provision(String id) throws IOException, JsonProcessingException, ApiException {
 
         String ymlToscaTemplate = toscaTemplateService.findByID(id);
         ToscaTemplate toscaTemplate = toscaTemplateService.getYaml2ToscaTemplate(ymlToscaTemplate);
@@ -48,7 +50,7 @@ public class ProvisionerService {
 
         toscaTemplate = addProvisionInterface(toscaTemplate);
 
-        return null;
+        return toscaTemplateService.save(toscaTemplate);
     }
 
 //    private List<Map<String, NodeTemplate>> getVmTopologies(ToscaTemplate toscaTemplate) {

openAPI/TOSCA/NodeTemplate.yml

@@ -6,21 +6,21 @@
           properties:
               type: object
               additionalProperties:
-                  type: string    
+                  type: object    
           requirements:
               type: "array"
               items:
                 type: object
                 additionalProperties:
-                    type: string  
+                    type: object  
           interfaces:
               type: object
               additionalProperties:
-                  type: string       
+                  type: object      
           capabilities:
               type: object
               additionalProperties:
-                  type: string                       
+                  type: object                         
           type:
               type: "string"
           description:
@@ -32,11 +32,11 @@
           attributes:
               type: object
               additionalProperties:
-                  type: string    
+                  type: object     
           artifacts:
               type: object
               additionalProperties:
-                  type: string                              
+                  type: object                               
 
      
  

openAPI/TOSCA/TopologyTemplate.yml

@@ -14,22 +14,22 @@
           relationship_templates:
               type: object
               additionalProperties:
-                  type: string    
+                  type: object    
           outputs:
               type: object
               additionalProperties:
-                  type: string  
+                  type: object  
           groups:
               type: object
               additionalProperties:
-                  type: string              
+                  type: object             
           substitution_mappings:
               type: object
               additionalProperties:
-                  type: string               
+                  type: object               
           policies:
               type: "array"
               items:
                 type: object
                 additionalProperties:
-                    type: string                    
+                    type: object                   

openAPI/TOSCA/ToscaTemplate.yml

@@ -18,51 +18,51 @@
           imports:
               type: "array"
               items:
-                  type: object
-                  additionalProperties:
-                    type: string
+                type: object
+                additionalProperties:
+                    type: object  
           dsl_definitions:
               type: object
               additionalProperties:
-                  type: string  
+                  type: object  
           node_types:
               type: object
               additionalProperties:
-                  type: string       
+                  type: object        
           relationship_types:
               type: object
               additionalProperties:
-                  type: string      
+                  type: object     
           relationship_templates:
               type: object
               additionalProperties:
-                  type: string       
+                  type: object       
           capability_types:
               type: object
               additionalProperties:
-                  type: string   
+                  type: object   
           artifact_types:
               type: object
               additionalProperties:
-                  type: string      
+                  type: object     
           data_types:
               type: object
               additionalProperties:
-                  type: string      
+                  type: object      
           interface_types:
               type: object
               additionalProperties:
-                  type: string  
+                  type: object  
           policy_types:
               type: object
               additionalProperties:
-                  type: string      
+                  type: object       
           group_types:
               type: object
               additionalProperties:
-                  type: string                
+                  type: object                
           repositories:
               type: object
               additionalProperties:
-                  type: string                
+                  type: object