X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fplanetlab%2Fping_sfa.py;h=287e83b4f325c676f549d290ce7087cd4e2da4ed;hb=c01d40579e6d77f12327072dec0fb82c41676bb0;hp=b05b91e1ca299de2b69a7284857f939b49ad3af1;hpb=2e80f0fafa0c2ef6a5f536efd4c868c91468f962;p=nepi.git

diff --git a/examples/planetlab/ping_sfa.py b/examples/planetlab/ping_sfa.py
index b05b91e1..287e83b4 100755
--- a/examples/planetlab/ping_sfa.py
+++ b/examples/planetlab/ping_sfa.py
@@ -19,19 +19,21 @@
 # Author: Lucia Guevgeozian <lucia.guevgeozian_odizzio@inria.fr>
 
 from nepi.execution.ec import ExperimentController
+from nepi.execution.resource import ResourceAction, ResourceState
 import os
 
 # Create the EC
 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", 'planetlab1.cs.vu.nl')
+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)
@@ -39,13 +41,17 @@ ec.set(node1, "cleanHome", True)
 ec.set(node1, "cleanProcesses", True)
 
 node2 = ec.register_resource("PlanetlabSfaNode")
-ec.set(node2, "hostname", 'planetlab3.xeno.cl.cam.ac.uk')
 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)
 
+node3 = ec.register_resource("PlanetlabSfaNode")
+ec.set(node3, "username", username)
+ec.set(node3, "sfauser", sfauser)
+ec.set(node3, "sfaPrivateKey", sfaPrivateKey)
+
 app1 = ec.register_resource("LinuxApplication")
 command = "ping -c5 google.com" 
 ec.set(app1, "command", command)
@@ -56,11 +62,18 @@ command = "ping -c5 google.com"
 ec.set(app2, "command", command)
 ec.register_connection(app2, node2)
 
+app3 = ec.register_resource("LinuxApplication")
+command = "ping -c5 google.com"
+ec.set(app3, "command", command)
+ec.register_connection(app3, node3)
+
+ec.register_condition(node2, ResourceAction.DEPLOY, node1, ResourceState.PROVISIONED)
+ec.register_condition(node3, ResourceAction.DEPLOY, node1, ResourceState.PROVISIONED)
 
 # Deploy
 ec.deploy()
 
-ec.wait_finished([app1, app2])
+ec.wait_finished([app1, app2, app3])
 
 ec.shutdown()