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
77564dcb
Commit
77564dcb
authored
Dec 31, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typo
parent
b1bde641
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
CloudStormService.java
...n/java/nl/uva/sne/drip/provisioner/CloudStormService.java
+10
-3
CloudsStormVM.yml
openAPI/schema/CloudStorm/CloudsStormVM.yml
+1
-1
No files found.
drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java
View file @
77564dcb
...
...
@@ -31,7 +31,6 @@ import nl.uva.sne.drip.model.cloud.storm.CloudsStormVM;
import
nl.uva.sne.drip.model.NodeTemplateMap
;
import
nl.uva.sne.drip.model.cloud.storm.CloudCred
;
import
nl.uva.sne.drip.model.cloud.storm.CloudCredentialDB
;
import
nl.uva.sne.drip.model.cloud.storm.CloudDB
;
import
nl.uva.sne.drip.model.cloud.storm.CloudDB.CloudProviderEnum
;
import
nl.uva.sne.drip.model.cloud.storm.CloudsStormInfrasCode
;
import
nl.uva.sne.drip.model.cloud.storm.CloudsStormSubTopology
;
...
...
@@ -55,14 +54,14 @@ class CloudStormService {
private
List
<
Map
.
Entry
>
vmTopologies
;
// private String tempInputDirPath;
private
final
ToscaTemplate
toscaTemplate
;
//
private final ToscaTemplate toscaTemplate;
private
final
ToscaHelper
helper
;
private
final
CloudStormDAO
cloudStormDAO
;
private
final
ObjectMapper
objectMapper
;
private
final
String
cloudStormDBPath
;
CloudStormService
(
Properties
properties
,
ToscaTemplate
toscaTemplate
)
throws
IOException
,
JsonProcessingException
,
ApiException
{
this
.
toscaTemplate
=
toscaTemplate
;
//
this.toscaTemplate = toscaTemplate;
cloudStormDBPath
=
properties
.
getProperty
(
"cloud.storm.db.path"
);
cloudStormDAO
=
new
CloudStormDAO
(
cloudStormDBPath
);
String
sureToscaBasePath
=
properties
.
getProperty
(
"sure-tosca.base.path"
);
...
...
@@ -108,6 +107,8 @@ class CloudStormService {
List
<
CloudsStormSubTopology
>
cloudStormSubtopologies
=
(
List
<
CloudsStormSubTopology
>)
subTopologiesAndVMs
.
get
(
"cloud_storm_subtopologies"
);
writeCloudStormInfrasCodeFiles
(
infrasCodeTempInputDirPath
,
cloudStormSubtopologies
);
ToscaTemplate
toscaTemplate
=
runCloudStorm
(
tempInputDirPath
);
return
toscaTemplate
;
}
...
...
@@ -274,4 +275,10 @@ class CloudStormService {
FileUtils
.
copyDirectory
(
srcDir
,
destDir
);
}
private
ToscaTemplate
runCloudStorm
(
String
tempInputDirPath
)
{
String
[]
args
=
new
String
[]{
"run"
,
tempInputDirPath
};
standalone
.
MainAsTool
.
main
(
args
);
return
null
;
}
}
openAPI/schema/CloudStorm/CloudsStormVM.yml
View file @
77564dcb
...
...
@@ -5,7 +5,7 @@
type
:
"
string"
nodeType
:
type
:
"
string"
OS
T
ype
:
OS
t
ype
:
type
:
"
string"
script
:
type
:
"
string"
...
...
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