git://git.onelab.eu / nepi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update test and examples for OMF6 in OMF section
[nepi.git] / test / resources / omf / omf6_vlc_normal_case.py
diff --git a/test/resources/omf/vlc_normal_case.py b/test/resources/omf/omf6_vlc_normal_case.py
similarity index 81%
rename from test/resources/omf/vlc_normal_case.py
rename to test/resources/omf/omf6_vlc_normal_case.py
index 184a79d..4f7b64a 100755 (executable)
--- a/test/resources/omf/vlc_normal_case.py
+++ b/test/resources/omf/omf6_vlc_normal_case.py
@@ -26,7 +26,7 @@ from nepi.resources.omf.node import OMFNode
 from nepi.resources.omf.application import OMFApplication
 from nepi.resources.omf.interface import OMFWifiInterface
 from nepi.resources.omf.channel import OMFChannel
-from nepi.resources.omf.omf_api import OMFAPIFactory
+from nepi.resources.omf.omf_api_factory import OMFAPIFactory
 
 from nepi.util.timefuncs import *
 
@@ -37,13 +37,13 @@ class OMFResourceFactoryTestCase(unittest.TestCase):
     def test_creation_phase(self):
 
         self.assertEquals(OMFNode.get_rtype(), "OMFNode")
-        self.assertEquals(len(OMFNode._attributes), 6)
+        self.assertEquals(len(OMFNode._attributes), 7)
 
         self.assertEquals(OMFWifiInterface.get_rtype(), "OMFWifiInterface")
-        self.assertEquals(len(OMFWifiInterface._attributes), 10)
+        self.assertEquals(len(OMFWifiInterface._attributes), 11)
 
         self.assertEquals(OMFChannel.get_rtype(), "OMFChannel")
-        self.assertEquals(len(OMFChannel._attributes), 6)
+        self.assertEquals(len(OMFChannel._attributes), 7)
 
         self.assertEquals(OMFApplication.get_rtype(), "OMFApplication")
         self.assertEquals(len(OMFApplication._attributes), 13)
@@ -53,36 +53,37 @@ class OMFEachTestCase(unittest.TestCase):
         self.ec = ExperimentController(exp_id = "99999")
 
         self.node1 = self.ec.register_resource("OMFNode")
-        self.ec.set(self.node1, 'hostname', 'omf.plexus.wlab17')
-        self.ec.set(self.node1, 'xmppSlice', "nepi")
-        self.ec.set(self.node1, 'xmppHost', "xmpp-plexus.onelab.eu")
+        self.ec.set(self.node1, 'hostname', 'wlab12')
+        self.ec.set(self.node1, 'xmppUser', "nepi")
+        self.ec.set(self.node1, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node1, 'xmppPort', "5222")
         self.ec.set(self.node1, 'xmppPassword', "1234")
         
         self.iface1 = self.ec.register_resource("OMFWifiInterface")
-        self.ec.set(self.iface1, 'alias', "w0")
+        self.ec.set(self.iface1, 'name', "wlan0")
         self.ec.set(self.iface1, 'mode', "adhoc")
-        self.ec.set(self.iface1, 'type', "g")
+        self.ec.set(self.iface1, 'hw_mode', "g")
         self.ec.set(self.iface1, 'essid', "vlcexp")
-        self.ec.set(self.iface1, 'ip', "10.0.0.17")
+        self.ec.set(self.iface1, 'ip', "10.0.0.17/24")
         
         self.channel = self.ec.register_resource("OMFChannel")
         self.ec.set(self.channel, 'channel', "6")
-        self.ec.set(self.channel, 'xmppSlice', "nepi")
-        self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu")
+        self.ec.set(self.channel, 'xmppUser', "nepi")
+        self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.channel, 'xmppPort', "5222")
         self.ec.set(self.channel, 'xmppPassword', "1234")
         
         self.app1 = self.ec.register_resource("OMFApplication")
         self.ec.set(self.app1, 'appid', 'Vlc#1')
-        self.ec.set(self.app1, 'path', "/opt/vlc-1.1.13/cvlc")
-        self.ec.set(self.app1, 'args', "/opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
+        self.ec.set(self.app1, 'command', "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
         self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
 
         self.app2 = self.ec.register_resource("OMFApplication")
 
         self.app3 = self.ec.register_resource("OMFApplication")
+
         self.app4 = self.ec.register_resource("OMFApplication")
+
         self.app5 = self.ec.register_resource("OMFApplication")
 
         self.ec.register_connection(self.app1, self.node1)
@@ -105,31 +106,36 @@ class OMFEachTestCase(unittest.TestCase):
         self.ec.shutdown()
 
     def test_creation_and_configuration_node(self):
-        self.assertEquals(self.ec.get(self.node1, 'hostname'), 'omf.plexus.wlab17')
-        self.assertEquals(self.ec.get(self.node1, 'xmppSlice'), 'nepi')
-        self.assertEquals(self.ec.get(self.node1, 'xmppHost'), 'xmpp-plexus.onelab.eu')
+        self.assertEquals(self.ec.get(self.node1, 'hostname'), 'wlab12')
+        self.assertEquals(self.ec.get(self.node1, 'xmppUser'), 'nepi')
+        self.assertEquals(self.ec.get(self.node1, 'xmppServer'), 'xmpp-plexus.onelab.eu')
         self.assertEquals(self.ec.get(self.node1, 'xmppPort'), '5222')
         self.assertEquals(self.ec.get(self.node1, 'xmppPassword'), '1234')
+        self.assertEquals(self.ec.get(self.node1, 'version'), '6')
+
 
     def test_creation_and_configuration_interface(self):
-        self.assertEquals(self.ec.get(self.iface1, 'alias'), 'w0')
+        self.assertEquals(self.ec.get(self.iface1, 'name'), 'wlan0')
         self.assertEquals(self.ec.get(self.iface1, 'mode'), 'adhoc')
-        self.assertEquals(self.ec.get(self.iface1, 'type'), 'g')
+        self.assertEquals(self.ec.get(self.iface1, 'hw_mode'), 'g')
         self.assertEquals(self.ec.get(self.iface1, 'essid'), 'vlcexp')
-        self.assertEquals(self.ec.get(self.iface1, 'ip'), '10.0.0.17')
+        self.assertEquals(self.ec.get(self.iface1, 'ip'), '10.0.0.17/24')
+        self.assertEquals(self.ec.get(self.iface1, 'version'), '6')
 
     def test_creation_and_configuration_channel(self):
         self.assertEquals(self.ec.get(self.channel, 'channel'), '6')
-        self.assertEquals(self.ec.get(self.channel, 'xmppSlice'), 'nepi')
-        self.assertEquals(self.ec.get(self.channel, 'xmppHost'), 'xmpp-plexus.onelab.eu')
+        self.assertEquals(self.ec.get(self.channel, 'xmppUser'), 'nepi')
+        self.assertEquals(self.ec.get(self.channel, 'xmppServer'), 'xmpp-plexus.onelab.eu')
         self.assertEquals(self.ec.get(self.channel, 'xmppPort'), '5222')
         self.assertEquals(self.ec.get(self.channel, 'xmppPassword'), '1234')
+        self.assertEquals(self.ec.get(self.channel, 'version'), '6')
+
 
     def test_creation_and_configuration_application(self):
         self.assertEquals(self.ec.get(self.app1, 'appid'), 'Vlc#1')
-        self.assertEquals(self.ec.get(self.app1, 'path'), '/opt/vlc-1.1.13/cvlc')
-        self.assertEquals(self.ec.get(self.app1, 'args'), "/opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
+        self.assertEquals(self.ec.get(self.app1, 'command'), "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
         self.assertEquals(self.ec.get(self.app1, 'env'), 'DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority')
+        self.assertEquals(self.ec.get(self.app1, 'version'), '6')
 
     def test_connection(self):
         self.assertEquals(len(self.ec.get_resource(self.node1).connections), 6)
@@ -150,54 +156,49 @@ class OMFVLCNormalCase(unittest.TestCase):
         ec = ExperimentController(exp_id = "5421" )
 
         self.node1 = ec.register_resource("OMFNode")
-        ec.set(self.node1, 'hostname', 'omf.plexus.wlab17')
-        ec.set(self.node1, 'xmppSlice', "nepi")
-        ec.set(self.node1, 'xmppHost', "xmpp-plexus.onelab.eu")
+        ec.set(self.node1, 'hostname', 'wlab12')
+        ec.set(self.node1, 'xmppUser', "nepi")
+        ec.set(self.node1, 'xmppServer', "xmpp-plexus.onelab.eu")
         ec.set(self.node1, 'xmppPort', "5222")
         ec.set(self.node1, 'xmppPassword', "1234")
         
         self.iface1 = ec.register_resource("OMFWifiInterface")
-        ec.set(self.iface1, 'alias', "w0")
+        ec.set(self.iface1, 'name', "wlan0")
         ec.set(self.iface1, 'mode', "adhoc")
-        ec.set(self.iface1, 'type', "g")
+        ec.set(self.iface1, 'hw_mode', "g")
         ec.set(self.iface1, 'essid', "vlcexp")
-        ec.set(self.iface1, 'ip', "10.0.0.17")
+        ec.set(self.iface1, 'ip', "10.0.0.17/24")
         
         self.channel = ec.register_resource("OMFChannel")
         ec.set(self.channel, 'channel', "6")
-        ec.set(self.channel, 'xmppSlice', "nepi")
-        ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu")
+        ec.set(self.channel, 'xmppUser', "nepi")
+        ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu")
         ec.set(self.channel, 'xmppPort', "5222")
         ec.set(self.channel, 'xmppPassword', "1234")
         
         self.app1 = ec.register_resource("OMFApplication")
         ec.set(self.app1, 'appid', 'Vlc#1')
-        ec.set(self.app1, 'path', "/opt/vlc-1.1.13/cvlc")
-        ec.set(self.app1, 'args', "/opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
+        ec.set(self.app1, 'command', "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
         ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
 
         self.app2 = ec.register_resource("OMFApplication")
         ec.set(self.app2, 'appid', 'Test#1')
-        ec.set(self.app2, 'path', "/usr/bin/test")
-        ec.set(self.app2, 'args', "-1")
+        ec.set(self.app2, 'command', "/usr/bin/test -1")
         ec.set(self.app2, 'env', " ")
 
         self.app3 = ec.register_resource("OMFApplication")
         ec.set(self.app3, 'appid', 'Test#2')
-        ec.set(self.app3, 'path', "/usr/bin/test")
-        ec.set(self.app3, 'args', "-2")
+        ec.set(self.app3, 'command', "/usr/bin/test -2")
         ec.set(self.app3, 'env', " ")
 
         self.app4 = ec.register_resource("OMFApplication")
         ec.set(self.app4, 'appid', 'Test#3')
-        ec.set(self.app4, 'path', "/usr/bin/test")
-        ec.set(self.app4, 'args', "-3")
+        ec.set(self.app4, 'command', "/usr/bin/test -3")
         ec.set(self.app4, 'env', " ")
 
         self.app5 = ec.register_resource("OMFApplication")
         ec.set(self.app5, 'appid', 'Kill#2')
-        ec.set(self.app5, 'path', "/usr/bin/killall")
-        ec.set(self.app5, 'args', "vlc")
+        ec.set(self.app5, 'command', "/usr/bin/killall vlc")
         ec.set(self.app5, 'env', " ")
 
         ec.register_connection(self.app1, self.node1)
nepi