X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fplanetlab%2Ftesting%2Fping_sfa.py;h=6eaf0ef9fbe3d1c90d825201a8a28bb904e77df7;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=287e83b4f325c676f549d290ce7087cd4e2da4ed;hpb=a55b5cf0818ced6ab8dc3e88fad7f6616675e826;p=nepi.git

diff --git a/examples/planetlab/testing/ping_sfa.py b/examples/planetlab/testing/ping_sfa.py
index 287e83b4..6eaf0ef9 100644
--- 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
-#    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
@@ -32,37 +31,37 @@ sfauser = os.environ.get('SFA_USER')
 sfaPrivateKey = os.environ.get('SFA_PK')
 
 # server
-node1 = ec.register_resource("PlanetlabSfaNode")
-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, "cleanHome", True)
+ec.set(node1, "cleanExperiment", True)
 ec.set(node1, "cleanProcesses", True)
 
-node2 = ec.register_resource("PlanetlabSfaNode")
+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, "cleanHome", True)
+ec.set(node2, "cleanExperiment", True)
 ec.set(node2, "cleanProcesses", True)
 
-node3 = ec.register_resource("PlanetlabSfaNode")
+node3 = ec.register_resource("planetlab::sfa::Node")
 ec.set(node3, "username", username)
 ec.set(node3, "sfauser", sfauser)
 ec.set(node3, "sfaPrivateKey", sfaPrivateKey)
 
-app1 = ec.register_resource("LinuxApplication")
+app1 = ec.register_resource("linux::Application")
 command = "ping -c5 google.com" 
 ec.set(app1, "command", command)
 ec.register_connection(app1, node1)
 
-app2 = ec.register_resource("LinuxApplication")
+app2 = ec.register_resource("linux::Application")
 command = "ping -c5 google.com" 
 ec.set(app2, "command", command)
 ec.register_connection(app2, node2)
 
-app3 = ec.register_resource("LinuxApplication")
+app3 = ec.register_resource("linux::Application")
 command = "ping -c5 google.com"
 ec.set(app3, "command", command)
 ec.register_connection(app3, node3)