X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Finterface.py;h=0141d4c996b6541bef421dde8003d371fbe3a755;hb=HEAD;hp=44c293afeac51c0ad1e3260782200ba38a2045e5;hpb=eb111746f316ddd70f6eed77e432151c8ab96fe6;p=nepi.git

diff --git a/test/resources/linux/interface.py b/test/resources/linux/interface.py
old mode 100644
new mode 100755
index 44c293af..0141d4c9
--- a/test/resources/linux/interface.py
+++ b/test/resources/linux/interface.py
@@ -1,10 +1,28 @@
 #!/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
 from nepi.resources.linux.node import LinuxNode
 from nepi.resources.linux.interface import LinuxInterface
 from nepi.resources.linux.channel import LinuxChannel
-from nepi.util.sshfuncs import RUNNING, FINISHED
 
 from test_utils import skipIfNotAlive
 
@@ -15,11 +33,11 @@ import unittest
 
 class LinuxInterfaceTestCase(unittest.TestCase):
     def setUp(self):
-        self.fedora_host = 'nepi2.pl.sophia.inria.fr'
-        self.fedora_user = 'inria_nepi'
+        self.fedora_host = "nepi2.pl.sophia.inria.fr"
+        self.fedora_user = "inria_nepi"
 
-        self.ubuntu_host = 'roseval.pl.sophia.inria.fr'
-        self.ubuntu_user = 'alina'
+        self.ubuntu_host = "roseval.pl.sophia.inria.fr"
+        self.ubuntu_user = "alina"
 
     @skipIfNotAlive
     def t_deploy(self, host, user):
@@ -31,12 +49,12 @@ class LinuxInterfaceTestCase(unittest.TestCase):
 
         ec = ExperimentController()
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
 
-        iface = ec.register_resource("LinuxInterface")
-        chan = ec.register_resource("LinuxChannel")
+        iface = ec.register_resource("linux::Interface")
+        chan = ec.register_resource("linux::Channel")
 
         ec.register_connection(iface, node)
         ec.register_connection(iface, chan)
@@ -44,7 +62,7 @@ class LinuxInterfaceTestCase(unittest.TestCase):
         ec.deploy()
 
         while not all([ ec.state(guid) == ResourceState.STARTED \
-                for guid in [node, iface]]) and not ec.finished:
+                for guid in [node, iface]]):
             time.sleep(0.5)
 
         self.assertTrue(ec.state(node) == ResourceState.STARTED)