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
09fd2c95
Commit
09fd2c95
authored
Nov 01, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed all parsing errors
parent
3787c955
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
458 additions
and
503 deletions
+458
-503
stack_monitoring.yml
docs/composer_files/stack_monitoring.yml
+21
-12
BEIA_cardif2.yml
docs/input_tosca_files/BEIA_cardif2.yml
+419
-481
Converter.java
...rc/main/java/nl/uva/sne/drip/commons/utils/Converter.java
+0
-3
docker_check.py
drip-deployer/docker_check.py
+0
-1
docker_check.pyc
drip-deployer/docker_check.pyc
+0
-0
rpc_server.py
drip-deployer/rpc_server.py
+1
-1
P2PConverter.java
...ain/java/nl/uva/sne/drip/drip/converter/P2PConverter.java
+15
-3
rpc_server.py
drip_planner2/src/rpc_server.py
+2
-2
No files found.
docs/composer_files/stack_monitoring.yml
View file @
09fd2c95
version
:
'
3'
services
:
server
:
image
:
salmant/ul_monitoring_server_container_image2
ports
:
-
"
8080:8080/tcp"
-
"
8080:8080"
-
"
4242:4242"
-
"
4245:4245"
-
"
7199:7199"
-
"
7000:7000"
-
"
7001:7001"
-
"
9160:9160"
-
"
9042:9042"
-
"
8012:8012"
-
"
61621:61621"
environment
:
-
"
MONITORING_SERVER=server"
agent
:
image
:
salmant/monitoring_agent
deploy
:
replicas
:
20
depends_on
:
-
server
deploy
:
{
replicas
:
10
}
depends_on
:
[
server
]
command
:
--monitoringServerIP=server
docs/input_tosca_files/BEIA_cardif2.yml
View file @
09fd2c95
This diff is collapsed.
Click to expand it.
drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
View file @
09fd2c95
...
...
@@ -22,12 +22,9 @@ import java.io.InputStream;
import
java.util.ArrayList
;
import
java.util.Enumeration
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Properties
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
java.util.regex.Matcher
;
import
nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials
;
import
org.apache.commons.io.FilenameUtils
;
...
...
drip-deployer/docker_check.py
View file @
09fd2c95
...
...
@@ -117,7 +117,6 @@ def docker_check(vm, compose_name):
response_str
+=
line
json_dict
=
{}
response_str
=
response_str
.
rstrip
(
"
\n\r
"
)
.
strip
(
'
\t\n\r
'
)
.
strip
()
.
encode
(
'string_escape'
)
print
response_str
json_dict
=
json
.
loads
(
response_str
)
json_response
[
'nodes_info'
]
=
json_dict
...
...
drip-deployer/docker_check.pyc
View file @
09fd2c95
No preview for this file type
drip-deployer/rpc_server.py
View file @
09fd2c95
...
...
@@ -170,7 +170,7 @@ def on_request(ch, method, props, body):
response
[
"parameters"
]
.
append
(
par
)
response
=
json
.
dumps
(
response
)
#
logger.info("Response: " + response)
logger
.
info
(
"Response: "
+
response
)
ch
.
basic_publish
(
exchange
=
''
,
...
...
drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/P2PConverter.java
View file @
09fd2c95
...
...
@@ -29,8 +29,14 @@ public class P2PConverter {
String
provisionerScalingMode
=
"fixed"
;
for
(
Object
element
:
vmList
)
{
Map
<
String
,
Object
>
map
=
(
Map
<
String
,
Object
>)
element
;
if
(
map
.
containsKey
(
"scaling_mode"
))
{
Map
<
String
,
Object
>
map
=
null
;
if
(
element
instanceof
Map
)
{
map
=
(
Map
<
String
,
Object
>)
element
;
}
else
if
(
element
instanceof
String
)
{
map
=
Converter
.
jsonString2Map
((
String
)
element
);
}
if
(
map
!=
null
&&
map
.
containsKey
(
"scaling_mode"
))
{
String
scalingMode
=
(
String
)
map
.
get
(
"scaling_mode"
);
if
(!
scalingMode
.
equals
(
"single"
))
{
provisionerScalingMode
=
"scaling"
;
...
...
@@ -85,7 +91,13 @@ public class P2PConverter {
boolean
firstVM
=
true
;
for
(
Object
element
:
vmList
)
{
Map
<
String
,
Object
>
map
=
(
Map
<
String
,
Object
>)
element
;
Map
<
String
,
Object
>
map
=
null
;
if
(
element
instanceof
Map
)
{
map
=
(
Map
<
String
,
Object
>)
element
;
}
else
if
(
element
instanceof
String
)
{
map
=
Converter
.
jsonString2Map
((
String
)
element
);
}
VM
curVM
;
switch
(
cloudProvider
.
trim
().
toLowerCase
())
{
case
"ec2"
:
...
...
drip_planner2/src/rpc_server.py
View file @
09fd2c95
...
...
@@ -82,8 +82,8 @@ def handle_delivery(message):
if
__name__
==
"__main__"
:
# home = expanduser("~")
# planner = DumpPlanner(home+"/workspace/DRIP/docs/input_tosca_files/
MOG_cardif
.yml")
# planner.plan()
# planner = DumpPlanner(home+"/workspace/DRIP/docs/input_tosca_files/
BEIA_cardif2
.yml")
# p
rint p
lanner.plan()
print
sys
.
argv
channel
=
init_chanel
(
sys
.
argv
)
global
queue_name
...
...
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