Examples PL and Wilab sfa

diff --git a/examples/omf/wilabt_provision.py b/examples/omf/wilabt_provision.py
new file mode 100755 (executable)
index 0000000..8380911
--- /dev/null
+++ b/examples/omf/wilabt_provision.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+#
+#    NEPI, a framework to manage network experiments
+#    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.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Lucia Guevgeozian <lucia.guevgeozian_odizzio@inria.fr>
+
+from nepi.execution.ec import ExperimentController
+import os
+
+# Create the EC
+exp_id = "sfa_test"
+ec = ExperimentController(exp_id)
+
+slicename = 'ple.inria.lguevgeo'
+sfauser = os.environ.get('SFA_USER')
+sfaPrivateKey = os.environ.get('SFA_PK')
+
+# nodes
+node1 = ec.register_resource("WilabtSfaNode")
+ec.set(node1, "hostname", 'zotacB5')
+ec.set(node1, "slicename", slicename)
+ec.set(node1, "sfauser", sfauser)
+ec.set(node1, "sfaPrivateKey", sfaPrivateKey)
+ec.set(node1, "gatewayUser", "nepi")
+ec.set(node1, "gateway", "bastion.test.iminds.be")
+ec.set(node1, "cleanHome", True)
+ec.set(node1, "cleanProcesses", True)
+
+node2 = ec.register_resource("WilabtSfaNode")
+ec.set(node2, "hostname", 'zotacM20')
+ec.set(node2, "slicename", slicename)
+ec.set(node2, "sfauser", sfauser)
+ec.set(node2, "sfaPrivateKey", sfaPrivateKey)
+ec.set(node2, "gatewayUser", "nepi")
+ec.set(node2, "gateway", "bastion.test.iminds.be")
+ec.set(node2, "cleanHome", True)
+ec.set(node2, "cleanProcesses", True)
+
+# Deploy
+ec.deploy()
+
+ec.wait_deployed([node1, node2])
+
+ec.shutdown()
+
+# End

diff --git a/examples/planetlab/ping_sfa.py b/examples/planetlab/ping_sfa.py
index c5b393e..b05b91e 100755 (executable)
--- a/examples/planetlab/ping_sfa.py
+++ b/examples/planetlab/ping_sfa.py
@@ -31,22 +31,36 @@ 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", '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)
+
 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()