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
8eb5c246
Commit
8eb5c246
authored
Oct 01, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cast output
parent
ae9b9098
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
build.sh
build.sh
+1
-1
DeployService.java
.../main/java/nl/uva/sne/drip/api/service/DeployService.java
+5
-2
workspace.xml
drip_planner2/.idea/workspace.xml
+10
-3
etc.tar.gz
etc.tar.gz
+0
-0
No files found.
build.sh
View file @
8eb5c246
...
@@ -14,7 +14,7 @@ tar -czvf drip-deployer.tar.gz drip-deployer
...
@@ -14,7 +14,7 @@ tar -czvf drip-deployer.tar.gz drip-deployer
mv
drip-deployer.tar.gz build
mv
drip-deployer.tar.gz build
tar
-czvf
drip-planner.tar.gz drip
-planner
tar
-czvf
drip-planner.tar.gz drip
_planner2
mv
drip-planner.tar.gz build
mv
drip-planner.tar.gz build
...
...
drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
View file @
8eb5c246
...
@@ -387,7 +387,11 @@ public class DeployService {
...
@@ -387,7 +387,11 @@ public class DeployService {
for
(
Map
<
String
,
Object
>
port
:
ports
)
{
for
(
Map
<
String
,
Object
>
port
:
ports
)
{
Set
<
String
>
keys
=
port
.
keySet
();
Set
<
String
>
keys
=
port
.
keySet
();
for
(
String
key
:
keys
)
{
for
(
String
key
:
keys
)
{
if
(
port
.
get
(
key
)
instanceof
Integer
)
{
outputs
=
TOSCAUtils
.
buildTOSCAOutput
(
outputs
,
serviceName
,
String
.
valueOf
((
Integer
)
port
.
get
(
key
)),
key
,
false
);
outputs
=
TOSCAUtils
.
buildTOSCAOutput
(
outputs
,
serviceName
,
String
.
valueOf
((
Integer
)
port
.
get
(
key
)),
key
,
false
);
}
else
{
outputs
=
TOSCAUtils
.
buildTOSCAOutput
(
outputs
,
serviceName
,
(
String
)
port
.
get
(
key
),
key
,
false
);
}
}
}
}
}
...
@@ -564,7 +568,6 @@ public class DeployService {
...
@@ -564,7 +568,6 @@ public class DeployService {
Map
<
String
,
String
>
domainCache
=
new
HashMap
<>();
Map
<
String
,
String
>
domainCache
=
new
HashMap
<>();
Map
<
String
,
String
>
osTypeCache
=
new
HashMap
<>();
Map
<
String
,
String
>
osTypeCache
=
new
HashMap
<>();
for
(
AnsibleOutput
ansOut
:
outputList
)
{
for
(
AnsibleOutput
ansOut
:
outputList
)
{
Map
<
String
,
Object
>
map
=
provisionService
.
findOne
(
deployInfo
.
getProvisionID
()).
getKeyValue
();
Map
<
String
,
Object
>
map
=
provisionService
.
findOne
(
deployInfo
.
getProvisionID
()).
getKeyValue
();
String
nodeType
=
nodeTypeCache
.
get
(
ansOut
.
getHost
());
String
nodeType
=
nodeTypeCache
.
get
(
ansOut
.
getHost
());
...
...
drip_planner2/.idea/workspace.xml
View file @
8eb5c246
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
<change
beforePath=
"$PROJECT_DIR$/../build.sh"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../build.sh"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../build.sh"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../build.sh"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-api/hs_err_pid26067.log"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../drip-api/hs_err_pid26067.log"
beforeDir=
"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$/src/rpc_server.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/rpc_server.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/easy-install.pth"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/easy-install.pth"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/prettytable.py"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/prettytable.py"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/pyparsing.py"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/venv/lib/python3.6/site-packages/pyparsing.py"
beforeDir=
"false"
/>
...
@@ -140,7 +139,14 @@
...
@@ -140,7 +139,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1569887951720
</updated>
<updated>
1569887951720
</updated>
</task>
</task>
<option
name=
"localTasksCounter"
value=
"5"
/>
<task
id=
"LOCAL-00005"
summary=
"check if message is byte"
>
<created>
1569889346968
</created>
<option
name=
"number"
value=
"00005"
/>
<option
name=
"presentableId"
value=
"LOCAL-00005"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1569889346968
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"6"
/>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"Vcs.Log.Tabs.Properties"
>
<component
name=
"Vcs.Log.Tabs.Properties"
>
...
@@ -162,7 +168,8 @@
...
@@ -162,7 +168,8 @@
<MESSAGE
value=
"format TOSCA output"
/>
<MESSAGE
value=
"format TOSCA output"
/>
<MESSAGE
value=
"changed to ubunut 17.10"
/>
<MESSAGE
value=
"changed to ubunut 17.10"
/>
<MESSAGE
value=
"debug"
/>
<MESSAGE
value=
"debug"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"debug"
/>
<MESSAGE
value=
"check if message is byte"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"check if message is byte"
/>
</component>
</component>
<component
name=
"XDebuggerManager"
>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
<breakpoint-manager>
...
...
etc.tar.gz
deleted
100644 → 0
View file @
ae9b9098
File deleted
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