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
2cf859b7
Commit
2cf859b7
authored
Mar 18, 2020
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added accept 'text/plain'
parent
08858c35
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
13 deletions
+15
-13
lifeWatch_vre1.yaml
TOSCA/lifeWatch_vre1.yaml
+11
-11
nodes.yaml
TOSCA/types/nodes.yaml
+1
-1
Message.java
commons/src/main/java/nl/uva/sne/drip/model/Message.java
+2
-0
ToscaTemplateApiController.java
.../java/nl/uva/sne/drip/api/ToscaTemplateApiController.java
+1
-1
No files found.
TOSCA/lifeWatch_vre1.yaml
View file @
2cf859b7
...
...
@@ -29,15 +29,15 @@ topology_template:
repository
:
docker_hub
topology
:
type
:
tosca.nodes.ARTICONF.VM.topology
interfaces
:
CloudsStorm
:
provision
:
inputs
:
code_type
:
SEQ
object_type
:
SubTopology
properties
:
domain
:
UvA (Amsterdam, The Netherlands) XO Rack
provider
:
ExoGENI
#
topology:
#
type: tosca.nodes.ARTICONF.VM.topology
#
interfaces:
#
CloudsStorm:
#
provision:
#
inputs:
#
code_type: SEQ
#
object_type: SubTopology
#
properties:
#
domain: UvA (Amsterdam, The Netherlands) XO Rack
#
provider: ExoGENI
TOSCA/types/nodes.yaml
View file @
2cf859b7
...
...
@@ -185,7 +185,7 @@ node_types:
mem_size
:
type
:
scalar-unit.size
required
:
true
default
:
3
000 MB
default
:
1
000 MB
constraints
:
-
greater_or_equal
:
500 MB
os
:
...
...
commons/src/main/java/nl/uva/sne/drip/model/Message.java
View file @
2cf859b7
...
...
@@ -15,6 +15,7 @@
*/
package
nl
.
uva
.
sne
.
drip
.
model
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
nl.uva.sne.drip.model.tosca.ToscaTemplate
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
java.io.Serializable
;
...
...
@@ -28,6 +29,7 @@ import javax.validation.constraints.NotNull;
* @author S. Koulouzis.
*/
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
Message
implements
Serializable
{
/**
...
...
manager/src/main/java/nl/uva/sne/drip/api/ToscaTemplateApiController.java
View file @
2cf859b7
...
...
@@ -47,7 +47,7 @@ public class ToscaTemplateApiController implements ToscaTemplateApi {
@Override
public
ResponseEntity
<
String
>
deleteToscaTemplateByID
(
@ApiParam
(
value
=
"ID of topolog template to return"
,
required
=
true
)
@PathVariable
(
"id"
)
String
id
)
{
String
accept
=
request
.
getHeader
(
"Accept"
);
if
(
accept
!=
null
&&
accept
.
contains
(
"
*/*
"
))
{
if
(
accept
!=
null
&&
accept
.
contains
(
"
text/plain
"
))
{
try
{
String
deleteedYemplateId
=
dripService
.
delete
(
id
);
return
new
ResponseEntity
<>(
deleteedYemplateId
,
HttpStatus
.
OK
);
...
...
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