added name to node

drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/ToscaHelper.java

@@ -73,7 +73,6 @@ public class ToscaHelper {
         for (String type : toscaInterfaceTypes) {
             String derivedFrom = null;
             List<Map<String, Object>> interfaces = api.getTypes(String.valueOf(id), "interface_types", null, type, null, null, null, null, null, derivedFrom);
-
             interfaceDefinitions.addAll(interfaces);
         }
 
@@ -85,8 +84,4 @@ public class ToscaHelper {
         return vmTopologyTemplates;
     }
 
-    public ToscaTemplate execute() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
 }

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

+package nl.uva.sne.drip.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * CloudsStormSubMembers
+ */
+@Validated
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
+public class CloudsStormSubMembers {
+
+    @JsonProperty("vmName")
+    private String vmName = null;
+
+    @JsonProperty("address")
+    private String address = null;
+
+    public CloudsStormSubMembers vmName(String vmName) {
+        this.vmName = vmName;
+        return this;
+    }
+
+    /**
+     * Get vmName
+     *
+     * @return vmName
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public CloudsStormSubMembers address(String address) {
+        this.address = address;
+        return this;
+    }
+
+    /**
+     * Get address
+     *
+     * @return address
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CloudsStormSubMembers cloudsStormSubMembers = (CloudsStormSubMembers) o;
+        return Objects.equals(this.vmName, cloudsStormSubMembers.vmName)
+                && Objects.equals(this.address, cloudsStormSubMembers.address);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(vmName, address);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class CloudsStormSubMembers {\n");
+
+        sb.append("    vmName: ").append(toIndentedString(vmName)).append("\n");
+        sb.append("    address: ").append(toIndentedString(address)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+}

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

-/*
- * Copyright 2019 S. Koulouzis
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package nl.uva.sne.drip.model;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.validation.annotation.Validated;
 
 /**
- *
- * @author S. Koulouzis
+ * CloudsStormSubTopology
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2019-12-09T15:55:39.959Z[GMT]")
+@Validated
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
 public class CloudsStormSubTopology {
+
     @JsonProperty("topology")
     private String topology = null;
 
@@ -44,8 +32,10 @@ public class CloudsStormSubTopology   {
 
     /**
      * Get topology
+     *
      * @return topology
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
     public String getTopology() {
@@ -63,8 +53,10 @@ public class CloudsStormSubTopology   {
 
     /**
      * Get cloudProvider
+     *
      * @return cloudProvider
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
     public String getCloudProvider() {
@@ -82,8 +74,10 @@ public class CloudsStormSubTopology   {
 
     /**
      * Get domain
+     *
      * @return domain
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
     public String getDomain() {
@@ -101,8 +95,10 @@ public class CloudsStormSubTopology   {
 
     /**
      * Get status
+     *
      * @return status
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
     public String getStatus() {
@@ -113,7 +109,6 @@ public class CloudsStormSubTopology   {
         this.status = status;
     }
 
-
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -123,10 +118,10 @@ public class CloudsStormSubTopology   {
             return false;
         }
         CloudsStormSubTopology cloudsStormSubTopology = (CloudsStormSubTopology) o;
-    return Objects.equals(this.topology, cloudsStormSubTopology.topology) &&
-        Objects.equals(this.cloudProvider, cloudsStormSubTopology.cloudProvider) &&
-        Objects.equals(this.domain, cloudsStormSubTopology.domain) &&
-        Objects.equals(this.status, cloudsStormSubTopology.status);
+        return Objects.equals(this.topology, cloudsStormSubTopology.topology)
+                && Objects.equals(this.cloudProvider, cloudsStormSubTopology.cloudProvider)
+                && Objects.equals(this.domain, cloudsStormSubTopology.domain)
+                && Objects.equals(this.status, cloudsStormSubTopology.status);
     }
 
     @Override

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

+package nl.uva.sne.drip.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.Valid;
+
+/**
+ * CloudsStormSubnets
+ */
+@Validated
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
+public class CloudsStormSubnets {
+
+    @JsonProperty("name")
+    private String name = null;
+
+    @JsonProperty("subnet")
+    private String subnet = null;
+
+    @JsonProperty("netmask")
+    private String netmask = null;
+
+    @JsonProperty("members")
+    @Valid
+    private List<CloudsStormSubMembers> members = null;
+
+    public CloudsStormSubnets name(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return name
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public CloudsStormSubnets subnet(String subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get subnet
+     *
+     * @return subnet
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getSubnet() {
+        return subnet;
+    }
+
+    public void setSubnet(String subnet) {
+        this.subnet = subnet;
+    }
+
+    public CloudsStormSubnets netmask(String netmask) {
+        this.netmask = netmask;
+        return this;
+    }
+
+    /**
+     * Get netmask
+     *
+     * @return netmask
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getNetmask() {
+        return netmask;
+    }
+
+    public void setNetmask(String netmask) {
+        this.netmask = netmask;
+    }
+
+    public CloudsStormSubnets members(List<CloudsStormSubMembers> members) {
+        this.members = members;
+        return this;
+    }
+
+    public CloudsStormSubnets addMembersItem(CloudsStormSubMembers membersItem) {
+        if (this.members == null) {
+            this.members = new ArrayList<CloudsStormSubMembers>();
+        }
+        this.members.add(membersItem);
+        return this;
+    }
+
+    /**
+     * Get members
+     *
+     * @return members
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    @Valid
+
+    public List<CloudsStormSubMembers> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<CloudsStormSubMembers> members) {
+        this.members = members;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CloudsStormSubnets cloudsStormSubnets = (CloudsStormSubnets) o;
+        return Objects.equals(this.name, cloudsStormSubnets.name)
+                && Objects.equals(this.subnet, cloudsStormSubnets.subnet)
+                && Objects.equals(this.netmask, cloudsStormSubnets.netmask)
+                && Objects.equals(this.members, cloudsStormSubnets.members);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, subnet, netmask, members);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class CloudsStormSubnets {\n");
+
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    subnet: ").append(toIndentedString(subnet)).append("\n");
+        sb.append("    netmask: ").append(toIndentedString(netmask)).append("\n");
+        sb.append("    members: ").append(toIndentedString(members)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+}

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

-/*
- * Copyright 2019 S. Koulouzis
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package nl.uva.sne.drip.model;
 
 import java.util.Objects;
-import com.google.gson.annotations.SerializedName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.Valid;
 
 /**
- *
- * @author S. Koulouzis
+ * CloudsStormTopTopology
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2019-12-09T16:51:48.830052+01:00[Europe/Amsterdam]")
+@Validated
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
 public class CloudsStormTopTopology {
-  public static final String SERIALIZED_NAME_USER_NAME = "userName";
-  @SerializedName(SERIALIZED_NAME_USER_NAME)
-  private String userName;
 
-  public static final String SERIALIZED_NAME_PUBLIC_KEY_PATH = "publicKeyPath";
-  @SerializedName(SERIALIZED_NAME_PUBLIC_KEY_PATH)
-  private String publicKeyPath;
+    @JsonProperty("userName")
+    private String userName = null;
 
-  public static final String SERIALIZED_NAME_TOPOLOGIES = "topologies";
-  @SerializedName(SERIALIZED_NAME_TOPOLOGIES)
+    @JsonProperty("publicKeyPath")
+    private String publicKeyPath = null;
+
+    @JsonProperty("topologies")
+    @Valid
     private List<CloudsStormSubTopology> topologies = null;
 
+    @JsonProperty("subnets")
+    @Valid
+    private List<CloudsStormSubnets> subnets = null;
 
     public CloudsStormTopTopology userName(String userName) {
-    
         this.userName = userName;
         return this;
     }
 
     /**
      * Get userName
+     *
      * @return userName
-  **/
-  @javax.annotation.Nullable
+  *
+     */
     @ApiModelProperty(value = "")
 
     public String getUserName() {
         return userName;
     }
 
-
     public void setUserName(String userName) {
         this.userName = userName;
     }
 
-
     public CloudsStormTopTopology publicKeyPath(String publicKeyPath) {
-    
         this.publicKeyPath = publicKeyPath;
         return this;
     }
 
     /**
      * Get publicKeyPath
+     *
      * @return publicKeyPath
-  **/
-  @javax.annotation.Nullable
+  *
+     */
     @ApiModelProperty(value = "")
 
     public String getPublicKeyPath() {
         return publicKeyPath;
     }
 
-
     public void setPublicKeyPath(String publicKeyPath) {
         this.publicKeyPath = publicKeyPath;
     }
 
-
     public CloudsStormTopTopology topologies(List<CloudsStormSubTopology> topologies) {
-    
         this.topologies = topologies;
         return this;
     }
@@ -102,20 +87,52 @@ public class CloudsStormTopTopology {
 
     /**
      * Get topologies
+     *
      * @return topologies
-  **/
-  @javax.annotation.Nullable
+  *
+     */
     @ApiModelProperty(value = "")
 
+    @Valid
+
     public List<CloudsStormSubTopology> getTopologies() {
         return topologies;
     }
 
-
     public void setTopologies(List<CloudsStormSubTopology> topologies) {
         this.topologies = topologies;
     }
 
+    public CloudsStormTopTopology subnets(List<CloudsStormSubnets> subnets) {
+        this.subnets = subnets;
+        return this;
+    }
+
+    public CloudsStormTopTopology addSubnetsItem(CloudsStormSubnets subnetsItem) {
+        if (this.subnets == null) {
+            this.subnets = new ArrayList<CloudsStormSubnets>();
+        }
+        this.subnets.add(subnetsItem);
+        return this;
+    }
+
+    /**
+     * Get subnets
+     *
+     * @return subnets
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    @Valid
+
+    public List<CloudsStormSubnets> getSubnets() {
+        return subnets;
+    }
+
+    public void setSubnets(List<CloudsStormSubnets> subnets) {
+        this.subnets = subnets;
+    }
 
     @Override
     public boolean equals(java.lang.Object o) {
@@ -126,24 +143,26 @@ public class CloudsStormTopTopology {
             return false;
         }
         CloudsStormTopTopology cloudsStormTopTopology = (CloudsStormTopTopology) o;
-    return Objects.equals(this.userName, cloudsStormTopTopology.userName) &&
-        Objects.equals(this.publicKeyPath, cloudsStormTopTopology.publicKeyPath) &&
-        Objects.equals(this.topologies, cloudsStormTopTopology.topologies);
+        return Objects.equals(this.userName, cloudsStormTopTopology.userName)
+                && Objects.equals(this.publicKeyPath, cloudsStormTopTopology.publicKeyPath)
+                && Objects.equals(this.topologies, cloudsStormTopTopology.topologies)
+                && Objects.equals(this.subnets, cloudsStormTopTopology.subnets);
     }
 
     @Override
     public int hashCode() {
-    return Objects.hash(userName, publicKeyPath, topologies);
+        return Objects.hash(userName, publicKeyPath, topologies, subnets);
     }
 
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class CloudsStormTopTopology {\n");
+
         sb.append("    userName: ").append(toIndentedString(userName)).append("\n");
         sb.append("    publicKeyPath: ").append(toIndentedString(publicKeyPath)).append("\n");
         sb.append("    topologies: ").append(toIndentedString(topologies)).append("\n");
+        sb.append("    subnets: ").append(toIndentedString(subnets)).append("\n");
         sb.append("}");
         return sb.toString();
     }
@@ -158,5 +177,4 @@ public class CloudsStormTopTopology {
         }
         return o.toString().replace("\n", "\n    ");
     }
-
 }

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

 package nl.uva.sne.drip.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,10 +14,9 @@ import org.springframework.data.annotation.Id;
  * Credentials
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class Credentials {
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
 
+public class Credentials {
     /**
      * @return the id
      */
@@ -33,8 +32,10 @@ public class Credentials {
     }
 
     @Id
+    @JsonIgnore
     private String id;
 
+    
     @JsonProperty("protocol")
     private String protocol = null;
 

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

@@ -16,7 +16,6 @@
 package nl.uva.sne.drip.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
 import java.util.List;
 import javax.validation.constraints.NotNull;

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

 package nl.uva.sne.drip.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,9 +15,24 @@ import javax.validation.Valid;
  * NodeTemplate
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
 public class NodeTemplate {
+
+    public String getId() {
+        return name;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(String id) {
+        this.name = id;
+    }
+
+    @JsonIgnore
+    private String name;
+
     @JsonProperty("derived_from")
     private String derivedFrom = null;
 
@@ -62,11 +77,12 @@ public class NodeTemplate   {
 
     /**
      * Get derivedFrom
+     *
      * @return derivedFrom
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public String getDerivedFrom() {
         return derivedFrom;
     }
@@ -90,11 +106,12 @@ public class NodeTemplate   {
 
     /**
      * Get properties
+     *
      * @return properties
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getProperties() {
         return properties;
     }
@@ -118,8 +135,10 @@ public class NodeTemplate   {
 
     /**
      * Get requirements
+     *
      * @return requirements
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
     @Valid
@@ -147,11 +166,12 @@ public class NodeTemplate   {
 
     /**
      * Get interfaces
+     *
      * @return interfaces
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getInterfaces() {
         return interfaces;
     }
@@ -175,11 +195,12 @@ public class NodeTemplate   {
 
     /**
      * Get capabilities
+     *
      * @return capabilities
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getCapabilities() {
         return capabilities;
     }
@@ -195,11 +216,12 @@ public class NodeTemplate   {
 
     /**
      * Get type
+     *
      * @return type
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public String getType() {
         return type;
     }
@@ -215,11 +237,12 @@ public class NodeTemplate   {
 
     /**
      * Get description
+     *
      * @return description
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public String getDescription() {
         return description;
     }
@@ -243,11 +266,12 @@ public class NodeTemplate   {
 
     /**
      * Get directives
+     *
      * @return directives
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public List<String> getDirectives() {
         return directives;
     }
@@ -271,11 +295,12 @@ public class NodeTemplate   {
 
     /**
      * Get attributes
+     *
      * @return attributes
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getAttributes() {
         return attributes;
     }
@@ -299,11 +324,12 @@ public class NodeTemplate   {
 
     /**
      * Get artifacts
+     *
      * @return artifacts
-  **/
+     *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getArtifacts() {
         return artifacts;
     }
@@ -312,7 +338,6 @@ public class NodeTemplate   {
         this.artifacts = artifacts;
     }
 
-
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -321,17 +346,17 @@ public class NodeTemplate   {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-    NodeTemplate nodeTemplate2 = (NodeTemplate) o;
-    return Objects.equals(this.derivedFrom, nodeTemplate2.derivedFrom) &&
-        Objects.equals(this.properties, nodeTemplate2.properties) &&
-        Objects.equals(this.requirements, nodeTemplate2.requirements) &&
-        Objects.equals(this.interfaces, nodeTemplate2.interfaces) &&
-        Objects.equals(this.capabilities, nodeTemplate2.capabilities) &&
-        Objects.equals(this.type, nodeTemplate2.type) &&
-        Objects.equals(this.description, nodeTemplate2.description) &&
-        Objects.equals(this.directives, nodeTemplate2.directives) &&
-        Objects.equals(this.attributes, nodeTemplate2.attributes) &&
-        Objects.equals(this.artifacts, nodeTemplate2.artifacts);
+        NodeTemplate nodeTemplate = (NodeTemplate) o;
+        return Objects.equals(this.derivedFrom, nodeTemplate.derivedFrom)
+                && Objects.equals(this.properties, nodeTemplate.properties)
+                && Objects.equals(this.requirements, nodeTemplate.requirements)
+                && Objects.equals(this.interfaces, nodeTemplate.interfaces)
+                && Objects.equals(this.capabilities, nodeTemplate.capabilities)
+                && Objects.equals(this.type, nodeTemplate.type)
+                && Objects.equals(this.description, nodeTemplate.description)
+                && Objects.equals(this.directives, nodeTemplate.directives)
+                && Objects.equals(this.attributes, nodeTemplate.attributes)
+                && Objects.equals(this.artifacts, nodeTemplate.artifacts);
     }
 
     @Override
@@ -342,7 +367,7 @@ public class NodeTemplate   {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-    sb.append("class NodeTemplate2 {\n");
+        sb.append("class NodeTemplate {\n");
 
         sb.append("    derivedFrom: ").append(toIndentedString(derivedFrom)).append("\n");
         sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
@@ -369,4 +394,3 @@ public class NodeTemplate   {
         return o.toString().replace("\n", "\n    ");
     }
 }
-

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

 package nl.uva.sne.drip.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,9 +14,10 @@ import javax.validation.Valid;
  * TopologyTemplate
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
 public class TopologyTemplate {
+
     @JsonProperty("description")
     private String description = null;
 
@@ -56,11 +56,12 @@ public class TopologyTemplate   {
 
     /**
      * Get description
+     *
      * @return description
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
-
     public String getDescription() {
         return description;
     }
@@ -84,11 +85,12 @@ public class TopologyTemplate   {
 
     /**
      * Get inputs
+     *
      * @return inputs
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, String> getInputs() {
         return inputs;
     }
@@ -112,8 +114,10 @@ public class TopologyTemplate   {
 
     /**
      * Get nodeTemplates
+     *
      * @return nodeTemplates
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
     @Valid
@@ -141,11 +145,12 @@ public class TopologyTemplate   {
 
     /**
      * Get relationshipTemplates
+     *
      * @return relationshipTemplates
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getRelationshipTemplates() {
         return relationshipTemplates;
     }
@@ -169,11 +174,12 @@ public class TopologyTemplate   {
 
     /**
      * Get outputs
+     *
      * @return outputs
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getOutputs() {
         return outputs;
     }
@@ -197,11 +203,12 @@ public class TopologyTemplate   {
 
     /**
      * Get groups
+     *
      * @return groups
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getGroups() {
         return groups;
     }
@@ -225,11 +232,12 @@ public class TopologyTemplate   {
 
     /**
      * Get substitutionMappings
+     *
      * @return substitutionMappings
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
-
     public Map<String, Object> getSubstitutionMappings() {
         return substitutionMappings;
     }
@@ -253,8 +261,10 @@ public class TopologyTemplate   {
 
     /**
      * Get policies
+     *
      * @return policies
-  **/
+  *
+     */
     @ApiModelProperty(value = "")
 
     @Valid
@@ -267,7 +277,6 @@ public class TopologyTemplate   {
         this.policies = policies;
     }
 
-
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -276,15 +285,15 @@ public class TopologyTemplate   {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-    TopologyTemplate topologyTemplate2 = (TopologyTemplate) o;
-    return Objects.equals(this.description, topologyTemplate2.description) &&
-        Objects.equals(this.inputs, topologyTemplate2.inputs) &&
-        Objects.equals(this.nodeTemplates, topologyTemplate2.nodeTemplates) &&
-        Objects.equals(this.relationshipTemplates, topologyTemplate2.relationshipTemplates) &&
-        Objects.equals(this.outputs, topologyTemplate2.outputs) &&
-        Objects.equals(this.groups, topologyTemplate2.groups) &&
-        Objects.equals(this.substitutionMappings, topologyTemplate2.substitutionMappings) &&
-        Objects.equals(this.policies, topologyTemplate2.policies);
+        TopologyTemplate topologyTemplate = (TopologyTemplate) o;
+        return Objects.equals(this.description, topologyTemplate.description)
+                && Objects.equals(this.inputs, topologyTemplate.inputs)
+                && Objects.equals(this.nodeTemplates, topologyTemplate.nodeTemplates)
+                && Objects.equals(this.relationshipTemplates, topologyTemplate.relationshipTemplates)
+                && Objects.equals(this.outputs, topologyTemplate.outputs)
+                && Objects.equals(this.groups, topologyTemplate.groups)
+                && Objects.equals(this.substitutionMappings, topologyTemplate.substitutionMappings)
+                && Objects.equals(this.policies, topologyTemplate.policies);
     }
 
     @Override
@@ -295,7 +304,7 @@ public class TopologyTemplate   {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-    sb.append("class TopologyTemplate2 {\n");
+        sb.append("class TopologyTemplate {\n");
 
         sb.append("    description: ").append(toIndentedString(description)).append("\n");
         sb.append("    inputs: ").append(toIndentedString(inputs)).append("\n");
@@ -320,4 +329,3 @@ public class TopologyTemplate   {
         return o.toString().replace("\n", "\n    ");
     }
 }
-

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

 package nl.uva.sne.drip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,13 +16,10 @@ import org.springframework.data.annotation.Id;
  * ToscaTemplate
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
+
 public class ToscaTemplate {
 
-    /**
-     * @return the id
-     */
     public String getId() {
         return id;
     }

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

-package nl.uva.sne.drip.model;
+package io.swagger.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonProperty.Access;
-import io.swagger.annotations.ApiModelProperty;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.data.annotation.Id;
 
 /**
  * User
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-25T14:09:25.182Z")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class User {
-
-    @JsonProperty("id")
-    private Long id = null;
-
-    @JsonProperty("username")
-    private String username = null;
-
-    @JsonProperty("firstName")
-    private String firstName = null;
-
-    @JsonProperty("lastName")
-    private String lastName = null;
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-10T15:39:04.296Z")
 
-    @JsonProperty("email")
-    private String email = null;
-
-    @JsonProperty(value = "password", access = Access.WRITE_ONLY)
-    private String password = null;
-
-    @JsonProperty("userStatus")
-    private Integer userStatus = null;
-
-    public User id(Long id) {
-        this.id = id;
-        return this;
-    }
-
-    /**
-     * Get id
-     *
-     * @return id
-  *
-     */
-    @ApiModelProperty(value = "")
+public class User {
 
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public User username(String username) {
-        this.username = username;
-        return this;
-    }
-
-    /**
-     * Get username
-     *
-     * @return username
-  *
-     */
-    @ApiModelProperty(value = "")
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public User firstName(String firstName) {
-        this.firstName = firstName;
-        return this;
-    }
-
-    /**
-     * Get firstName
-     *
-     * @return firstName
-  *
-     */
-    @ApiModelProperty(value = "")
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public User lastName(String lastName) {
-        this.lastName = lastName;
-        return this;
-    }
-
     /**
-     * Get lastName
-     *
-     * @return lastName
-  *
+     * @param id the id to set
      */
-    @ApiModelProperty(value = "")
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public User email(String email) {
-        this.email = email;
-        return this;
-    }
-
-    /**
-     * Get email
-     *
-     * @return email
-  *
-     */
-    @ApiModelProperty(value = "")
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public User password(String password) {
-        this.password = password;
-        return this;
+    public void setId(String id) {
+        this.id = id;
     }
 
-    /**
-     * Get password
-     *
-     * @return password
-  *
-     */
-    @ApiModelProperty(value = "")
-
+    @Id
     @JsonIgnore
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public User userStatus(Integer userStatus) {
-        this.userStatus = userStatus;
-        return this;
-    }
-
-    /**
-     * User Status
-     *
-     * @return userStatus
-  *
-     */
-    @ApiModelProperty(value = "User Status")
-
-    public Integer getUserStatus() {
-        return userStatus;
-    }
-
-    public void setUserStatus(Integer userStatus) {
-        this.userStatus = userStatus;
-    }
+    private String id;
 
     @Override
     public boolean equals(java.lang.Object o) {
@@ -193,19 +36,12 @@ public class User {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        User user = (User) o;
-        return Objects.equals(this.id, user.id)
-                && Objects.equals(this.username, user.username)
-                && Objects.equals(this.firstName, user.firstName)
-                && Objects.equals(this.lastName, user.lastName)
-                && Objects.equals(this.email, user.email)
-                && Objects.equals(this.password, user.password)
-                && Objects.equals(this.userStatus, user.userStatus);
+        return true;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, username, firstName, lastName, email, password, userStatus);
+        return Objects.hash();
     }
 
     @Override
@@ -213,13 +49,6 @@ public class User {
         StringBuilder sb = new StringBuilder();
         sb.append("class User {\n");
 
-        sb.append("    id: ").append(toIndentedString(id)).append("\n");
-        sb.append("    username: ").append(toIndentedString(username)).append("\n");
-        sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-        sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-        sb.append("    email: ").append(toIndentedString(email)).append("\n");
-        sb.append("    password: ").append(toIndentedString(password)).append("\n");
-        sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
         sb.append("}");
         return sb.toString();
     }

drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/ApiClient.java

@@ -11,6 +11,7 @@
  */
 package nl.uva.sne.drip.sure_tosca.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.squareup.okhttp.*;
 
 import javax.net.ssl.*;

drip-commons/src/main/java/nl/uva/sne/drip/sure_tosca/client/JSON.java

@@ -9,8 +9,6 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-
-
 package nl.uva.sne.drip.sure_tosca.client;
 
 import com.google.gson.Gson;
@@ -38,6 +36,7 @@ import java.util.Date;
 import java.util.Map;
 
 public class JSON {
+
     private Gson gson;
     private boolean isLenientOnJson = false;
     private DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
@@ -47,15 +46,14 @@ public class JSON {
     private ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
 
     public static GsonBuilder createGson() {
-        GsonFireBuilder fireBuilder = new GsonFireBuilder()
-        ;
+        GsonFireBuilder fireBuilder = new GsonFireBuilder();
         GsonBuilder builder = fireBuilder.createGsonBuilder();
         return builder;
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
         JsonElement element = readElement.getAsJsonObject().get(discriminatorField);
-        if(null == element) {
+        if (null == element) {
             throw new IllegalArgumentException("missing discriminator field: <" + discriminatorField + ">");
         }
         return element.getAsString();
@@ -63,7 +61,7 @@ public class JSON {
 
     private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
         Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
-        if(null == clazz) {
+        if (null == clazz) {
             throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
         }
         return clazz;
@@ -122,7 +120,6 @@ public class JSON {
      * @param returnType The type to deserialize into
      * @return The deserialized Java object
      */
-    @SuppressWarnings("unchecked")
     public <T> T deserialize(String body, Type returnType) {
         try {
             if (isLenientOnJson) {
@@ -136,9 +133,11 @@ public class JSON {
         } catch (JsonParseException e) {
             // Fallback processing when failed to parse JSON form response body:
             // return the response body string directly for the String return type;
-            if (returnType.equals(String.class))
+            if (returnType.equals(String.class)) {
                 return (T) body;
-            else throw (e);
+            } else {
+                throw (e);
+            }
         }
     }
 
@@ -207,7 +206,7 @@ public class JSON {
                 default:
                     String date = in.nextString();
                     if (date.endsWith("+0000")) {
-                        date = date.substring(0, date.length()-5) + "Z";
+                        date = date.substring(0, date.length() - 5) + "Z";
                     }
                     return OffsetDateTime.parse(date, formatter);
             }
@@ -266,9 +265,9 @@ public class JSON {
     }
 
     /**
-     * Gson TypeAdapter for java.sql.Date type
-     * If the dateFormat is null, a simple "yyyy-MM-dd" format will be used
-     * (more efficient than SimpleDateFormat).
+     * Gson TypeAdapter for java.sql.Date type If the dateFormat is null, a
+     * simple "yyyy-MM-dd" format will be used (more efficient than
+     * SimpleDateFormat).
      */
     public static class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
 
@@ -321,8 +320,8 @@ public class JSON {
     }
 
     /**
-     * Gson TypeAdapter for java.util.Date type
-     * If the dateFormat is null, ISO8601Utils will be used.
+     * Gson TypeAdapter for java.util.Date type If the dateFormat is null,
+     * ISO8601Utils will be used.
      */
     public static class DateTypeAdapter extends TypeAdapter<Date> {
 

drip-commons/src/test/java/nl/uva/sne/drip/commons/utils/ToscaHelperTest.java

@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import nl.uva.sne.drip.model.NodeTemplate;
 import nl.uva.sne.drip.model.ToscaTemplate;
 import org.junit.After;
@@ -60,10 +61,8 @@ public class ToscaHelperTest {
         prop.load(new FileInputStream(resourceName));
         byte[] bytes = Files.readAllBytes(Paths.get(testUpdatedApplicationExampleToscaFilePath));
         String ymlStr = new String(bytes, "UTF-8");
-
         objectMapper = new ObjectMapper(new YAMLFactory().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
         toscaTemplate = objectMapper.readValue(ymlStr, ToscaTemplate.class);
-
         instance = new ToscaHelper(toscaTemplate, prop.getProperty("sure-tosca.base.path"));
 
     }
@@ -97,9 +96,12 @@ public class ToscaHelperTest {
     public void testGetProvisionInterfaceDefinitions() throws Exception {
         System.out.println("getProvisionInterfaceDefinitions");
         List<String> toscaInterfaceTypes = new ArrayList<>();
-        toscaInterfaceTypes.add("tosca.interfaces.ARTICONF.CloudsStorm");
+        String expected = "tosca.interfaces.ARTICONF.CloudsStorm";
+        toscaInterfaceTypes.add(expected);
         List<Map<String, Object>> result = instance.getProvisionInterfaceDefinitions(toscaInterfaceTypes);
         assertNotNull(result);
+        String key = result.get(0).keySet().iterator().next();
+        assertEquals(expected, key);
     }
 
     /**
@@ -110,7 +112,7 @@ public class ToscaHelperTest {
         System.out.println("getVMTopologyTemplates");
         List<NodeTemplate> result = instance.getVMTopologyTemplates();
         assertNotNull(result);
-        for(NodeTemplate nodeTemplate:result){
+        for (NodeTemplate nodeTemplate : result) {
             assertEquals(nodeTemplate.getType(), "tosca.nodes.ARTICONF.VM.topology");
         }
     }

drip-commons/src/test/java/nl/uva/sne/drip/sure_tosca/client/DefaultApiTest.java

+/*
+ * tosca-sure
+ * TOSCA Simple qUeRy sErvice (SURE). 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: S.Koulouzis@uva.nl
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+package nl.uva.sne.drip.sure_tosca.client;
+
+import java.io.File;
+import org.junit.Test;
+
+import java.util.List;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * API tests for DefaultApi
+ */
+public class DefaultApiTest {
+
+//    private final DefaultApi api = new DefaultApi();
+
+    /**
+     *
+     *
+     * Recursively get all requirements all the way to the ROOT including the
+     * input node's
+     *
+     * @throws ApiException if the Api call fails
+     */
+    @Test
+    public void getAllAncestorPropertiesTest() throws ApiException {
+        String id = "1";
+        String nodeName = null;
+        assertTrue(true);
+//        List<Map<String, Object>> response = api.getAllAncestorProperties(id, nodeName);
+
+        // TODO: test validations
+    }
+
+//    /**
+//     *
+//     *
+//     * Recursively get all requirements all the way to the ROOT including the
+//     * input node&#39;s
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getAllAncestorTypesTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        List<String> response = api.getAllAncestorTypes(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * Recursively get all requirements all the way to the ROOT including the
+//     * input node&#39;s
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getAncestorsRequirementsTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        Map<String, Object> response = api.getAncestorsRequirements(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * returns the interface types
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getDslDefinitionsTest() throws ApiException {
+//        String id = null;
+//        List<String> anchors = null;
+//        String derivedFrom = null;
+////        List<Map<String, Object>> response = api.getDslDefinitions(id, anchors, derivedFrom);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * returns the interface types
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getImportsTest() throws ApiException {
+//        String id = null;
+////        List<Map<String, Object>> response = api.getImports(id);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * s
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getNodeOutputsTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        List<Map<String, Object>> response = api.getNodeOutputs(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * s
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getNodePropertiesTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        Map<String, Object> response = api.getNodeProperties(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * Returns the requirements for an input node as described in the template
+//     * not in the node&#39;s definition
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getNodeRequirementsTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        Map<String, Object> response = api.getNodeRequirements(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * returns nodes templates in topology
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getNodeTemplatesTest() throws ApiException {
+//        String id = null;
+//        String typeName = null;
+//        String nodeName = null;
+//        Boolean hasInterfaces = null;
+//        Boolean hasProperties = null;
+//        Boolean hasAttributes = null;
+//        Boolean hasRequirements = null;
+//        Boolean hasCapabilities = null;
+//        Boolean hasArtifacts = null;
+////        List<NodeTemplate> response = api.getNodeTemplates(id, typeName, nodeName, hasInterfaces, hasProperties, hasAttributes, hasRequirements, hasCapabilities, hasArtifacts);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     *
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getNodeTypeNameTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        String response = api.getNodeTypeName(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     *
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getParentTypeNameTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        String response = api.getParentTypeName(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * s
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getRelatedNodesTest() throws ApiException {
+//        String id = null;
+//        String nodeName = null;
+////        List<NodeTemplate> response = api.getRelatedNodes(id, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * returns the interface types
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getRelationshipTemplatesTest() throws ApiException {
+//        String id = null;
+//        String typeName = null;
+//        String derivedFrom = null;
+////        List<Map<String, Object>> response = api.getRelationshipTemplates(id, typeName, derivedFrom);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * r
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getTopologyTemplateTest() throws ApiException {
+//        String id = null;
+////        TopologyTemplate response = api.getTopologyTemplate(id);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     *
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getToscaTemplateTest() throws ApiException {
+//        String id = null;
+////        ToscaTemplate response = api.getToscaTemplate(id);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * returns the interface types
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void getTypesTest() throws ApiException {
+//        String id = null;
+//        String kindOfType = null;
+//        Boolean hasInterfaces = null;
+//        String typeName = null;
+//        Boolean hasProperties = null;
+//        Boolean hasAttributes = null;
+//        Boolean hasRequirements = null;
+//        Boolean hasCapabilities = null;
+//        Boolean hasArtifacts = null;
+//        String derivedFrom = null;
+////        List<Map<String, Object>> response = api.getTypes(id, kindOfType, hasInterfaces, typeName, hasProperties, hasAttributes, hasRequirements, hasCapabilities, hasArtifacts, derivedFrom);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     *
+//     *
+//     * s
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void setNodePropertiesTest() throws ApiException {
+//        String id = null;
+//        Object properties = null;
+//        String nodeName = null;
+////        String response = api.setNodeProperties(id, properties, nodeName);
+//
+//        // TODO: test validations
+//    }
+//
+//    /**
+//     * upload a tosca template description file
+//     *
+//     * upload and validate a tosca template description file
+//     *
+//     * @throws ApiException if the Api call fails
+//     */
+//    @Test
+//    public void uploadToscaTemplateTest() throws ApiException {
+//        File file = null;
+////        String response = api.uploadToscaTemplate(file);
+//
+//        // TODO: test validations
+//    }
+
+}

drip-provisioner/pom.xml

@@ -28,7 +28,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9.3</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -52,13 +51,11 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

openAPI/schema/TOSCA/NodeTemplate.yml

   NodeTemplate:
       type: "object"
       properties:
+          name:
+              type: "string"
           derived_from:
               type: "string"
           properties: