Changing ResourceManager naming for platform::ResourceName

[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..b6dd2a4 100644 (file)
--- a/examples/planetlab/testing/ping_sfa.py
+++ b/examples/planetlab/testing/ping_sfa.py
@@ -32,37 +32,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)