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
9a0cdb1a
Commit
9a0cdb1a
authored
Jan 12, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added more properties missing from cloudstorm topology
parent
1a62fee8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
134 additions
and
103 deletions
+134
-103
CloudsStormSubTopology.java
...va/sne/drip/model/cloud/storm/CloudsStormSubTopology.java
+115
-78
CONF-3.0.0-swagger.yaml
openAPI/API/CONF-3.0.0-swagger.yaml
+16
-24
CloudsStormSubTopology.yml
openAPI/schema/CloudStorm/CloudsStormSubTopology.yml
+3
-1
No files found.
drip-commons/src/main/java/nl/uva/sne/drip/model/cloud/storm/CloudsStormSubTopology.java
View file @
9a0cdb1a
...
@@ -5,72 +5,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
...
@@ -5,72 +5,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.annotation.JsonValue
;
import
com.fasterxml.jackson.annotation.JsonValue
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.util.HashMap
;
import
java.util.Map
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
javax.validation.Valid
;
/**
/**
* CloudsStormSubTopology
* CloudsStormSubTopology
*/
*/
@Validated
@Validated
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"20
19-12-31T12:57:31.14
8Z"
)
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"20
20-01-12T17:15:38.99
8Z"
)
public
class
CloudsStormSubTopology
{
public
class
CloudsStormSubTopology
{
/**
* @return the connections
*/
public
Object
getConnections
()
{
return
connections
;
}
/**
* @param connections the connections to set
*/
public
void
setConnections
(
Object
connections
)
{
this
.
connections
=
connections
;
}
/**
* @return the scaledFrom
*/
public
Object
getScaledFrom
()
{
return
scaledFrom
;
}
/**
* @param scaledFrom the scaledFrom to set
*/
public
void
setScaledFrom
(
Object
scaledFrom
)
{
this
.
scaledFrom
=
scaledFrom
;
}
/**
* @return the sshKeyPairId
*/
public
String
getSshKeyPairId
()
{
return
sshKeyPairId
;
}
/**
* @param sshKeyPairId the sshKeyPairId to set
*/
public
void
setSshKeyPairId
(
String
sshKeyPairId
)
{
this
.
sshKeyPairId
=
sshKeyPairId
;
}
/**
* @return the subTopologyClass
*/
public
String
getSubTopologyClass
()
{
return
subTopologyClass
;
}
/**
* @param subTopologyClass the subTopologyClass to set
*/
public
void
setSubTopologyClass
(
String
subTopologyClass
)
{
this
.
subTopologyClass
=
subTopologyClass
;
}
@JsonProperty
(
"topology"
)
@JsonProperty
(
"topology"
)
private
String
topology
=
null
;
private
String
topology
=
null
;
...
@@ -80,21 +27,6 @@ public class CloudsStormSubTopology {
...
@@ -80,21 +27,6 @@ public class CloudsStormSubTopology {
@JsonProperty
(
"domain"
)
@JsonProperty
(
"domain"
)
private
String
domain
=
null
;
private
String
domain
=
null
;
@JsonProperty
(
"subTopologyClass"
)
private
String
subTopologyClass
=
null
;
@JsonProperty
(
"logsInfo"
)
private
Object
logsInfo
;
@JsonProperty
(
"sshKeyPairId"
)
private
String
sshKeyPairId
;
@JsonProperty
(
"scaledFrom"
)
private
Object
scaledFrom
;
@JsonProperty
(
"connections"
)
private
Object
connections
;
/**
/**
* Gets or Sets status
* Gets or Sets status
*/
*/
...
@@ -131,6 +63,18 @@ public class CloudsStormSubTopology {
...
@@ -131,6 +63,18 @@ public class CloudsStormSubTopology {
@JsonProperty
(
"status"
)
@JsonProperty
(
"status"
)
private
StatusEnum
status
=
null
;
private
StatusEnum
status
=
null
;
@JsonProperty
(
"logsInfo"
)
@Valid
private
Map
<
String
,
Object
>
logsInfo
=
null
;
@JsonProperty
(
"scaledFrom"
)
@Valid
private
Map
<
String
,
Object
>
scaledFrom
=
null
;
@JsonProperty
(
"connections"
)
@Valid
private
Map
<
String
,
Object
>
connections
=
null
;
public
CloudsStormSubTopology
topology
(
String
topology
)
{
public
CloudsStormSubTopology
topology
(
String
topology
)
{
this
.
topology
=
topology
;
this
.
topology
=
topology
;
return
this
;
return
this
;
...
@@ -140,7 +84,7 @@ public class CloudsStormSubTopology {
...
@@ -140,7 +84,7 @@ public class CloudsStormSubTopology {
* Get topology
* Get topology
*
*
* @return topology
* @return topology
*
*
*/
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
...
@@ -161,7 +105,7 @@ public class CloudsStormSubTopology {
...
@@ -161,7 +105,7 @@ public class CloudsStormSubTopology {
* Get cloudProvider
* Get cloudProvider
*
*
* @return cloudProvider
* @return cloudProvider
*
*
*/
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
...
@@ -182,7 +126,7 @@ public class CloudsStormSubTopology {
...
@@ -182,7 +126,7 @@ public class CloudsStormSubTopology {
* Get domain
* Get domain
*
*
* @return domain
* @return domain
*
*
*/
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
...
@@ -203,7 +147,7 @@ public class CloudsStormSubTopology {
...
@@ -203,7 +147,7 @@ public class CloudsStormSubTopology {
* Get status
* Get status
*
*
* @return status
* @return status
*
*
*/
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
...
@@ -215,6 +159,93 @@ public class CloudsStormSubTopology {
...
@@ -215,6 +159,93 @@ public class CloudsStormSubTopology {
this
.
status
=
status
;
this
.
status
=
status
;
}
}
public
CloudsStormSubTopology
logsInfo
(
Map
<
String
,
Object
>
logsInfo
)
{
this
.
logsInfo
=
logsInfo
;
return
this
;
}
public
CloudsStormSubTopology
putLogsInfoItem
(
String
key
,
Object
logsInfoItem
)
{
if
(
this
.
logsInfo
==
null
)
{
this
.
logsInfo
=
new
HashMap
<
String
,
Object
>();
}
this
.
logsInfo
.
put
(
key
,
logsInfoItem
);
return
this
;
}
/**
* Get logsInfo
*
* @return logsInfo
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getLogsInfo
()
{
return
logsInfo
;
}
public
void
setLogsInfo
(
Map
<
String
,
Object
>
logsInfo
)
{
this
.
logsInfo
=
logsInfo
;
}
public
CloudsStormSubTopology
scaledFrom
(
Map
<
String
,
Object
>
scaledFrom
)
{
this
.
scaledFrom
=
scaledFrom
;
return
this
;
}
public
CloudsStormSubTopology
putScaledFromItem
(
String
key
,
Object
scaledFromItem
)
{
if
(
this
.
scaledFrom
==
null
)
{
this
.
scaledFrom
=
new
HashMap
<
String
,
Object
>();
}
this
.
scaledFrom
.
put
(
key
,
scaledFromItem
);
return
this
;
}
/**
* Get scaledFrom
*
* @return scaledFrom
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getScaledFrom
()
{
return
scaledFrom
;
}
public
void
setScaledFrom
(
Map
<
String
,
Object
>
scaledFrom
)
{
this
.
scaledFrom
=
scaledFrom
;
}
public
CloudsStormSubTopology
connections
(
Map
<
String
,
Object
>
connections
)
{
this
.
connections
=
connections
;
return
this
;
}
public
CloudsStormSubTopology
putConnectionsItem
(
String
key
,
Object
connectionsItem
)
{
if
(
this
.
connections
==
null
)
{
this
.
connections
=
new
HashMap
<
String
,
Object
>();
}
this
.
connections
.
put
(
key
,
connectionsItem
);
return
this
;
}
/**
* Get connections
*
* @return connections
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getConnections
()
{
return
connections
;
}
public
void
setConnections
(
Map
<
String
,
Object
>
connections
)
{
this
.
connections
=
connections
;
}
@Override
@Override
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
if
(
this
==
o
)
{
if
(
this
==
o
)
{
...
@@ -227,12 +258,15 @@ public class CloudsStormSubTopology {
...
@@ -227,12 +258,15 @@ public class CloudsStormSubTopology {
return
Objects
.
equals
(
this
.
topology
,
cloudsStormSubTopology
.
topology
)
return
Objects
.
equals
(
this
.
topology
,
cloudsStormSubTopology
.
topology
)
&&
Objects
.
equals
(
this
.
cloudProvider
,
cloudsStormSubTopology
.
cloudProvider
)
&&
Objects
.
equals
(
this
.
cloudProvider
,
cloudsStormSubTopology
.
cloudProvider
)
&&
Objects
.
equals
(
this
.
domain
,
cloudsStormSubTopology
.
domain
)
&&
Objects
.
equals
(
this
.
domain
,
cloudsStormSubTopology
.
domain
)
&&
Objects
.
equals
(
this
.
status
,
cloudsStormSubTopology
.
status
);
&&
Objects
.
equals
(
this
.
status
,
cloudsStormSubTopology
.
status
)
&&
Objects
.
equals
(
this
.
logsInfo
,
cloudsStormSubTopology
.
logsInfo
)
&&
Objects
.
equals
(
this
.
scaledFrom
,
cloudsStormSubTopology
.
scaledFrom
)
&&
Objects
.
equals
(
this
.
connections
,
cloudsStormSubTopology
.
connections
);
}
}
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
Objects
.
hash
(
topology
,
cloudProvider
,
domain
,
status
);
return
Objects
.
hash
(
topology
,
cloudProvider
,
domain
,
status
,
logsInfo
,
scaledFrom
,
connections
);
}
}
@Override
@Override
...
@@ -244,6 +278,9 @@ public class CloudsStormSubTopology {
...
@@ -244,6 +278,9 @@ public class CloudsStormSubTopology {
sb
.
append
(
" cloudProvider: "
).
append
(
toIndentedString
(
cloudProvider
)).
append
(
"\n"
);
sb
.
append
(
" cloudProvider: "
).
append
(
toIndentedString
(
cloudProvider
)).
append
(
"\n"
);
sb
.
append
(
" domain: "
).
append
(
toIndentedString
(
domain
)).
append
(
"\n"
);
sb
.
append
(
" domain: "
).
append
(
toIndentedString
(
domain
)).
append
(
"\n"
);
sb
.
append
(
" status: "
).
append
(
toIndentedString
(
status
)).
append
(
"\n"
);
sb
.
append
(
" status: "
).
append
(
toIndentedString
(
status
)).
append
(
"\n"
);
sb
.
append
(
" logsInfo: "
).
append
(
toIndentedString
(
logsInfo
)).
append
(
"\n"
);
sb
.
append
(
" scaledFrom: "
).
append
(
toIndentedString
(
scaledFrom
)).
append
(
"\n"
);
sb
.
append
(
" connections: "
).
append
(
toIndentedString
(
connections
)).
append
(
"\n"
);
sb
.
append
(
"}"
);
sb
.
append
(
"}"
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
...
openAPI/API/CONF-3.0.0-swagger.yaml
View file @
9a0cdb1a
...
@@ -233,29 +233,6 @@ paths:
...
@@ -233,29 +233,6 @@ paths:
-
write:ToscaTemplate
-
write:ToscaTemplate
-
read:ToscaTemplate
-
read:ToscaTemplate
/credential
:
/credential
:
post
:
summary
:
get credential key file as base64
description
:
get credential key file as base64
operationId
:
getFileasBase64
consumes
:
-
multipart/form-data
parameters
:
-
name
:
file
in
:
formData
description
:
credential key file
required
:
true
type
:
file
responses
:
"
200"
:
description
:
successful operation
schema
:
type
:
string
"
405"
:
description
:
Invalid input
security
:
-
auth
:
-
write:ToscaTemplate
-
read:ToscaTemplate
put
:
put
:
summary
:
Create credentials
summary
:
Create credentials
description
:
Creates credentials
description
:
Creates credentials
...
@@ -267,7 +244,7 @@ paths:
...
@@ -267,7 +244,7 @@ paths:
parameters
:
parameters
:
-
in
:
body
-
in
:
body
name
:
body
name
:
body
description
:
Cre
ated user object
description
:
Cre
dential
required
:
true
required
:
true
schema
:
schema
:
$ref
:
'
#/definitions/Credential'
$ref
:
'
#/definitions/Credential'
...
@@ -823,6 +800,21 @@ definitions:
...
@@ -823,6 +800,21 @@ definitions:
-
deleted
-
deleted
-
failed
-
failed
-
stopped
-
stopped
logsInfo
:
type
:
object
additionalProperties
:
type
:
object
properties
:
{}
scaledFrom
:
type
:
object
additionalProperties
:
type
:
object
properties
:
{}
connections
:
type
:
object
additionalProperties
:
type
:
object
properties
:
{}
CloudsStormSubnets
:
CloudsStormSubnets
:
type
:
object
type
:
object
properties
:
properties
:
...
...
openAPI/schema/CloudStorm/CloudsStormSubTopology.yml
View file @
9a0cdb1a
...
@@ -17,7 +17,9 @@
...
@@ -17,7 +17,9 @@
additionalProperties
:
additionalProperties
:
type
:
object
type
:
object
subTopologyClass
:
subTopologyClass
:
type
:
"
sshKeyPairId"
type
:
"
string"
sshKeyPairId
:
type
:
"
string"
scaledFrom
:
scaledFrom
:
type
:
object
type
:
object
additionalProperties
:
additionalProperties
:
...
...
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