X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=b6ccb6f125d01e0e5bd1ee4b28f87619fda100bc;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=a1f1397b1a18a75747133e02703b1b9fe3e1fdaf;hpb=1e2eb157cb569e9c28a5b7888ed97076d27414cb;p=nepi.git

diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py
index a1f1397b..b6ccb6f1 100755
--- a/test/resources/linux/application.py
+++ b/test/resources/linux/application.py
@@ -45,13 +45,13 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec = ExperimentController(exp_id = "test-stdout")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         cmd = "echo 'HOLA'"
         ec.set(app, "command", cmd)
         ec.register_connection(app, node)
@@ -73,13 +73,13 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec = ExperimentController(exp_id = "test-ping")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         cmd = "ping -c5 %s" % self.target 
         ec.set(app, "command", cmd)
         
@@ -111,10 +111,10 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec = ExperimentController(exp_id = "tests-code")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
         
         prog = """#include <stdio.h>
@@ -129,7 +129,7 @@ main (void)
         cmd = "${RUN_HOME}/hello" 
         build = "gcc -Wall -x c ${APP_HOME}/code -o hello" 
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         ec.set(app, "command", cmd)
         ec.set(app, "code", prog)
         ec.set(app, "depends", "gcc")
@@ -150,15 +150,15 @@ main (void)
 
         ec = ExperimentController(exp_id="test-concurrency")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
         apps = list()
         for i in xrange(50):
-            app = ec.register_resource("LinuxApplication")
+            app = ec.register_resource("linux::Application")
             cmd = "ping -c5 %s" % self.target 
             ec.set(app, "command", cmd)
             ec.register_connection(app, node)
@@ -194,19 +194,19 @@ main (void)
 
         ec = ExperimentController(exp_id="test-condition")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        server = ec.register_resource("LinuxApplication")
+        server = ec.register_resource("linux::Application")
         cmd = "echo 'HOLA' | nc -l 3333"
         ec.set(server, "command", cmd)
         ec.set(server, "depends", depends)
         ec.register_connection(server, node)
 
-        client = ec.register_resource("LinuxApplication")
+        client = ec.register_resource("linux::Application")
         cmd = "nc 127.0.0.1 3333"
         ec.set(client, "command", cmd)
         ec.register_connection(client, node)
@@ -233,16 +233,16 @@ main (void)
 
         ec = ExperimentController(exp_id="test-http-sources")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
         sources = "http://yans.pl.sophia.inria.fr/code/nef/archive/tip.tar.gz;" \
                 "http://yans.pl.sophia.inria.fr/code/nef/raw-file/8ace577d4079/src/nef/images/menu/connect.png"
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         ec.set(app, "sources", sources)
 
         command = "ls ${SRC}"
@@ -250,6 +250,7 @@ main (void)
 
         ec.register_connection(app, node)
 
+
         ec.deploy()
 
         ec.wait_finished([app])
@@ -275,13 +276,13 @@ main (void)
 
         ec = ExperimentController(exp_id="test-xterm")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         ec.set(app, "command", "xterm")
         ec.set(app, "depends", "xterm")
         ec.set(app, "forwardX11", True)
@@ -309,13 +310,13 @@ main (void)
 
         ec = ExperimentController(exp_id="test-copyfile")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         ec.set(app, "command", "ls ${SRC}")
         ec.set(app, "sources", "%s;%s" % (dirpath, f1.name))
         ec.register_connection(app, node)