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
a3185654
Commit
a3185654
authored
Oct 29, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
format
parent
6be9e016
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
259 additions
and
243 deletions
+259
-243
NodeTemplate.java
...ons/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java
+222
-241
Project_Default.xml
drip_planner2/.idea/inspectionProfiles/Project_Default.xml
+15
-0
workspace.xml
drip_planner2/.idea/workspace.xml
+22
-2
No files found.
drip-commons/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java
View file @
a3185654
...
@@ -17,8 +17,6 @@ import javax.validation.Valid;
...
@@ -17,8 +17,6 @@ import javax.validation.Valid;
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"2019-10-25T14:09:25.182Z"
)
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"2019-10-25T14:09:25.182Z"
)
public
class
NodeTemplate
{
public
class
NodeTemplate
{
@JsonProperty
(
"name"
)
private
String
name
=
null
;
@JsonProperty
(
"type"
)
@JsonProperty
(
"type"
)
private
String
type
=
null
;
private
String
type
=
null
;
...
@@ -47,26 +45,6 @@ public class NodeTemplate {
...
@@ -47,26 +45,6 @@ public class NodeTemplate {
@Valid
@Valid
private
Map
<
String
,
Object
>
workflows
=
null
;
private
Map
<
String
,
Object
>
workflows
=
null
;
public
NodeTemplate
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
NodeTemplate
type
(
String
type
)
{
public
NodeTemplate
type
(
String
type
)
{
this
.
type
=
type
;
this
.
type
=
type
;
return
this
;
return
this
;
...
@@ -74,11 +52,12 @@ public class NodeTemplate {
...
@@ -74,11 +52,12 @@ public class NodeTemplate {
/**
/**
* Get type
* Get type
*
* @return type
* @return type
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
public
String
getType
()
{
public
String
getType
()
{
return
type
;
return
type
;
}
}
...
@@ -102,8 +81,10 @@ public class NodeTemplate {
...
@@ -102,8 +81,10 @@ public class NodeTemplate {
/**
/**
* Get requirements
* Get requirements
*
* @return requirements
* @return requirements
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
@Valid
@Valid
...
@@ -131,11 +112,12 @@ public class NodeTemplate {
...
@@ -131,11 +112,12 @@ public class NodeTemplate {
/**
/**
* Get artifacts
* Get artifacts
*
* @return artifacts
* @return artifacts
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getArtifacts
()
{
public
Map
<
String
,
Object
>
getArtifacts
()
{
return
artifacts
;
return
artifacts
;
}
}
...
@@ -159,11 +141,12 @@ public class NodeTemplate {
...
@@ -159,11 +141,12 @@ public class NodeTemplate {
/**
/**
* Get properties
* Get properties
*
* @return properties
* @return properties
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getProperties
()
{
public
Map
<
String
,
Object
>
getProperties
()
{
return
properties
;
return
properties
;
}
}
...
@@ -187,11 +170,12 @@ public class NodeTemplate {
...
@@ -187,11 +170,12 @@ public class NodeTemplate {
/**
/**
* Get interfaces
* Get interfaces
*
* @return interfaces
* @return interfaces
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getInterfaces
()
{
public
Map
<
String
,
Object
>
getInterfaces
()
{
return
interfaces
;
return
interfaces
;
}
}
...
@@ -215,11 +199,12 @@ public class NodeTemplate {
...
@@ -215,11 +199,12 @@ public class NodeTemplate {
/**
/**
* Get capabilities
* Get capabilities
*
* @return capabilities
* @return capabilities
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getCapabilities
()
{
public
Map
<
String
,
Object
>
getCapabilities
()
{
return
capabilities
;
return
capabilities
;
}
}
...
@@ -243,11 +228,12 @@ public class NodeTemplate {
...
@@ -243,11 +228,12 @@ public class NodeTemplate {
/**
/**
* Get workflows
* Get workflows
*
* @return workflows
* @return workflows
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getWorkflows
()
{
public
Map
<
String
,
Object
>
getWorkflows
()
{
return
workflows
;
return
workflows
;
}
}
...
@@ -256,7 +242,6 @@ public class NodeTemplate {
...
@@ -256,7 +242,6 @@ public class NodeTemplate {
this
.
workflows
=
workflows
;
this
.
workflows
=
workflows
;
}
}
@Override
@Override
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
if
(
this
==
o
)
{
if
(
this
==
o
)
{
...
@@ -266,27 +251,24 @@ public class NodeTemplate {
...
@@ -266,27 +251,24 @@ public class NodeTemplate {
return
false
;
return
false
;
}
}
NodeTemplate
nodeTemplate
=
(
NodeTemplate
)
o
;
NodeTemplate
nodeTemplate
=
(
NodeTemplate
)
o
;
return
Objects
.
equals
(
this
.
name
,
nodeTemplate
.
name
)
&&
return
Objects
.
equals
(
this
.
type
,
nodeTemplate
.
type
)
Objects
.
equals
(
this
.
type
,
nodeTemplate
.
type
)
&&
&&
Objects
.
equals
(
this
.
requirements
,
nodeTemplate
.
requirements
)
Objects
.
equals
(
this
.
requirements
,
nodeTemplate
.
requirements
)
&&
&&
Objects
.
equals
(
this
.
artifacts
,
nodeTemplate
.
artifacts
)
Objects
.
equals
(
this
.
artifacts
,
nodeTemplate
.
artifacts
)
&&
&&
Objects
.
equals
(
this
.
properties
,
nodeTemplate
.
properties
)
Objects
.
equals
(
this
.
properties
,
nodeTemplate
.
properties
)
&&
&&
Objects
.
equals
(
this
.
interfaces
,
nodeTemplate
.
interfaces
)
Objects
.
equals
(
this
.
interfaces
,
nodeTemplate
.
interfaces
)
&&
&&
Objects
.
equals
(
this
.
capabilities
,
nodeTemplate
.
capabilities
)
Objects
.
equals
(
this
.
capabilities
,
nodeTemplate
.
capabilities
)
&&
&&
Objects
.
equals
(
this
.
workflows
,
nodeTemplate
.
workflows
);
Objects
.
equals
(
this
.
workflows
,
nodeTemplate
.
workflows
);
}
}
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
Objects
.
hash
(
name
,
type
,
requirements
,
artifacts
,
properties
,
interfaces
,
capabilities
,
workflows
);
return
Objects
.
hash
(
type
,
requirements
,
artifacts
,
properties
,
interfaces
,
capabilities
,
workflows
);
}
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
"class NodeTemplate {\n"
);
sb
.
append
(
"class NodeTemplate {\n"
);
sb
.
append
(
" name: "
).
append
(
toIndentedString
(
name
)).
append
(
"\n"
);
sb
.
append
(
" type: "
).
append
(
toIndentedString
(
type
)).
append
(
"\n"
);
sb
.
append
(
" type: "
).
append
(
toIndentedString
(
type
)).
append
(
"\n"
);
sb
.
append
(
" requirements: "
).
append
(
toIndentedString
(
requirements
)).
append
(
"\n"
);
sb
.
append
(
" requirements: "
).
append
(
toIndentedString
(
requirements
)).
append
(
"\n"
);
sb
.
append
(
" artifacts: "
).
append
(
toIndentedString
(
artifacts
)).
append
(
"\n"
);
sb
.
append
(
" artifacts: "
).
append
(
toIndentedString
(
artifacts
)).
append
(
"\n"
);
...
@@ -309,4 +291,3 @@ public class NodeTemplate {
...
@@ -309,4 +291,3 @@ public class NodeTemplate {
return
o
.
toString
().
replace
(
"\n"
,
"\n "
);
return
o
.
toString
().
replace
(
"\n"
,
"\n "
);
}
}
}
}
drip_planner2/.idea/inspectionProfiles/Project_Default.xml
0 → 100644
View file @
a3185654
<component
name=
"InspectionProjectProfileManager"
>
<profile
version=
"1.0"
>
<option
name=
"myName"
value=
"Project Default"
/>
<inspection_tool
class=
"PyCompatibilityInspection"
enabled=
"true"
level=
"WARNING"
enabled_by_default=
"true"
>
<option
name=
"ourVersions"
>
<value>
<list
size=
"2"
>
<item
index=
"0"
class=
"java.lang.String"
itemvalue=
"3.6"
/>
<item
index=
"1"
class=
"java.lang.String"
itemvalue=
"3.8"
/>
</list>
</value>
</option>
</inspection_tool>
</profile>
</component>
\ No newline at end of file
drip_planner2/.idea/workspace.xml
View file @
a3185654
...
@@ -2,8 +2,28 @@
...
@@ -2,8 +2,28 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"462ede19-adfe-472b-975e-fefefa973fe0"
name=
"Default Changelist"
comment=
""
>
<list
default=
"true"
id=
"462ede19-adfe-472b-975e-fefefa973fe0"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/service/ProvisionerService.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/src/main/java/nl/uva/sne/drip/service/ProvisionerService.java
"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml
"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/requirements.txt"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/requirements.txt"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/controllers/default_controller.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/controllers/default_controller.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/node_template.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/node_template.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/topology_template.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/topology_template.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/tosca_template.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/models/tosca_template.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/swagger/swagger.yaml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/swagger/swagger.yaml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/chardetect"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/chardetect"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/connexion"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/connexion"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/flask"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/flask"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/jsonschema"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/jsonschema"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/openapi-spec-validator"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/openapi-spec-validator"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/pbr"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/pbr"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/pybabel"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/pybabel"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/tosca-parser"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/bin/tosca-parser"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/attr/converters.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/attr/converters.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/attr/filters.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/attr/filters.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/find_package.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/find_package.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/pbr_json.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/pbr_json.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/tests/__init__.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/tests/__init__.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/tests/testpackage/pbr_testpackage/wsgi.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../sure_tosca-flask-server/venv/lib/python3.6/site-packages/pbr/tests/testpackage/pbr_testpackage/wsgi.py"
afterDir=
"false"
/>
</list>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
@@ -35,7 +55,7 @@
...
@@ -35,7 +55,7 @@
<property
name=
"SHARE_PROJECT_CONFIGURATION_FILES"
value=
"true"
/>
<property
name=
"SHARE_PROJECT_CONFIGURATION_FILES"
value=
"true"
/>
<property
name=
"TODO_SCOPE"
value=
"All Places"
/>
<property
name=
"TODO_SCOPE"
value=
"All Places"
/>
<property
name=
"full.screen.before.presentation.mode"
value=
"false"
/>
<property
name=
"full.screen.before.presentation.mode"
value=
"false"
/>
<property
name=
"last_opened_file_path"
value=
"$
USER_HOME$/Downloads/python-flask-server-generated
"
/>
<property
name=
"last_opened_file_path"
value=
"$
PROJECT_DIR$/../drip-deployer
"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
/>
</component>
</component>
<component
name=
"RecentsManager"
>
<component
name=
"RecentsManager"
>
...
...
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