set tosca template attributes

drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormVM.java

@@ -3,30 +3,31 @@ package nl.uva.sne.drip.model.cloud.storm;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
 import java.util.Map;
-import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
+import javax.validation.Valid;
 
 /**
  * CloudsStormVM
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-30T16:13:55.433Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-01-12T18:26:54.530Z")
 
 public class CloudsStormVM {
 
     /**
-     * @return the extraInfo
+     * @return the selfEthAddresses
      */
-    public Map<String, Object> getExtraInfo() {
-        return extraInfo;
+    public String getSelfEthAddresses() {
+        return selfEthAddresses;
     }
 
     /**
-     * @param extraInfo the extraInfo to set
+     * @param selfEthAddresses the selfEthAddresses to set
      */
-    public void setExtraInfo(Map<String, Object> extraInfo) {
-        this.extraInfo = extraInfo;
+    public void setSelfEthAddresses(String selfEthAddresses) {
+        this.selfEthAddresses = selfEthAddresses;
     }
 
     @JsonProperty("name")
@@ -36,7 +37,7 @@ public class CloudsStormVM {
     private String nodeType = null;
 
     @JsonProperty("OStype")
-    private String osType = null;
+    private String ostype = null;
 
     @JsonProperty("script")
     private String script = null;
@@ -47,6 +48,10 @@ public class CloudsStormVM {
     @JsonProperty("type")
     private String type = null;
 
+    @JsonProperty("extraInfo")
+    @Valid
+    private Map<String, Object> extraInfo = null;
+
     @JsonProperty("OS")
     private String OS = null;
 
@@ -57,14 +62,19 @@ public class CloudsStormVM {
     private String MEM = null;
 
     @JsonProperty("VMType")
-    private String VMType = null;
+    private String vmType = null;
 
     @JsonProperty("Price")
-    private String Price = null;
+    private String price = null;
 
-    @JsonProperty("extraInfo")
-    @Valid
-    private Map<String, Object> extraInfo = null;
+    @JsonProperty("DefaultSSHAccount")
+    private String defaultSSHAccount = null;
+
+    @JsonProperty("availability")
+    private String availability = null;
+
+    @JsonProperty("selfEthAddresses")
+    private String selfEthAddresses = null;
 
     public CloudsStormVM name(String name) {
         this.name = name;
@@ -108,25 +118,25 @@ public class CloudsStormVM {
         this.nodeType = nodeType;
     }
 
-    public CloudsStormVM osType(String osType) {
-        this.osType = osType;
+    public CloudsStormVM ostype(String ostype) {
+        this.ostype = ostype;
         return this;
     }
 
     /**
-     * Get osType
+     * Get ostype
      *
-     * @return osType
+     * @return ostype
      *
      */
     @ApiModelProperty(value = "")
 
-    public String getOsType() {
-        return osType;
+    public String getOstype() {
+        return ostype;
     }
 
-    public void setOsType(String osType) {
-        this.osType = osType;
+    public void setOstype(String ostype) {
+        this.ostype = ostype;
     }
 
     public CloudsStormVM script(String script) {
@@ -171,6 +181,203 @@ public class CloudsStormVM {
         this.publicAddress = publicAddress;
     }
 
+    public CloudsStormVM type(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get type
+     *
+     * @return type
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public CloudsStormVM extraInfo(Map<String, Object> extraInfo) {
+        this.extraInfo = extraInfo;
+        return this;
+    }
+
+    public CloudsStormVM putExtraInfoItem(String key, Object extraInfoItem) {
+        if (this.extraInfo == null) {
+            this.extraInfo = new HashMap<String, Object>();
+        }
+        this.extraInfo.put(key, extraInfoItem);
+        return this;
+    }
+
+    /**
+     * Get extraInfo
+     *
+     * @return extraInfo
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public Map<String, Object> getExtraInfo() {
+        return extraInfo;
+    }
+
+    public void setExtraInfo(Map<String, Object> extraInfo) {
+        this.extraInfo = extraInfo;
+    }
+
+    public CloudsStormVM OS(String OS) {
+        this.OS = OS;
+        return this;
+    }
+
+    /**
+     * Get OS
+     *
+     * @return OS
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getOS() {
+        return OS;
+    }
+
+    public void setOS(String OS) {
+        this.OS = OS;
+    }
+
+    public CloudsStormVM CPU(String CPU) {
+        this.CPU = CPU;
+        return this;
+    }
+
+    /**
+     * Get CPU
+     *
+     * @return CPU
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getCPU() {
+        return CPU;
+    }
+
+    public void setCPU(String CPU) {
+        this.CPU = CPU;
+    }
+
+    public CloudsStormVM MEM(String MEM) {
+        this.MEM = MEM;
+        return this;
+    }
+
+    /**
+     * Get MEM
+     *
+     * @return MEM
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getMEM() {
+        return MEM;
+    }
+
+    public void setMEM(String MEM) {
+        this.MEM = MEM;
+    }
+
+    public CloudsStormVM vmType(String vmType) {
+        this.vmType = vmType;
+        return this;
+    }
+
+    /**
+     * Get vmType
+     *
+     * @return vmType
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getVmType() {
+        return vmType;
+    }
+
+    public void setVmType(String vmType) {
+        this.vmType = vmType;
+    }
+
+    public CloudsStormVM price(String price) {
+        this.price = price;
+        return this;
+    }
+
+    /**
+     * Get price
+     *
+     * @return price
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public CloudsStormVM defaultSSHAccount(String defaultSSHAccount) {
+        this.defaultSSHAccount = defaultSSHAccount;
+        return this;
+    }
+
+    /**
+     * Get defaultSSHAccount
+     *
+     * @return defaultSSHAccount
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getDefaultSSHAccount() {
+        return defaultSSHAccount;
+    }
+
+    public void setDefaultSSHAccount(String defaultSSHAccount) {
+        this.defaultSSHAccount = defaultSSHAccount;
+    }
+
+    public CloudsStormVM availability(String availability) {
+        this.availability = availability;
+        return this;
+    }
+
+    /**
+     * Get availability
+     *
+     * @return availability
+     *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getAvailability() {
+        return availability;
+    }
+
+    public void setAvailability(String availability) {
+        this.availability = availability;
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -182,14 +389,23 @@ public class CloudsStormVM {
         CloudsStormVM cloudsStormVM = (CloudsStormVM) o;
         return Objects.equals(this.name, cloudsStormVM.name)
                 && Objects.equals(this.nodeType, cloudsStormVM.nodeType)
-                && Objects.equals(this.osType, cloudsStormVM.osType)
+                && Objects.equals(this.ostype, cloudsStormVM.ostype)
                 && Objects.equals(this.script, cloudsStormVM.script)
-                && Objects.equals(this.publicAddress, cloudsStormVM.publicAddress);
+                && Objects.equals(this.publicAddress, cloudsStormVM.publicAddress)
+                && Objects.equals(this.type, cloudsStormVM.type)
+                && Objects.equals(this.extraInfo, cloudsStormVM.extraInfo)
+                && Objects.equals(this.OS, cloudsStormVM.OS)
+                && Objects.equals(this.CPU, cloudsStormVM.CPU)
+                && Objects.equals(this.MEM, cloudsStormVM.MEM)
+                && Objects.equals(this.vmType, cloudsStormVM.vmType)
+                && Objects.equals(this.price, cloudsStormVM.price)
+                && Objects.equals(this.defaultSSHAccount, cloudsStormVM.defaultSSHAccount)
+                && Objects.equals(this.availability, cloudsStormVM.availability);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, nodeType, osType, script, publicAddress);
+        return Objects.hash(name, nodeType, ostype, script, publicAddress, type, extraInfo, OS, CPU, MEM, vmType, price, defaultSSHAccount, availability);
     }
 
     @Override
@@ -199,9 +415,18 @@ public class CloudsStormVM {
 
         sb.append("    name: ").append(toIndentedString(name)).append("\n");
         sb.append("    nodeType: ").append(toIndentedString(nodeType)).append("\n");
-        sb.append("    osType: ").append(toIndentedString(osType)).append("\n");
+        sb.append("    ostype: ").append(toIndentedString(ostype)).append("\n");
         sb.append("    script: ").append(toIndentedString(script)).append("\n");
         sb.append("    publicAddress: ").append(toIndentedString(publicAddress)).append("\n");
+        sb.append("    type: ").append(toIndentedString(type)).append("\n");
+        sb.append("    extraInfo: ").append(toIndentedString(extraInfo)).append("\n");
+        sb.append("    OS: ").append(toIndentedString(OS)).append("\n");
+        sb.append("    CPU: ").append(toIndentedString(CPU)).append("\n");
+        sb.append("    MEM: ").append(toIndentedString(MEM)).append("\n");
+        sb.append("    vmType: ").append(toIndentedString(vmType)).append("\n");
+        sb.append("    price: ").append(toIndentedString(price)).append("\n");
+        sb.append("    defaultSSHAccount: ").append(toIndentedString(defaultSSHAccount)).append("\n");
+        sb.append("    availability: ").append(toIndentedString(availability)).append("\n");
         sb.append("}");
         return sb.toString();
     }
@@ -216,20 +441,4 @@ public class CloudsStormVM {
         }
         return o.toString().replace("\n", "\n    ");
     }
-
-    public String getCPU() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    public String getMEM() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    public String getVmType() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    public String getOS() {
-        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/cloud/storm/CloudsStormVMs.java

@@ -12,14 +12,9 @@ import javax.validation.Valid;
  * CloudsStormVMs
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-30T16:13:55.433Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-01-12T18:26:54.530Z")
 
 public class CloudsStormVMs {
-    
-        @JsonProperty("SEngineClass")
-        private String sEngineClass;
-    
-            
 
     @JsonProperty("VMs")
     @Valid

drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/DBInfo.java

@@ -2,20 +2,17 @@ package nl.uva.sne.drip.model.cloud.storm;
 
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
 import java.util.List;
-import nl.uva.sne.drip.model.cloud.storm.DCMetaInfo;
 import org.springframework.validation.annotation.Validated;
 import javax.validation.Valid;
-import javax.validation.constraints.*;
 
 /**
  * DBInfo
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-01-12T18:26:54.530Z")
 
 public class DBInfo {
 
@@ -23,6 +20,7 @@ public class DBInfo {
     private String globalEntry = null;
 
     @JsonProperty("DCMetaInfo")
+    @Valid
     private List<DCMetaInfo> dcMetaInfo = null;
 
     public DBInfo globalEntry(String globalEntry) {
@@ -34,7 +32,7 @@ public class DBInfo {
      * Get globalEntry
      *
      * @return globalEntry
-  *
+     *
      */
     @ApiModelProperty(value = "")
 
@@ -51,11 +49,19 @@ public class DBInfo {
         return this;
     }
 
+    public DBInfo addDcMetaInfoItem(DCMetaInfo dcMetaInfoItem) {
+        if (this.dcMetaInfo == null) {
+            this.dcMetaInfo = new ArrayList<DCMetaInfo>();
+        }
+        this.dcMetaInfo.add(dcMetaInfoItem);
+        return this;
+    }
+
     /**
      * Get dcMetaInfo
      *
      * @return dcMetaInfo
-  *
+     *
      */
     @ApiModelProperty(value = "")
 

drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/DCMetaInfo.java

@@ -3,6 +3,7 @@ package nl.uva.sne.drip.model.cloud.storm;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,7 +14,7 @@ import javax.validation.Valid;
  * DCMetaInfo
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-11T15:13:55.016Z")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-01-12T18:26:54.530Z")
 
 public class DCMetaInfo {
 
@@ -36,6 +37,7 @@ public class DCMetaInfo {
     private String availability = null;
 
     @JsonProperty("VMMetaInfo")
+    @Valid
     private List<CloudsStormVM> vmMetaInfo = null;
 
     @JsonProperty("extraInfo")
@@ -51,7 +53,7 @@ public class DCMetaInfo {
      * Get domain
      *
      * @return domain
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -72,7 +74,7 @@ public class DCMetaInfo {
      * Get endpoint
      *
      * @return endpoint
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -93,7 +95,7 @@ public class DCMetaInfo {
      * Get country
      *
      * @return country
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -114,7 +116,7 @@ public class DCMetaInfo {
      * Get longitude
      *
      * @return longitude
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -135,7 +137,7 @@ public class DCMetaInfo {
      * Get latitude
      *
      * @return latitude
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -156,7 +158,7 @@ public class DCMetaInfo {
      * Get availability
      *
      * @return availability
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -173,11 +175,19 @@ public class DCMetaInfo {
         return this;
     }
 
+    public DCMetaInfo addVmMetaInfoItem(CloudsStormVM vmMetaInfoItem) {
+        if (this.vmMetaInfo == null) {
+            this.vmMetaInfo = new ArrayList<CloudsStormVM>();
+        }
+        this.vmMetaInfo.add(vmMetaInfoItem);
+        return this;
+    }
+
     /**
      * Get vmMetaInfo
      *
      * @return vmMetaInfo
-     *
+  *
      */
     @ApiModelProperty(value = "")
 
@@ -208,7 +218,7 @@ public class DCMetaInfo {
      * Get extraInfo
      *
      * @return extraInfo
-     *
+  *
      */
     @ApiModelProperty(value = "")
 

drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormDAO.java

@@ -18,6 +18,7 @@ import nl.uva.sne.drip.model.cloud.storm.CloudDB;
 import nl.uva.sne.drip.model.cloud.storm.CloudsStormVM;
 import nl.uva.sne.drip.model.cloud.storm.DB;
 import nl.uva.sne.drip.model.cloud.storm.DBInfo;
+import nl.uva.sne.drip.model.cloud.storm.DCMetaInfo;
 
 /**
  *
@@ -51,8 +52,8 @@ class CloudStormDAO {
 
             List<CloudsStormVM> vMMetaInfos = new ArrayList<>();
             DBInfo dbInfo = objectMapper.readValue(new File(cloudStormDBPath + File.separator + targetCloudDB.getDbInfoFile()), DBInfo.class);
-            List<CloudsStormVM> metaInfos = dbInfo.getDcMetaInfo();
-            for (CloudsStormVM metaInfo : metaInfos) {
+            List<DCMetaInfo> metaInfos = dbInfo.getDcMetaInfo();
+            for (DCMetaInfo metaInfo : metaInfos) {
                 vMMetaInfos.addAll(metaInfo.getVmMetaInfo());
             }
             return vMMetaInfos;

drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java

@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import nl.uva.sne.drip.commons.utils.Converter;
@@ -176,7 +175,8 @@ class CloudStormService {
                 cloudsStormVM.setNodeType(vmType);
                 cloudsStormVM.setName("vm" + j);
                 String os = helper.getVMNOS(vmMap);
-                cloudsStormVM.setOsType(os);
+                cloudsStormVM.setOS(os);
+                cloudsStormVM.setOstype(os);
                 vms.add(cloudsStormVM);
                 j++;
             }
@@ -200,8 +200,8 @@ class CloudStormService {
         for (CloudsStormVM vmInfo : vmInfos) {
             Logger.getLogger(CloudStormService.class.getName()).log(Level.FINE, "vmInfo: {0}", vmInfo);
             Logger.getLogger(CloudStormService.class.getName()).log(Level.FINE, "numOfCores:{0} memSize: {1} os: {2}", new Object[]{numOfCores, memSize, os});
-            if (Objects.equals(numOfCores, Double.valueOf(vmInfo.getCPU())) && 
-                    Objects.equals(memSize, Double.valueOf(vmInfo.getMEM())) && os.toLowerCase().equals(vmInfo.getOS().toLowerCase())) {
+            if (Objects.equals(numOfCores, Double.valueOf(vmInfo.getCPU()))
+                    && Objects.equals(memSize, Double.valueOf(vmInfo.getMEM())) && os.toLowerCase().equals(vmInfo.getOS().toLowerCase())) {
                 return vmInfo.getVmType();
             }
         }
@@ -303,20 +303,6 @@ class CloudStormService {
             }
             att.put("status", subTopology.getStatus().toString());
 
-            CloudsStormVMs cloudsStormVMs = objectMapper.readValue(new File(tempInputDirPath + TOPOLOGY_RELATIVE_PATH + File.separator + subTopology.getTopology()),
-                    CloudsStormVMs.class);
-            List<CloudsStormVM> vms = cloudsStormVMs.getVms();
-            List<NodeTemplateMap> vmTemplatesMap = helper.getTemplateVMsForVMTopology(nodeTemplateMap);
-            int j = 0;
-            for (CloudsStormVM vm : vms) {
-                NodeTemplateMap vmTemplateMap = vmTemplatesMap.get(j);
-                Map<String, Object> vmAttributes = vmTemplateMap.getNodeTemplate().getAttributes();
-                if (vmAttributes==null){
-                    vmAttributes = new HashMap<>();
-                }
-                vmAttributes.put("private_ip", vm.get);
-            }
-
             String rootKeyPairFolder = tempInputDirPath + TOPOLOGY_RELATIVE_PATH
                     + TOP_TOPOLOGY_FILE_NAME + File.separator + subTopology.getSshKeyPairId();
             Credential rootKeyPairCredential = new Credential();
@@ -329,12 +315,36 @@ class CloudStormService {
             String userKyePairFolder = tempInputDirPath + TOPOLOGY_RELATIVE_PATH
                     + TOP_TOPOLOGY_FILE_NAME;
             Credential userKeyPairCredential = new Credential();
-            rootKeyPairCredential.setProtocol("ssh");
+            userKeyPairCredential.setProtocol("ssh");
             keys = new HashMap<>();
             keys.put("private_key", Converter.encodeFileToBase64Binary(userKyePairFolder + File.separator + "id_rsa"));
             keys.put("public_key", Converter.encodeFileToBase64Binary(userKyePairFolder + File.separator + "id_rsa.pub"));
             userKeyPairCredential.setKeys(keys);
 
+            CloudsStormVMs cloudsStormVMs = objectMapper.readValue(new File(tempInputDirPath + TOPOLOGY_RELATIVE_PATH + File.separator + subTopology.getTopology()),
+                    CloudsStormVMs.class);
+            List<CloudsStormVM> vms = cloudsStormVMs.getVms();
+            List<NodeTemplateMap> vmTemplatesMap = helper.getTemplateVMsForVMTopology(nodeTemplateMap);
+            int j = 0;
+            for (CloudsStormVM vm : vms) {
+                NodeTemplateMap vmTemplateMap = vmTemplatesMap.get(j);
+                Map<String, Object> vmAttributes = vmTemplateMap.getNodeTemplate().getAttributes();
+                if (vmAttributes == null) {
+                    vmAttributes = new HashMap<>();
+                }
+                vmAttributes.put("private_ip", vm.getSelfEthAddresses());
+                vmAttributes.put("public_ip", vm.getPublicAddress());
+                if (j > 0) {
+                    vmAttributes.put("role", "master");
+                } else {
+                    vmAttributes.put("role", "worker");
+                }
+                vmAttributes.put("node_type", vm.getNodeType());
+                vmAttributes.put("host_name", vm.getName());
+                vmAttributes.put("root_key_pair", rootKeyPairCredential);
+                vmAttributes.put("user_key_pair", userKeyPairCredential);
+            }
+
         }
         return null;
     }

openAPI/schema/CloudStorm/CloudsStormVM.yml

@@ -31,5 +31,9 @@
                 type: "string"
             availability:
                 type: "string"
+            selfEthAddresses:
+                type: "string"
+                
+