git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing wrong license
[nepi.git]
/
examples
/
planetlab
/
testing
/
ping_sfa.py
diff --git
a/examples/planetlab/testing/ping_sfa.py
b/examples/planetlab/testing/ping_sfa.py
index
287e83b
..
6eaf0ef
100644
(file)
--- a/
examples/planetlab/testing/ping_sfa.py
+++ b/
examples/planetlab/testing/ping_sfa.py
@@
-4,9
+4,8
@@
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-32,37
+31,37
@@
sfauser = os.environ.get('SFA_USER')
sfaPrivateKey = os.environ.get('SFA_PK')
# server
sfaPrivateKey = os.environ.get('SFA_PK')
# server
-node1 = ec.register_resource("
PlanetlabSfa
Node")
-ec.set(node1, "hostname",
'planetlab3.xeno.cl.cam.ac.uk'
)
+node1 = ec.register_resource("
planetlab::sfa::
Node")
+ec.set(node1, "hostname",
"planetlab3.xeno.cl.cam.ac.uk"
)
ec.set(node1, "username", username)
ec.set(node1, "sfauser", sfauser)
ec.set(node1, "sfaPrivateKey", sfaPrivateKey)
ec.set(node1, "username", username)
ec.set(node1, "sfauser", sfauser)
ec.set(node1, "sfaPrivateKey", sfaPrivateKey)
-ec.set(node1, "clean
Home
", True)
+ec.set(node1, "clean
Experiment
", True)
ec.set(node1, "cleanProcesses", True)
ec.set(node1, "cleanProcesses", True)
-node2 = ec.register_resource("
PlanetlabSfa
Node")
+node2 = ec.register_resource("
planetlab::sfa::
Node")
ec.set(node2, "username", username)
ec.set(node2, "sfauser", sfauser)
ec.set(node2, "sfaPrivateKey", sfaPrivateKey)
ec.set(node2, "username", username)
ec.set(node2, "sfauser", sfauser)
ec.set(node2, "sfaPrivateKey", sfaPrivateKey)
-ec.set(node2, "clean
Home
", True)
+ec.set(node2, "clean
Experiment
", True)
ec.set(node2, "cleanProcesses", True)
ec.set(node2, "cleanProcesses", True)
-node3 = ec.register_resource("
PlanetlabSfa
Node")
+node3 = ec.register_resource("
planetlab::sfa::
Node")
ec.set(node3, "username", username)
ec.set(node3, "sfauser", sfauser)
ec.set(node3, "sfaPrivateKey", sfaPrivateKey)
ec.set(node3, "username", username)
ec.set(node3, "sfauser", sfauser)
ec.set(node3, "sfaPrivateKey", sfaPrivateKey)
-app1 = ec.register_resource("
Linux
Application")
+app1 = ec.register_resource("
linux::
Application")
command = "ping -c5 google.com"
ec.set(app1, "command", command)
ec.register_connection(app1, node1)
command = "ping -c5 google.com"
ec.set(app1, "command", command)
ec.register_connection(app1, node1)
-app2 = ec.register_resource("
Linux
Application")
+app2 = ec.register_resource("
linux::
Application")
command = "ping -c5 google.com"
ec.set(app2, "command", command)
ec.register_connection(app2, node2)
command = "ping -c5 google.com"
ec.set(app2, "command", command)
ec.register_connection(app2, node2)
-app3 = ec.register_resource("
Linux
Application")
+app3 = ec.register_resource("
linux::
Application")
command = "ping -c5 google.com"
ec.set(app3, "command", command)
ec.register_connection(app3, node3)
command = "ping -c5 google.com"
ec.set(app3, "command", command)
ec.register_connection(app3, node3)