Update the planetlab part and the omf part of the user manual

[nepi.git] / examples / planetlab / ping_sfa.py

diff --git a/examples/planetlab/ping_sfa.py b/examples/planetlab/ping_sfa.py
index c5b393e..9e9974d 100755 (executable)
--- a/examples/planetlab/ping_sfa.py
+++ b/examples/planetlab/ping_sfa.py
@@ -25,28 +25,43 @@ import os
 exp_id = "sfa_test"
 ec = ExperimentController(exp_id)
 
-username = os.environ.get('SFA_SLICE')
+#username = os.environ.get('SFA_SLICE')
+username = 'inria_lguevgeo'
 sfauser = os.environ.get('SFA_USER')
 sfaPrivateKey = os.environ.get('SFA_PK')
 
 # server
 node1 = ec.register_resource("PlanetlabSfaNode")
-ec.set(node1, "hostname", 'planetlab-4.imperial.ac.uk')
+ec.set(node1, "hostname", 'planetlab1.cs.vu.nl')
 ec.set(node1, "username", username)
 ec.set(node1, "sfauser", sfauser)
 ec.set(node1, "sfaPrivateKey", sfaPrivateKey)
 ec.set(node1, "cleanHome", True)
 ec.set(node1, "cleanProcesses", True)
 
+node2 = ec.register_resource("PlanetlabSfaNode")
+ec.set(node2, "hostname", 'onelab1.info.ucl.ac.be')
+ec.set(node2, "username", username)
+ec.set(node2, "sfauser", sfauser)
+ec.set(node2, "sfaPrivateKey", sfaPrivateKey)
+ec.set(node2, "cleanHome", True)
+ec.set(node2, "cleanProcesses", True)
+
 app1 = ec.register_resource("LinuxApplication")
 command = "ping -c5 google.com" 
 ec.set(app1, "command", command)
 ec.register_connection(app1, node1)
 
+app2 = ec.register_resource("LinuxApplication")
+command = "ping -c5 google.com" 
+ec.set(app2, "command", command)
+ec.register_connection(app2, node2)
+
+
 # Deploy
 ec.deploy()
 
-ec.wait_finished([app1])
+ec.wait_finished([app1, app2])
 
 ec.shutdown()