# 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 as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# 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
class OMFResourceFactoryTestCase(unittest.TestCase):
def test_creation_phase(self):
- self.assertEquals(OMFNode.get_rtype(), "OMFNode")
- self.assertEquals(len(OMFNode._attributes), 7)
+ self.assertEqual(OMFNode.get_rtype(), "omf::Node")
+ self.assertEqual(len(OMFNode._attributes), 8)
- self.assertEquals(OMFWifiInterface.get_rtype(), "OMFWifiInterface")
- self.assertEquals(len(OMFWifiInterface._attributes), 11)
+ self.assertEqual(OMFWifiInterface.get_rtype(), "omf::WifiInterface")
+ self.assertEqual(len(OMFWifiInterface._attributes), 12)
- self.assertEquals(OMFChannel.get_rtype(), "OMFChannel")
- self.assertEquals(len(OMFChannel._attributes), 7)
+ self.assertEqual(OMFChannel.get_rtype(), "omf::Channel")
+ self.assertEqual(len(OMFChannel._attributes), 8)
- self.assertEquals(OMFApplication.get_rtype(), "OMFApplication")
- self.assertEquals(len(OMFApplication._attributes), 13)
+ self.assertEqual(OMFApplication.get_rtype(), "omf::Application")
+ self.assertEqual(len(OMFApplication._attributes), 14)
class OMFEachTestCase(unittest.TestCase):
def setUp(self):
self.ec = ExperimentController(exp_id = "99999")
- self.node1 = self.ec.register_resource("OMFNode")
+ self.node1 = self.ec.register_resource("omf::Node")
self.ec.set(self.node1, 'hostname', 'omf.plexus.wlab17')
self.ec.set(self.node1, 'xmppUser', "nepi")
self.ec.set(self.node1, 'xmppServer', "xmpp-plexus.onelab.eu")
self.ec.set(self.node1, 'xmppPassword', "1234")
self.ec.set(self.node1, 'version', "5")
- self.iface1 = self.ec.register_resource("OMFWifiInterface")
+ self.iface1 = self.ec.register_resource("omf::WifiInterface")
self.ec.set(self.iface1, 'name', "wlan0")
self.ec.set(self.iface1, 'mode', "adhoc")
self.ec.set(self.iface1, 'hw_mode', "g")
self.ec.set(self.iface1, 'ip', "10.0.0.17/24")
self.ec.set(self.iface1, 'version', "5")
- self.channel = self.ec.register_resource("OMFChannel")
+ self.channel = self.ec.register_resource("omf::Channel")
self.ec.set(self.channel, 'channel', "6")
self.ec.set(self.channel, 'xmppUser', "nepi")
self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu")
self.ec.set(self.channel, 'xmppPassword', "1234")
self.ec.set(self.channel, 'version', "5")
- self.app1 = self.ec.register_resource("OMFApplication")
+ self.app1 = self.ec.register_resource("omf::Application")
self.ec.set(self.app1, 'appid', 'Vlc#1')
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.ec.set(self.app1, 'version', "5")
- self.app2 = self.ec.register_resource("OMFApplication")
+ self.app2 = self.ec.register_resource("omf::Application")
self.ec.set(self.app2, 'version', "5")
- self.app3 = self.ec.register_resource("OMFApplication")
+ self.app3 = self.ec.register_resource("omf::Application")
self.ec.set(self.app3, 'version', "5")
- self.app4 = self.ec.register_resource("OMFApplication")
+ self.app4 = self.ec.register_resource("omf::Application")
self.ec.set(self.app4, 'version', "5")
- self.app5 = self.ec.register_resource("OMFApplication")
+ self.app5 = self.ec.register_resource("omf::Application")
self.ec.set(self.app5, 'version', "5")
self.ec.register_connection(self.app1, self.node1)
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, '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'), '5')
+ self.assertEqual(self.ec.get(self.node1, 'hostname'), 'omf.plexus.wlab17')
+ self.assertEqual(self.ec.get(self.node1, 'xmppUser'), 'nepi')
+ self.assertEqual(self.ec.get(self.node1, 'xmppServer'), 'xmpp-plexus.onelab.eu')
+ self.assertEqual(self.ec.get(self.node1, 'xmppPort'), '5222')
+ self.assertEqual(self.ec.get(self.node1, 'xmppPassword'), '1234')
+ self.assertEqual(self.ec.get(self.node1, 'version'), '5')
def test_creation_and_configuration_interface(self):
- 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, 'hw_mode'), 'g')
- self.assertEquals(self.ec.get(self.iface1, 'essid'), 'vlcexp')
- self.assertEquals(self.ec.get(self.iface1, 'ip'), '10.0.0.17/24')
- self.assertEquals(self.ec.get(self.iface1, 'version'), '5')
+ self.assertEqual(self.ec.get(self.iface1, 'name'), 'wlan0')
+ self.assertEqual(self.ec.get(self.iface1, 'mode'), 'adhoc')
+ self.assertEqual(self.ec.get(self.iface1, 'hw_mode'), 'g')
+ self.assertEqual(self.ec.get(self.iface1, 'essid'), 'vlcexp')
+ self.assertEqual(self.ec.get(self.iface1, 'ip'), '10.0.0.17/24')
+ self.assertEqual(self.ec.get(self.iface1, 'version'), '5')
def test_creation_and_configuration_channel(self):
- self.assertEquals(self.ec.get(self.channel, 'channel'), '6')
- 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'), '5')
+ self.assertEqual(self.ec.get(self.channel, 'channel'), '6')
+ self.assertEqual(self.ec.get(self.channel, 'xmppUser'), 'nepi')
+ self.assertEqual(self.ec.get(self.channel, 'xmppServer'), 'xmpp-plexus.onelab.eu')
+ self.assertEqual(self.ec.get(self.channel, 'xmppPort'), '5222')
+ self.assertEqual(self.ec.get(self.channel, 'xmppPassword'), '1234')
+ self.assertEqual(self.ec.get(self.channel, 'version'), '5')
def test_creation_and_configuration_application(self):
- self.assertEquals(self.ec.get(self.app1, 'appid'), 'Vlc#1')
- 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'), '5')
+ self.assertEqual(self.ec.get(self.app1, 'appid'), 'Vlc#1')
+ self.assertEqual(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.assertEqual(self.ec.get(self.app1, 'env'), 'DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority')
+ self.assertEqual(self.ec.get(self.app1, 'version'), '5')
def test_connection(self):
- self.assertEquals(len(self.ec.get_resource(self.node1).connections), 6)
- self.assertEquals(len(self.ec.get_resource(self.iface1).connections), 2)
- self.assertEquals(len(self.ec.get_resource(self.channel).connections), 1)
- self.assertEquals(len(self.ec.get_resource(self.app1).connections), 1)
- self.assertEquals(len(self.ec.get_resource(self.app2).connections), 1)
+ self.assertEqual(len(self.ec.get_resource(self.node1).connections), 6)
+ self.assertEqual(len(self.ec.get_resource(self.iface1).connections), 2)
+ self.assertEqual(len(self.ec.get_resource(self.channel).connections), 1)
+ self.assertEqual(len(self.ec.get_resource(self.app1).connections), 1)
+ self.assertEqual(len(self.ec.get_resource(self.app2).connections), 1)
def test_condition(self):
- self.assertEquals(len(self.ec.get_resource(self.app1).conditions[ResourceAction.STOP]), 1)
- self.assertEquals(len(self.ec.get_resource(self.app2).conditions[ResourceAction.START]), 1)
- self.assertEquals(len(self.ec.get_resource(self.app3).conditions[ResourceAction.START]), 1)
- self.assertEquals(len(self.ec.get_resource(self.app4).conditions[ResourceAction.STOP]), 1)
- self.assertEquals(len(self.ec.get_resource(self.app5).conditions[ResourceAction.START]), 2)
+ self.assertEqual(len(self.ec.get_resource(self.app1).conditions[ResourceAction.STOP]), 1)
+ self.assertEqual(len(self.ec.get_resource(self.app2).conditions[ResourceAction.START]), 1)
+ self.assertEqual(len(self.ec.get_resource(self.app3).conditions[ResourceAction.START]), 1)
+ self.assertEqual(len(self.ec.get_resource(self.app4).conditions[ResourceAction.STOP]), 1)
+ self.assertEqual(len(self.ec.get_resource(self.app5).conditions[ResourceAction.START]), 2)
class OMFVLCNormalCase(unittest.TestCase):
def test_deploy(self):
ec = ExperimentController(exp_id = "5421" )
- self.node1 = ec.register_resource("OMFNode")
+ self.node1 = ec.register_resource("omf::Node")
ec.set(self.node1, 'hostname', 'omf.plexus.wlab17')
ec.set(self.node1, 'xmppUser', "nepi")
ec.set(self.node1, 'xmppServer', "xmpp-plexus.onelab.eu")
ec.set(self.node1, 'xmppPassword', "1234")
ec.set(self.node1, 'version', "5")
- self.iface1 = ec.register_resource("OMFWifiInterface")
+ self.iface1 = ec.register_resource("omf::WifiInterface")
ec.set(self.iface1, 'name', "wlan0")
ec.set(self.iface1, 'mode', "adhoc")
ec.set(self.iface1, 'hw_mode', "g")
ec.set(self.iface1, 'ip', "10.0.0.17/24")
ec.set(self.iface1, 'version', "5")
- self.channel = ec.register_resource("OMFChannel")
+ self.channel = ec.register_resource("omf::Channel")
ec.set(self.channel, 'channel', "6")
ec.set(self.channel, 'xmppUser', "nepi")
ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu")
ec.set(self.channel, 'xmppPassword', "1234")
ec.set(self.channel, 'version', "5")
- self.app1 = ec.register_resource("OMFApplication")
+ self.app1 = ec.register_resource("omf::Application")
ec.set(self.app1, 'appid', 'Vlc#1')
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")
ec.set(self.app1, 'version', "5")
- self.app2 = ec.register_resource("OMFApplication")
+ self.app2 = ec.register_resource("omf::Application")
ec.set(self.app2, 'appid', 'Test#1')
ec.set(self.app2, 'command', "/usr/bin/test -1")
ec.set(self.app2, 'env', " ")
ec.set(self.app2, 'version', "5")
- self.app3 = ec.register_resource("OMFApplication")
+ self.app3 = ec.register_resource("omf::Application")
ec.set(self.app3, 'appid', 'Test#2')
ec.set(self.app3, 'command', "/usr/bin/test -2")
ec.set(self.app3, 'env', " ")
ec.set(self.app3, 'version', "5")
- self.app4 = ec.register_resource("OMFApplication")
+ self.app4 = ec.register_resource("omf::Application")
ec.set(self.app4, 'appid', 'Test#3')
ec.set(self.app4, 'command', "/usr/bin/test -3")
ec.set(self.app4, 'env', " ")
ec.set(self.app4, 'version', "5")
- self.app5 = ec.register_resource("OMFApplication")
+ self.app5 = ec.register_resource("omf::Application")
ec.set(self.app5, 'appid', 'Kill#2')
ec.set(self.app5, 'command', "/usr/bin/killall vlc")
ec.set(self.app5, 'env', " ")
ec.wait_finished([self.app1, self.app2, self.app3,self.app4, self.app5])
- self.assertEquals(round(tdiffsec(ec.get_resource(self.app2).start_time, ec.get_resource(self.app1).start_time),0), 3.0)
- self.assertEquals(round(tdiffsec(ec.get_resource(self.app3).start_time, ec.get_resource(self.app2).start_time),0), 2.0)
- self.assertEquals(round(tdiffsec(ec.get_resource(self.app4).start_time, ec.get_resource(self.app3).start_time),0), 3.0)
- self.assertEquals(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app3).start_time),0), 20.0)
- self.assertEquals(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app1).start_time),0), 25.0)
-
- self.assertEquals(ec.get_resource(self.node1).state, ResourceState.STARTED)
- self.assertEquals(ec.get_resource(self.iface1).state, ResourceState.STARTED)
- self.assertEquals(ec.get_resource(self.channel).state, ResourceState.STARTED)
- self.assertEquals(ec.get_resource(self.app1).state, ResourceState.STOPPED)
- self.assertEquals(ec.get_resource(self.app2).state, ResourceState.STOPPED)
- self.assertEquals(ec.get_resource(self.app3).state, ResourceState.STOPPED)
- self.assertEquals(ec.get_resource(self.app4).state, ResourceState.STOPPED)
- self.assertEquals(ec.get_resource(self.app5).state, ResourceState.STOPPED)
+ self.assertEqual(round(tdiffsec(ec.get_resource(self.app2).start_time, ec.get_resource(self.app1).start_time),0), 3.0)
+ self.assertEqual(round(tdiffsec(ec.get_resource(self.app3).start_time, ec.get_resource(self.app2).start_time),0), 2.0)
+ self.assertEqual(round(tdiffsec(ec.get_resource(self.app4).start_time, ec.get_resource(self.app3).start_time),0), 3.0)
+ self.assertEqual(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app3).start_time),0), 20.0)
+ self.assertEqual(round(tdiffsec(ec.get_resource(self.app5).start_time, ec.get_resource(self.app1).start_time),0), 25.0)
+
+ self.assertEqual(ec.get_resource(self.node1).state, ResourceState.STARTED)
+ self.assertEqual(ec.get_resource(self.iface1).state, ResourceState.STARTED)
+ self.assertEqual(ec.get_resource(self.channel).state, ResourceState.STARTED)
+ self.assertEqual(ec.get_resource(self.app1).state, ResourceState.STOPPED)
+ self.assertEqual(ec.get_resource(self.app2).state, ResourceState.STOPPED)
+ self.assertEqual(ec.get_resource(self.app3).state, ResourceState.STOPPED)
+ self.assertEqual(ec.get_resource(self.app4).state, ResourceState.STOPPED)
+ self.assertEqual(ec.get_resource(self.app5).state, ResourceState.STOPPED)
ec.shutdown()
- self.assertEquals(ec.get_resource(self.node1).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.iface1).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.channel).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.app1).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.app2).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.app3).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.app4).state, ResourceState.RELEASED)
- self.assertEquals(ec.get_resource(self.app5).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.node1).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.channel).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.app1).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.app2).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.app3).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.app4).state, ResourceState.RELEASED)
+ self.assertEqual(ec.get_resource(self.app5).state, ResourceState.RELEASED)
if __name__ == '__main__':
git://git.onelab.eu / nepi.git / blobdiff