Changing ResourceManager naming for platform::ResourceName

[nepi.git] / examples / planetlab / testing / blacklist.py

diff --git a/examples/planetlab/testing/blacklist.py b/examples/planetlab/testing/blacklist.py
index 173417e..68b01c6 100644 (file)
--- a/examples/planetlab/testing/blacklist.py
+++ b/examples/planetlab/testing/blacklist.py
@@ -32,25 +32,25 @@ pl_password =  os.environ.get("PL_PASS")
 username = 'inria_sfatest'
 
 # nodes
-node1 = ec.register_resource("PlanetlabNode")
+node1 = ec.register_resource("planetlab::Node")
 ec.set(node1, "username", username)
 ec.set(node1, "pluser", pl_user)
 ec.set(node1, "plpassword", pl_password)
-ec.set(node1, "cleanHome", True)
+ec.set(node1, "cleanExperiment", True)
 ec.set(node1, "cleanProcesses", True)
 
-node2 = ec.register_resource("PlanetlabNode")
+node2 = ec.register_resource("planetlab::Node")
 ec.set(node2, "username", username)
 ec.set(node2, "pluser", pl_user)
 ec.set(node2, "plpassword", pl_password)
-ec.set(node2, "cleanHome", True)
+ec.set(node2, "cleanExperiment", True)
 ec.set(node2, "cleanProcesses", True)
 
-node3 = ec.register_resource("PlanetlabNode")
+node3 = ec.register_resource("planetlab::Node")
 ec.set(node3, "username", username)
 ec.set(node3, "pluser", pl_user)
 ec.set(node3, "plpassword", pl_password)
-ec.set(node3, "cleanHome", True)
+ec.set(node3, "cleanExperiment", True)
 ec.set(node3, "cleanProcesses", True)
 
 # Set the global attribute 'persist_blacklist' 
@@ -58,20 +58,20 @@ ec.set(node3, "cleanProcesses", True)
 # use of the blacklist, meaning leaving out of the
 # provisioning the nodes in that file, and adding the new blacklisted
 # nodes to the file.
-ec.set_global('PlanetlabNode', 'persist_blacklist', True)
+ec.set_global("planetlab::Node", "persist_blacklist", True)
 
 # apps
-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)