Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
a5471940
Commit
a5471940
authored
Jan 28, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added more properties for EC2
parent
d012e175
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
199 additions
and
16 deletions
+199
-16
pom.xml
commons/pom.xml
+1
-1
CloudsStormVM.java
...java/nl/uva/sne/drip/model/cloud/storm/CloudsStormVM.java
+149
-1
pom.xml
manager/pom.xml
+3
-10
CloudsStormVM.yml
openAPI/schema/CloudStorm/CloudsStormVM.yml
+23
-1
CloudsStormVMs.yml
openAPI/schema/CloudStorm/CloudsStormVMs.yml
+2
-0
nbactions.xml
provisioner/nbactions.xml
+18
-0
pom.xml
provisioner/pom.xml
+1
-1
CloudStormService.java
...n/java/nl/uva/sne/drip/provisioner/CloudStormService.java
+2
-2
No files found.
commons/pom.xml
View file @
a5471940
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</properties>
</properties>
<parent>
<parent>
<groupId>
nl.uva.sne.drip
</groupId>
<groupId>
nl.uva.sne.drip
</groupId>
<artifactId>
drip
</artifactId>
<artifactId>
conf
</artifactId>
<version>
3.0.0
</version>
<version>
3.0.0
</version>
</parent>
</parent>
...
...
commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormVM.java
View file @
a5471940
...
@@ -17,6 +17,132 @@ import javax.validation.Valid;
...
@@ -17,6 +17,132 @@ import javax.validation.Valid;
public
class
CloudsStormVM
{
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
* @return the vEngineClass
*/
*/
...
@@ -133,8 +259,9 @@ public class CloudsStormVM {
...
@@ -133,8 +259,9 @@ public class CloudsStormVM {
private
String
name
=
null
;
private
String
name
=
null
;
@JsonProperty
(
"nodeType"
)
@JsonProperty
(
"nodeType"
)
@JsonAlias
({
"type"
})
private
String
nodeType
=
null
;
private
String
nodeType
=
null
;
@JsonProperty
(
"VEngineClass"
)
@JsonProperty
(
"VEngineClass"
)
private
String
VEngineClass
=
null
;
private
String
VEngineClass
=
null
;
...
@@ -195,6 +322,9 @@ public class CloudsStormVM {
...
@@ -195,6 +322,9 @@ public class CloudsStormVM {
@JsonProperty
(
"OS_GUID"
)
@JsonProperty
(
"OS_GUID"
)
private
String
OS_GUID
=
null
;
private
String
OS_GUID
=
null
;
@JsonProperty
(
"diskSize"
)
private
Integer
diskSize
;
public
CloudsStormVM
name
(
String
name
)
{
public
CloudsStormVM
name
(
String
name
)
{
this
.
name
=
name
;
this
.
name
=
name
;
return
this
;
return
this
;
...
@@ -558,4 +688,22 @@ public class CloudsStormVM {
...
@@ -558,4 +688,22 @@ public class CloudsStormVM {
}
}
return
o
.
toString
().
replace
(
"\n"
,
"\n "
);
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
View file @
a5471940
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
</properties>
</properties>
<parent>
<parent>
<groupId>
nl.uva.sne.drip
</groupId>
<groupId>
nl.uva.sne.drip
</groupId>
<artifactId>
drip
</artifactId>
<artifactId>
conf
</artifactId>
<version>
3.0.0
</version>
<version>
3.0.0
</version>
</parent>
</parent>
<build>
<build>
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
<dependency>
<dependency>
<groupId>
nl.uva.sne.drip
</groupId>
<groupId>
nl.uva.sne.drip
</groupId>
<artifactId>
drip-
commons
</artifactId>
<artifactId>
commons
</artifactId>
<version>
3.0.0
</version>
<version>
3.0.0
</version>
<type>
jar
</type>
<type>
jar
</type>
</dependency>
</dependency>
...
@@ -142,14 +142,7 @@
...
@@ -142,14 +142,7 @@
<version>
1.0.12
</version>
<version>
1.0.12
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<!-- <dependency>
<groupId>nl.uva.sne.drip</groupId>
<artifactId>drip-manager-services</artifactId>
<version>3.0.0</version>
<type>jar</type>
</dependency> -->
</dependencies>
</dependencies>
</project>
</project>
openAPI/schema/CloudStorm/CloudsStormVM.yml
View file @
a5471940
...
@@ -41,7 +41,29 @@
...
@@ -41,7 +41,29 @@
type
:
"
string"
type
:
"
string"
OS_GUID
:
OS_GUID
:
type
:
"
string"
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
View file @
a5471940
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
type
:
"
boolean"
type
:
"
boolean"
sliceName
:
sliceName
:
type
:
"
string"
type
:
"
string"
diskSize
:
type
:
"
string"
duration
:
duration
:
type
:
"
float"
type
:
"
float"
VMs
:
VMs
:
...
...
provisioner/nbactions.xml
0 → 100644
View file @
a5471940
<?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
View file @
a5471940
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
nl.uva.sne.drip
</groupId>
<groupId>
nl.uva.sne.drip
</groupId>
<artifactId>
drip-
commons
</artifactId>
<artifactId>
commons
</artifactId>
<version>
3.0.0
</version>
<version>
3.0.0
</version>
<type>
jar
</type>
<type>
jar
</type>
</dependency>
</dependency>
...
...
provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java
View file @
a5471940
...
@@ -296,8 +296,8 @@ class CloudStormService {
...
@@ -296,8 +296,8 @@ class CloudStormService {
private
ToscaTemplate
runCloudStorm
(
String
tempInputDirPath
)
throws
IOException
,
ApiException
{
private
ToscaTemplate
runCloudStorm
(
String
tempInputDirPath
)
throws
IOException
,
ApiException
{
String
[]
args
=
new
String
[]{
"run"
,
tempInputDirPath
};
String
[]
args
=
new
String
[]{
"run"
,
tempInputDirPath
};
standalone
.
MainAsTool
.
main
(
args
);
//
standalone.MainAsTool.main(args);
// tempInputDirPath = "/tmp/Input-174407085024744
";
tempInputDirPath
=
"/tmp/Input-26386504078656
"
;
CloudsStormTopTopology
_top
=
objectMapper
.
readValue
(
new
File
(
tempInputDirPath
+
TOPOLOGY_RELATIVE_PATH
CloudsStormTopTopology
_top
=
objectMapper
.
readValue
(
new
File
(
tempInputDirPath
+
TOPOLOGY_RELATIVE_PATH
+
TOP_TOPOLOGY_FILE_NAME
),
+
TOP_TOPOLOGY_FILE_NAME
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment