X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=f98c1c698c86b7749098ac0465e7c6a98c969b42;hb=342187d6e7ce34d4fdf403952637659b93aa4bee;hp=4f9f90e8ae0e9cf4431ca1ecb6029e81b53d9bc0;hpb=98a98f7058ec7180303ea88e8ccc212ddf740ac6;p=nepi.git

diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py
old mode 100644
new mode 100755
index 4f9f90e8..f98c1c69
--- a/test/resources/linux/application.py
+++ b/test/resources/linux/application.py
@@ -1,75 +1,84 @@
 #!/usr/bin/env python
+#
+#    NEPI, a framework to manage network experiments
+#    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 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
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+
 from nepi.execution.ec import ExperimentController 
 from nepi.execution.resource import ResourceState, ResourceAction
 from nepi.execution.trace import TraceAttr
-from nepi.resources.linux.node import LinuxNode
-from nepi.resources.linux.application import LinuxApplication
 
-from test_utils import skipIfNotAlive
+from test_utils import skipIfNotAlive, skipInteractive
 
 import os
+import shutil
 import time
 import tempfile
 import unittest
 
 class LinuxApplicationTestCase(unittest.TestCase):
     def setUp(self):
-        self.fedora_host = 'nepi2.pl.sophia.inria.fr'
-        self.fedora_user = 'inria_nepi'
+        self.fedora_host = "fedora.pl.sophia.inria.fr"
+        self.fedora_user = "inria_nepi"
 
-        self.ubuntu_host = 'roseval.pl.sophia.inria.fr'
-        self.ubuntu_user = 'alina'
+        self.ubuntu_host = "ubuntu.pl.sophia.inria.fr"
+        self.ubuntu_user = "inria_nepi"
         
-        self.target = 'nepi5.pl.sophia.inria.fr'
+        self.target = "nepi.pl.sophia.inria.fr"
 
     @skipIfNotAlive
     def t_stdout(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        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)
 
         ec.deploy()
 
-        ec.wait_finished([app])
+        ec.wait_finished(app)
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
-        self.assertTrue(ec.state(app) == ResourceState.FINISHED)
+        self.assertTrue(ec.state(app) == ResourceState.STOPPED)
 
-        stdout = ec.trace(app, 'stdout')
+        stdout = ec.trace(app, "stdout")
         self.assertTrue(stdout.strip() == "HOLA")
 
         ec.shutdown()
 
     @skipIfNotAlive
     def t_ping(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        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)
         
@@ -77,43 +86,78 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         ec.deploy()
 
-        ec.wait_finished([app])
+        ec.wait_finished(app)
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
-        self.assertTrue(ec.state(app) == ResourceState.FINISHED)
+        self.assertTrue(ec.state(app) == ResourceState.STOPPED)
 
-        stdout = ec.trace(app, 'stdout')
-        size = ec.trace(app, 'stdout', attr = TraceAttr.SIZE)
+        stdout = ec.trace(app, "stdout")
+        size = ec.trace(app, "stdout", attr = TraceAttr.SIZE)
         self.assertEquals(len(stdout), size)
         
-        block = ec.trace(app, 'stdout', attr = TraceAttr.STREAM, block = 5, offset = 1)
+        block = ec.trace(app, "stdout", attr = TraceAttr.STREAM, block = 5, offset = 1)
         self.assertEquals(block, stdout[5:10])
 
-        path = ec.trace(app, 'stdout', attr = TraceAttr.PATH)
+        path = ec.trace(app, "stdout", attr = TraceAttr.PATH)
         rm = ec.get_resource(app)
-        p = os.path.join(rm.app_home, 'stdout')
+        p = os.path.join(rm.run_home, "stdout")
         self.assertEquals(path, p)
 
         ec.shutdown()
 
     @skipIfNotAlive
-    def t_concurrency(self, host, user):
-        from nepi.execution.resource import ResourceFactory
+    def t_code(self, host, user):
+
+        ec = ExperimentController(exp_id = "tests-code")
+        
+        node = ec.register_resource("linux::Node")
+        ec.set(node, "hostname", host)
+        ec.set(node, "username", user)
+        ec.set(node, "cleanExperiment", True)
+        ec.set(node, "cleanProcesses", True)
         
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
+        prog = """#include <stdio.h>
+
+int
+main (void)
+{
+    printf ("Hello, world!\\n");
+    return 0;
+}
+"""
+        cmd = "${RUN_HOME}/hello" 
+        build = "gcc -Wall -x c ${APP_HOME}/code -o hello" 
+
+        app = ec.register_resource("linux::Application")
+        ec.set(app, "command", cmd)
+        ec.set(app, "code", prog)
+        ec.set(app, "depends", "gcc")
+        ec.set(app, "build", build)
+        ec.register_connection(app, node)
+
+        ec.deploy()
+
+        ec.wait_finished(app)
 
-        ec = ExperimentController()
+        out = ec.trace(app, 'stdout')
+        self.assertEquals(out, "Hello, world!\n")
+
+        ec.shutdown()
+
+    @skipIfNotAlive
+    def t_concurrency(self, host, user):
+
+        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)
@@ -125,7 +169,7 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
         self.assertTrue(
-               all([ec.state(guid) == ResourceState.FINISHED \
+               all([ec.state(guid) == ResourceState.STOPPED \
                 for guid in apps])
                 )
 
@@ -139,33 +183,29 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
             path = ec.trace(app, 'stdout', attr = TraceAttr.PATH)
             rm = ec.get_resource(app)
-            p = os.path.join(rm.app_home, 'stdout')
+            p = os.path.join(rm.run_home, 'stdout')
             self.assertEquals(path, p)
 
         ec.shutdown()
 
     @skipIfNotAlive
     def t_condition(self, host, user, depends):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        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)
@@ -179,52 +219,120 @@ class LinuxApplicationTestCase(unittest.TestCase):
         ec.wait_finished(apps)
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
-        self.assertTrue(ec.state(server) == ResourceState.FINISHED)
-        self.assertTrue(ec.state(client) == ResourceState.FINISHED)
+        self.assertTrue(ec.state(server) == ResourceState.STOPPED)
+        self.assertTrue(ec.state(client) == ResourceState.STOPPED)
 
-        stdout = ec.trace(client, 'stdout')
+        stdout = ec.trace(client, "stdout")
         self.assertTrue(stdout.strip() == "HOLA")
 
         ec.shutdown()
 
     @skipIfNotAlive
     def t_http_sources(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(LinuxNode)
-        ResourceFactory.register_type(LinuxApplication)
 
-        ec = ExperimentController()
+        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://nepi.inria.fr/attachment/wiki/WikiStart/pybindgen-r794.tar.gz " \
-            "http://nepi.inria.fr/attachment/wiki/WikiStart/nepi_integration_framework.pdf"
+        sources = "http://mirror.onelab.eu/third-party/nepi-tip.tgz;" \
+                "http://mirror.onelab.eu/third-party/nepi-connect.png"
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         ec.set(app, "sources", sources)
 
+        command = "ls ${SRC}"
+        ec.set(app, "command", command)
+
         ec.register_connection(app, node)
 
+
         ec.deploy()
 
         ec.wait_finished([app])
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
-        self.assertTrue(ec.state(app) == ResourceState.FINISHED)
+        self.assertTrue(ec.state(app) == ResourceState.STOPPED)
+
+        exitcode = ec.trace(app, "deploy_exitcode")
+        self.assertTrue(exitcode.strip() == "0")
+        
+        out = ec.trace(app, "deploy_stdout")
+        self.assertTrue(out.find("nepi-tip.tgz") > -1)
+        self.assertTrue(out.find("nepi-connect.png") > -1)
+
+        stdout = ec.trace(app, "stdout")
+        self.assertTrue(stdout.find("nepi-tip.tgz") > -1)
+        self.assertTrue(stdout.find("nepi-connect.png") > -1)
+
+        ec.shutdown()
+
+    @skipIfNotAlive
+    def t_xterm(self, host, user):
+
+        ec = ExperimentController(exp_id="test-xterm")
+        
+        node = ec.register_resource("linux::Node")
+        ec.set(node, "hostname", host)
+        ec.set(node, "username", user)
+        ec.set(node, "cleanExperiment", True)
+        ec.set(node, "cleanProcesses", True)
+
+        app = ec.register_resource("linux::Application")
+        ec.set(app, "command", "xterm")
+        ec.set(app, "depends", "xterm")
+        ec.set(app, "forwardX11", True)
+
+        ec.register_connection(app, node)
+
+        ec.deploy()
+
+        ec.wait_finished([app])
+
+        self.assertTrue(ec.state(app) == ResourceState.STOPPED)
+
+        ec.shutdown()
 
-        err = ec.trace(app, 'http_sources_err')
-        self.assertTrue(err == "")
+    @skipIfNotAlive
+    def t_copy_files(self, host, user):
+        # create some temp files and directories to copy
+        dirpath = tempfile.mkdtemp()
+        f = tempfile.NamedTemporaryFile(dir=dirpath, delete=False)
+        f.close()
+      
+        f1 = tempfile.NamedTemporaryFile(delete=False)
+        f1.close()
+        f1.name
+
+        ec = ExperimentController(exp_id="test-copyfile")
+        
+        node = ec.register_resource("linux::Node")
+        ec.set(node, "hostname", host)
+        ec.set(node, "username", user)
+        ec.set(node, "cleanExperiment", True)
+        ec.set(node, "cleanProcesses", True)
+
+        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)
+
+        ec.deploy()
+
+        ec.wait_finished([app])
+
+        stdout = ec.trace(app, "stdout")
         
-        out = ec.trace(app, 'http_sources_out')
-        self.assertTrue(out.find("pybindgen-r794.tar.gz") > -1)
-        self.assertTrue(out.find("nepi_integration_framework.pdf") > -1)
+        self.assertTrue(stdout.find(os.path.basename(dirpath)) > -1)
+        self.assertTrue(stdout.find(os.path.basename(f1.name)) > -1)
 
         ec.shutdown()
+        
+        os.remove(f1.name)
+        shutil.rmtree(dirpath)
 
     def test_stdout_fedora(self):
         self.t_stdout(self.fedora_host, self.fedora_user)
@@ -256,8 +364,22 @@ class LinuxApplicationTestCase(unittest.TestCase):
     def test_http_sources_ubuntu(self):
         self.t_http_sources(self.ubuntu_host, self.ubuntu_user)
 
+    def test_code_fedora(self):
+        self.t_code(self.fedora_host, self.fedora_user)
+
+    def test_code_ubuntu(self):
+        self.t_code(self.ubuntu_host, self.ubuntu_user)
+
+    @skipInteractive
+    def test_xterm_ubuntu(self):
+        """ Interactive test. Should not run automatically """
+        self.t_xterm(self.ubuntu_host, self.ubuntu_user)
+
+    def test_copy_files_fedora(self):
+        self.t_copy_files(self.fedora_host, self.fedora_user)
 
-    # TODO: test compilation, sources, dependencies, etc!!!
+    def test_copy_files_ubuntu(self):
+        self.t_copy_files(self.ubuntu_host, self.ubuntu_user)
 
 if __name__ == '__main__':
     unittest.main()