added more properties for EC2

commons/pom.xml

@@ -21,7 +21,7 @@
     </properties>
     <parent>
         <groupId>nl.uva.sne.drip</groupId>
-        <artifactId>drip</artifactId>
+        <artifactId>conf</artifactId>
         <version>3.0.0</version>
     </parent>
     

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

@@ -17,6 +17,132 @@ import javax.validation.Valid;
 
 public class CloudsStormVM {
 
+    /**
+     * @return the iOPS
+     */
+    public Integer getiOPS() {
+        return iOPS;
+    }
+
+    /**
+     * @param iOPS the iOPS to set
+     */
+    public void setiOPS(Integer iOPS) {
+        this.iOPS = iOPS;
+    }
+
+    /**
+     * @return the vpcId
+     */
+    public String getVpcId() {
+        return vpcId;
+    }
+
+    /**
+     * @param vpcId the vpcId to set
+     */
+    public void setVpcId(String vpcId) {
+        this.vpcId = vpcId;
+    }
+
+    /**
+     * @return the subnetId
+     */
+    public String getSubnetId() {
+        return subnetId;
+    }
+
+    /**
+     * @param subnetId the subnetId to set
+     */
+    public void setSubnetId(String subnetId) {
+        this.subnetId = subnetId;
+    }
+
+    /**
+     * @return the securityGroupId
+     */
+    public String getSecurityGroupId() {
+        return securityGroupId;
+    }
+
+    /**
+     * @param securityGroupId the securityGroupId to set
+     */
+    public void setSecurityGroupId(String securityGroupId) {
+        this.securityGroupId = securityGroupId;
+    }
+
+    /**
+     * @return the instanceId
+     */
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    /**
+     * @param instanceId the instanceId to set
+     */
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    /**
+     * @return the volumeId
+     */
+    public Object getVolumeId() {
+        return volumeId;
+    }
+
+    /**
+     * @param volumeId the volumeId to set
+     */
+    public void setVolumeId(Object volumeId) {
+        this.volumeId = volumeId;
+    }
+
+    /**
+     * @return the routeTableId
+     */
+    public String getRouteTableId() {
+        return routeTableId;
+    }
+
+    /**
+     * @param routeTableId the routeTableId to set
+     */
+    public void setRouteTableId(String routeTableId) {
+        this.routeTableId = routeTableId;
+    }
+
+    /**
+     * @return the internetGatewayId
+     */
+    public String getInternetGatewayId() {
+        return internetGatewayId;
+    }
+
+    /**
+     * @param internetGatewayId the internetGatewayId to set
+     */
+    public void setInternetGatewayId(String internetGatewayId) {
+        this.internetGatewayId = internetGatewayId;
+    }
+
+    /**
+     * @return the diskSize
+     */
+    public Integer getDiskSize() {
+        return diskSize;
+    }
+
+    /**
+     * @param diskSize the diskSize to set
+     */
+    public void setDiskSize(Integer diskSize) {
+        this.diskSize = diskSize;
+    }
+
     /**
      * @return the vEngineClass
      */
@@ -133,6 +259,7 @@ public class CloudsStormVM {
     private String name = null;
 
     @JsonProperty("nodeType")
+    @JsonAlias({"type"})
     private String nodeType = null;
 
     @JsonProperty("VEngineClass")
@@ -195,6 +322,9 @@ public class CloudsStormVM {
     @JsonProperty("OS_GUID")
     private String OS_GUID = null;
 
+    @JsonProperty("diskSize")
+    private Integer diskSize;
+
     public CloudsStormVM name(String name) {
         this.name = name;
         return this;
@@ -558,4 +688,22 @@ public class CloudsStormVM {
         }
         return o.toString().replace("\n", "\n    ");
     }
+
+    @JsonProperty("IOPS")
+    private Integer iOPS;
+    @JsonProperty("vpcId")
+    private String vpcId;
+    @JsonProperty("subnetId")
+    private String subnetId;
+    @JsonProperty("securityGroupId")
+    private String securityGroupId;
+    @JsonProperty("instanceId")
+    private String instanceId;
+    @JsonProperty("volumeId")
+    private Object volumeId;
+    @JsonProperty("routeTableId")
+    private String routeTableId;
+    @JsonProperty("internetGatewayId")
+    private String internetGatewayId;
+
 }

manager/pom.xml

@@ -14,7 +14,7 @@
     </properties>
     <parent>
         <groupId>nl.uva.sne.drip</groupId>
-        <artifactId>drip</artifactId>
+        <artifactId>conf</artifactId>
         <version>3.0.0</version>
     </parent>
     <build>
@@ -120,7 +120,7 @@
         
         <dependency>
             <groupId>nl.uva.sne.drip</groupId>
-            <artifactId>drip-commons</artifactId>
+            <artifactId>commons</artifactId>
             <version>3.0.0</version>
             <type>jar</type>
         </dependency>
@@ -144,12 +144,5 @@
         </dependency>
        
         
-        <!--        <dependency>
-            <groupId>nl.uva.sne.drip</groupId>
-            <artifactId>drip-manager-services</artifactId>
-            <version>3.0.0</version>
-            <type>jar</type>
-        </dependency>        -->
-        
     </dependencies>
 </project>

openAPI/schema/CloudStorm/CloudsStormVM.yml

@@ -41,6 +41,28 @@
                 type: "string"
             OS_GUID:
                 type: "string"
+            diskSize:
+                type: "integer"
+            IOPS:
+                type: "integer"
+            vpcId:
+                type: "string"
+            subnetId:
+                type: "string"
+            securityGroupId:
+                type: "string"
+            instanceId:
+                type: "string"
+            volumeId:
+                type: "string"                
+            routeTableId:
+                type: "string"
+            internetGatewayId:
+                type: "string"
+
+
+  
+  
 
                 
                 

openAPI/schema/CloudStorm/CloudsStormVMs.yml

@@ -11,6 +11,8 @@
             type: "boolean"
         sliceName:
             type: "string"
+        diskSize:
+            type: "string"
         duration:
             type: "float"
         VMs:

provisioner/nbactions.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>debug</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath nl.uva.sne.drip.provisioner.RPCServer</exec.args>
+                <exec.executable>java</exec.executable>
+                <jpda.listen>true</jpda.listen>
+            </properties>
+        </action>
+    </actions>

provisioner/pom.xml

@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>nl.uva.sne.drip</groupId>
-            <artifactId>drip-commons</artifactId>
+            <artifactId>commons</artifactId>
             <version>3.0.0</version>
             <type>jar</type>
         </dependency>

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

@@ -296,8 +296,8 @@ class CloudStormService {
 
     private ToscaTemplate runCloudStorm(String tempInputDirPath) throws IOException, ApiException {
         String[] args = new String[]{"run", tempInputDirPath};
-        standalone.MainAsTool.main(args);
-//        tempInputDirPath = "/tmp/Input-174407085024744";
+//        standalone.MainAsTool.main(args);
+        tempInputDirPath = "/tmp/Input-26386504078656";
 
         CloudsStormTopTopology _top = objectMapper.readValue(new File(tempInputDirPath + TOPOLOGY_RELATIVE_PATH
                 + TOP_TOPOLOGY_FILE_NAME),