Changing ResourceManager naming for platform::ResourceName

[nepi.git] / examples / linux / testing / ccncat_2_nodes.py

diff --git a/examples/linux/testing/ccncat_2_nodes.py b/examples/linux/testing/ccncat_2_nodes.py
index 7efe118..4ff2936 100644 (file)
--- a/examples/linux/testing/ccncat_2_nodes.py
+++ b/examples/linux/testing/ccncat_2_nodes.py
@@ -48,11 +48,11 @@ import os
 import time
 
 def add_node(ec, host, user, ssh_key = None):
-    node = ec.register_resource("LinuxNode")
+    node = ec.register_resource("linux::Node")
     ec.set(node, "hostname", host)
     ec.set(node, "username", user)
     ec.set(node, "identity", ssh_key)
-    ec.set(node, "cleanHome", True)
+    ec.set(node, "cleanExperiment", True)
     ec.set(node, "cleanProcesses", True)
     return node
 
@@ -101,7 +101,7 @@ def add_ccnd(ec, os_type, peers):
     command += " ; ".join(peers) + " && "
     command += " ccnr & "
 
-    app = ec.register_resource("LinuxApplication")
+    app = ec.register_resource("linux::Application")
     ec.set(app, "depends", depends)
     ec.set(app, "sources", sources)
     ec.set(app, "install", install)
@@ -115,7 +115,7 @@ def add_publish(ec, movie):
     env = "PATH=$PATH:${BIN}/ccnx-0.7.1/bin"
     command = "ccnseqwriter -r ccnx:/VIDEO"
 
-    app = ec.register_resource("LinuxApplication")
+    app = ec.register_resource("linux::Application")
     ec.set(app, "stdin", movie)
     ec.set(app, "env", env)
     ec.set(app, "command", command)
@@ -126,7 +126,7 @@ def add_stream(ec):
     env = "PATH=$PATH:${BIN}/ccnx-0.7.1/bin"
     command = "sudo -S dbus-uuidgen --ensure ; ( ccncat ccnx:/VIDEO | vlc - ) "
 
-    app = ec.register_resource("LinuxApplication")
+    app = ec.register_resource("linux::Application")
     ec.set(app, "depends", "vlc")
     ec.set(app, "forwardX11", True)
     ec.set(app, "env", env)