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
f5f5c03c
Commit
f5f5c03c
authored
Oct 25, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added tests for utils
updated model
parent
4053fc74
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
ProvisionerService.java
...main/java/nl/uva/sne/drip/service/ProvisionerService.java
+14
-5
swagger.yaml
drip-manager/swagger.yaml
+1
-1
No files found.
drip-manager/src/main/java/nl/uva/sne/drip/service/ProvisionerService.java
View file @
f5f5c03c
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
package
nl
.
uva
.
sne
.
drip
.
service
;
package
nl
.
uva
.
sne
.
drip
.
service
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.TimeoutException
;
import
java.util.concurrent.TimeoutException
;
import
java.util.logging.Level
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
java.util.logging.Logger
;
...
@@ -37,9 +39,16 @@ public class ProvisionerService {
...
@@ -37,9 +39,16 @@ public class ProvisionerService {
String
ymlToscaTemplate
=
toscaTemplateService
.
findByID
(
id
);
String
ymlToscaTemplate
=
toscaTemplateService
.
findByID
(
id
);
ToscaTemplate
toscaTemplate
=
toscaTemplateService
.
getYaml2ToscaTemplate
(
ymlToscaTemplate
);
ToscaTemplate
toscaTemplate
=
toscaTemplateService
.
getYaml2ToscaTemplate
(
ymlToscaTemplate
);
List
<
Map
.
Entry
>
vmTopologies
=
getVmTopologies
(
toscaTemplate
);
for
(
Map
.
Entry
topology:
vmTopologies
){
topology
.
}
return
null
;
return
null
;
}
}
public
List
<
Map
.
Entry
>
getVmTopologies
(
ToscaTemplate
toscaTemplate
)
{
return
TOSCAUtils
.
getNodesByType
(
toscaTemplate
,
"tosca.nodes.ARTICONF.VM.topology"
);
}
}
}
drip-manager/swagger.yaml
View file @
f5f5c03c
...
@@ -546,7 +546,7 @@ definitions:
...
@@ -546,7 +546,7 @@ definitions:
node_templates
:
node_templates
:
type
:
object
type
:
object
additionalProperties
:
additionalProperties
:
type
:
object
$ref
:
'
#/definitions/NodeTemplate'
relationship_templates
:
relationship_templates
:
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