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
c7334766
Commit
c7334766
authored
Oct 26, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restructure project
parent
e43ebcbc
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2 additions
and
796 deletions
+2
-796
Credentials.yml
TOSCA/openAPI/TOSCA/Credentials.yml
+0
-18
NodeTemplate.yml
TOSCA/openAPI/TOSCA/NodeTemplate.yml
+0
-34
TopologyTemplate.yml
TOSCA/openAPI/TOSCA/TopologyTemplate.yml
+0
-40
ToscaTemplate.yml
TOSCA/openAPI/TOSCA/ToscaTemplate.yml
+0
-66
User.yml
TOSCA/openAPI/User.yml
+0
-20
swagger.yaml
drip-manager/swagger.yaml
+0
-614
workspace.xml
drip_planner2/.idea/workspace.xml
+2
-4
No files found.
TOSCA/openAPI/TOSCA/Credentials.yml
deleted
100644 → 0
View file @
e43ebcbc
definitions
:
Credentials
:
type
:
"
object"
properties
:
protocol
:
type
:
"
string"
token_type
:
type
:
"
string"
token
:
type
:
"
string"
keys
:
type
:
object
additionalProperties
:
type
:
string
user
:
type
:
"
string"
cloud_provider_name
:
type
:
"
string"
TOSCA/openAPI/TOSCA/NodeTemplate.yml
deleted
100644 → 0
View file @
e43ebcbc
definitions
:
NodeTemplate
:
type
:
"
object"
properties
:
name
:
type
:
"
string"
type
:
type
:
"
string"
requirements
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
artifacts
:
type
:
object
additionalProperties
:
type
:
object
properties
:
type
:
object
additionalProperties
:
type
:
object
interfaces
:
type
:
object
additionalProperties
:
type
:
object
capabilities
:
type
:
object
additionalProperties
:
type
:
object
workflows
:
type
:
object
additionalProperties
:
type
:
object
TOSCA/openAPI/TOSCA/TopologyTemplate.yml
deleted
100644 → 0
View file @
e43ebcbc
definitions
:
TopologyTemplate
:
type
:
"
object"
properties
:
description
:
type
:
"
string"
inputs
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
policies
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
outputs
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
node_templates
:
type
:
object
additionalProperties
:
$ref
:
'
#/definitions/NodeTemplate'
relationship_templates
:
type
:
object
additionalProperties
:
type
:
object
groups
:
type
:
object
additionalProperties
:
type
:
object
substitution_mappings
:
type
:
object
additionalProperties
:
type
:
object
TOSCA/openAPI/TOSCA/ToscaTemplate.yml
deleted
100644 → 0
View file @
e43ebcbc
definitions
:
ToscaTemplate
:
type
:
"
object"
properties
:
tosca_definitions_version
:
type
:
"
string"
tosca_default_namespace
:
type
:
"
string"
template_name
:
type
:
"
string"
imports
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
string
repositories
:
type
:
object
additionalProperties
:
type
:
string
dsl_definitions
:
type
:
object
additionalProperties
:
type
:
string
node_types
:
type
:
object
additionalProperties
:
type
:
object
topology_template
:
$ref
:
"
#/definitions/TopologyTemplate"
relationship_types
:
type
:
object
additionalProperties
:
type
:
object
relationship_templates
:
type
:
object
additionalProperties
:
type
:
object
capability_types
:
type
:
object
additionalProperties
:
type
:
object
artifact_types
:
type
:
object
additionalProperties
:
type
:
object
data_types
:
type
:
object
additionalProperties
:
type
:
object
interface_types
:
type
:
object
additionalProperties
:
type
:
object
policy_types
:
type
:
object
additionalProperties
:
type
:
string
group_types
:
type
:
object
additionalProperties
:
type
:
object
description
:
type
:
"
string"
template_author
:
type
:
"
string"
TOSCA/openAPI/User.yml
deleted
100644 → 0
View file @
e43ebcbc
definitions
:
User
:
type
:
"
object"
properties
:
id
:
type
:
"
string"
username
:
type
:
"
string"
firstName
:
type
:
"
string"
lastName
:
type
:
"
string"
email
:
type
:
"
string"
password
:
type
:
"
string"
userStatus
:
type
:
"
integer"
format
:
"
int32"
description
:
"
User
Status"
drip-manager/swagger.yaml
deleted
100644 → 0
View file @
e43ebcbc
swagger
:
"
2.0"
info
:
description
:
"
The
Dynamic
Real-time
infrastructure
planner
(DRIP)
allows
application
developers
to
seamlessly
plan
a
customized
virtual
infrastructure
based
on
application
level
constraints
on
QoS
and
resource
budgets,
provisioning
the
virtual
infrastructure,
deploy
application
components
onto
the
virtual
infrastructure,
and
start
execution
on
demand
using
TOSCA."
version
:
"
3.0.0"
title
:
"
DRIP"
contact
:
email
:
"
z.zhao@uva.nl"
license
:
name
:
"
Apache
2.0"
url
:
"
http://www.apache.org/licenses/LICENSE-2.0.html"
basePath
:
"
/drip-api"
schemes
:
-
"
https"
-
"
http"
paths
:
/tosca_template
:
post
:
summary
:
"
upload
a
tosca
template
description
file"
description
:
"
"
operationId
:
"
uploadToscaTemplate"
consumes
:
-
"
multipart/form-data"
parameters
:
-
in
:
"
formData"
name
:
"
file"
type
:
file
description
:
"
tosca
Template
description"
required
:
true
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/tosca_template/ids
:
get
:
summary
:
"
Get
all
topolog
template
IDs"
description
:
"
Returns
all
IDss
"
operationId
:
"
getToscaTemplateIDs"
produces
:
-
"
application/json"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
array
items
:
type
:
string
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/tosca_template/{id}
:
get
:
summary
:
"
Find
topolog
template
by
ID"
description
:
"
Returns
a
single
topolog
template"
operationId
:
"
getToscaTemplateByID"
produces
:
-
"
text/plain"
parameters
:
-
name
:
"
id"
in
:
"
path"
description
:
"
ID
of
topolog
template
to
return"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
put
:
summary
:
"
Updates
exisintg
topolog
template"
description
:
"
"
operationId
:
"
updateToscaTemplateByID"
consumes
:
-
"
multipart/form-data"
produces
:
-
"
text/plain"
parameters
:
-
in
:
"
formData"
name
:
"
file"
type
:
file
description
:
"
tosca
Template
description"
-
name
:
"
id"
in
:
"
path"
description
:
"
ID
of
topolog
template
to
return"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
delete
:
summary
:
"
Deletes
a
tosca
topolog
template"
description
:
"
"
operationId
:
"
deleteToscaTemplateByID"
parameters
:
-
name
:
"
id"
in
:
"
path"
description
:
"
ID
of
topolog
template
to
return"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/planner/plan/{id}
:
get
:
summary
:
"
plan
tosca
template"
description
:
"
Returns
the
ID
of
the
planed
topolog
template"
operationId
:
"
planToscaTemplateByID"
produces
:
-
"
text/plain"
parameters
:
-
name
:
"
id"
in
:
"
path"
description
:
"
ID
of
topolog
template
to
plan"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/provisioner/provision/{id}
:
get
:
summary
:
"
provision
tosca
template"
description
:
"
provosions
the
operationId:
Plan
Tosca
Template
Returns
the
provision
ID"
operationId
:
"
provisionPlanToscaTemplateByID"
produces
:
-
"
text/plain"
parameters
:
-
name
:
"
id"
in
:
"
path"
description
:
"
ID
of
topolog
template
to
plan"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/deployer/deploy/{id}
:
get
:
summary
:
"
deploy
the
software
tosca
template"
description
:
"
Returns
the
deployment
ID"
operationId
:
"
deployProvisionToscaTemplateByID"
produces
:
-
"
text/plain"
parameters
:
-
name
:
"
id"
in
:
"
path"
description
:
"
ID
of
topolog
template
to
deploy"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/credential
:
post
:
summary
:
"
Create
credentials"
description
:
"
Creates
credentials"
operationId
:
"
createCredentials"
produces
:
-
"
application/json"
consumes
:
-
"
application/json"
parameters
:
-
in
:
"
body"
name
:
"
body"
description
:
"
Created
user
object"
required
:
true
schema
:
$ref
:
"
#/definitions/Credentials"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:Credentials"
-
"
read:Credentials"
/credential/ids
:
get
:
summary
:
"
Get
all
credential
IDs"
description
:
"
Returns
all
IDss
"
operationId
:
"
getCredentialIDs"
produces
:
-
"
application/json"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
array
items
:
type
:
string
400
:
description
:
"
Invalid
ID
supplied"
404
:
description
:
"
ToscaTemplate
not
found"
405
:
description
:
"
Invalid
input"
security
:
-
drip_auth
:
-
"
write:ToscaTemplate"
-
"
read:ToscaTemplate"
/user
:
post
:
summary
:
"
Create
user"
description
:
"
This
can
only
be
done
by
admin."
operationId
:
"
createUser"
produces
:
-
"
application/json"
parameters
:
-
in
:
"
body"
name
:
"
body"
description
:
"
Created
user
object"
required
:
true
schema
:
$ref
:
"
#/definitions/User"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
409
:
description
:
"
already
exists"
security
:
-
drip_auth
:
-
"
admin:User"
/user/login
:
get
:
tags
:
-
"
user"
summary
:
"
Logs
user
into
the
system"
description
:
"
"
produces
:
-
"
application/json"
parameters
:
-
name
:
"
username"
in
:
"
query"
description
:
"
The
user
name
for
login"
required
:
true
type
:
"
string"
-
name
:
"
password"
in
:
"
query"
description
:
"
The
password
for
login
in
clear
text"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
type
:
"
string"
headers
:
X-Rate-Limit
:
type
:
"
integer"
format
:
"
int32"
description
:
"
calls
per
hour
allowed
by
the
user"
X-Expires-After
:
type
:
"
string"
format
:
"
date-time"
description
:
"
date
in
UTC
when
token
expires"
400
:
description
:
"
Invalid
username/password
supplied"
/user/logout
:
get
:
summary
:
"
Logs
out
current
logged
in
user
session"
description
:
"
"
produces
:
-
"
application/json"
parameters
:
[]
responses
:
default
:
description
:
"
successful
operation"
/user/{username}
:
get
:
summary
:
"
Get
user
by
user
name"
description
:
"
"
produces
:
-
"
application/json"
parameters
:
-
name
:
"
username"
in
:
"
path"
description
:
"
The
name
that
needs
to
be
fetched.
Use
user1
for
testing.
"
required
:
true
type
:
"
string"
responses
:
200
:
description
:
"
successful
operation"
schema
:
$ref
:
"
#/definitions/User"
400
:
description
:
"
Invalid
username
supplied"
404
:
description
:
"
User
not
found"
security
:
-
drip_auth
:
-
"
admin:User"
put
:
tags
:
-
"
user"
summary
:
"
Updated
user"
description
:
"
This
can
only
be
done
by
the
logged
in
user."
produces
:
-
"
application/json"
parameters
:
-
name
:
"
username"
in
:
"
path"
description
:
"
name
that
need
to
be
updated"
required
:
true
type
:
"
string"
-
in
:
"
body"
name
:
"
body"
description
:
"
Updated
user
object"
required
:
true
schema
:
$ref
:
"
#/definitions/User"
responses
:
400
:
description
:
"
Invalid
user
supplied"
404
:
description
:
"
User
not
found"
security
:
-
drip_auth
:
-
"
admin:User"
delete
:
summary
:
"
Delete
user"
description
:
"
This
can
only
be
done
by
the
logged
in
user."
produces
:
-
"
application/json"
parameters
:
-
name
:
"
username"
in
:
"
path"
description
:
"
The
name
that
needs
to
be
deleted"
required
:
true
type
:
"
string"
responses
:
400
:
description
:
"
Invalid
username
supplied"
404
:
description
:
"
User
not
found"
security
:
-
drip_auth
:
-
"
admin:User"
securityDefinitions
:
drip_auth
:
type
:
"
oauth2"
authorizationUrl
:
"
http://localhost/oauth/dialog"
flow
:
"
implicit"
scopes
:
write:ToscaTemplate
:
"
modify
topolog
template
in
your
account"
read:ToscaTemplate
:
"
read
your
topolog
template"
admin:User
:
"
Grants
access
to
admin
operations"
write:Credentials
:
"
modify
cloud
credentials
in
your
account"
read:Credentials
:
"
read
your
cloud
credentials"
definitions
:
User
:
type
:
"
object"
properties
:
id
:
type
:
"
integer"
format
:
"
int64"
username
:
type
:
"
string"
firstName
:
type
:
"
string"
lastName
:
type
:
"
string"
email
:
type
:
"
string"
password
:
type
:
"
string"
userStatus
:
type
:
"
integer"
format
:
"
int32"
description
:
"
User
Status"
ToscaTemplate
:
type
:
"
object"
properties
:
tosca_definitions_version
:
type
:
"
string"
tosca_default_namespace
:
type
:
"
string"
template_name
:
type
:
"
string"
imports
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
string
repositories
:
type
:
object
additionalProperties
:
type
:
string
dsl_definitions
:
type
:
object
additionalProperties
:
type
:
string
node_types
:
type
:
object
additionalProperties
:
type
:
object
topology_template
:
$ref
:
"
#/definitions/TopologyTemplate"
relationship_types
:
type
:
object
additionalProperties
:
type
:
object
relationship_templates
:
type
:
object
additionalProperties
:
type
:
object
capability_types
:
type
:
object
additionalProperties
:
type
:
object
artifact_types
:
type
:
object
additionalProperties
:
type
:
object
data_types
:
type
:
object
additionalProperties
:
type
:
object
interface_types
:
type
:
object
additionalProperties
:
type
:
object
policy_types
:
type
:
object
additionalProperties
:
type
:
string
group_types
:
type
:
object
additionalProperties
:
type
:
object
description
:
type
:
"
string"
template_author
:
type
:
"
string"
TopologyTemplate
:
type
:
"
object"
properties
:
description
:
type
:
"
string"
inputs
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
policies
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
outputs
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
node_templates
:
type
:
object
additionalProperties
:
$ref
:
'
#/definitions/NodeTemplate'
relationship_templates
:
type
:
object
additionalProperties
:
type
:
object
groups
:
type
:
object
additionalProperties
:
type
:
object
substitution_mappings
:
type
:
object
additionalProperties
:
type
:
object
NodeTemplate
:
type
:
"
object"
properties
:
name
:
type
:
"
string"
type
:
type
:
"
string"
requirements
:
type
:
"
array"
items
:
type
:
object
additionalProperties
:
type
:
object
artifacts
:
type
:
object
additionalProperties
:
type
:
object
properties
:
type
:
object
additionalProperties
:
type
:
object
interfaces
:
type
:
object
additionalProperties
:
type
:
object
capabilities
:
type
:
object
additionalProperties
:
type
:
object
workflows
:
type
:
object
additionalProperties
:
type
:
object
Credentials
:
type
:
"
object"
properties
:
protocol
:
type
:
"
string"
token_type
:
type
:
"
string"
token
:
type
:
"
string"
keys
:
type
:
object
additionalProperties
:
type
:
string
user
:
type
:
"
string"
cloud_provider_name
:
type
:
"
string"
externalDocs
:
description
:
"
Find
out
more
about
DRIP"
url
:
"
https://github.com/QCAPI-DRIP/DRIP-integration/wiki"
drip_planner2/.idea/workspace.xml
View file @
c7334766
...
@@ -2,11 +2,9 @@
...
@@ -2,11 +2,9 @@
<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-commons/src/main/java/nl/uva/sne/drip/commons/utils/TOSCAUtils.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/TOSCAUtils.java
"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../
TOSCA/openAPI/TOSCA/TopologyTemplate.yml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../TOSCA/openAPI/TOSCA/TopologyTemplate.yml
"
afterDir=
"false"
/>
<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
beforePath=
"$PROJECT_DIR$/../
TOSCA/openAPI/TOSCA/ToscaTemplate.yml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../TOSCA/openAPI/TOSCA/ToscaTemplate.yml
"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/swagger.yaml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/swagger.yaml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-manager/swagger.yaml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-manager/swagger.yaml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/Consumer.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/Consumer.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/RPCServer.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/RPCServer.java"
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"
/>
</list>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
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