X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fomf5_vlc_wrong_non_critical.py;h=34209b25b2e871dae8970b8008d3039717952bd4;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=d693685a139718189f9ff15a66d6f4213c6bda62;hpb=f025a30a215310a9803067a25e244137b71f56f2;p=nepi.git diff --git a/test/resources/omf/omf5_vlc_wrong_non_critical.py b/test/resources/omf/omf5_vlc_wrong_non_critical.py index d693685a..34209b25 100755 --- a/test/resources/omf/omf5_vlc_wrong_non_critical.py +++ b/test/resources/omf/omf5_vlc_wrong_non_critical.py @@ -4,9 +4,8 @@ # 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 @@ -41,7 +40,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec = ExperimentController(exp_id = str(OMFVLCWrongCaseWithNonCritical.id)) OMFVLCWrongCaseWithNonCritical.id += 1 - 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") @@ -49,7 +48,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): 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") @@ -57,7 +56,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface1, 'ip', "10.0.0.17/24") self.ec.set(self.iface1, 'version', "5") - self.app1 = self.ec.register_resource("OMFApplication") + self.app1 = self.ec.register_resource("omf::Application") self.ec.set(self.app1, 'appid', 'Kill#1') self.ec.set(self.app1, 'command', "/usr/bin/test -1") self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") @@ -67,11 +66,11 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.register_connection(self.node1, self.iface1) def test_deploy_with_node_nc(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, "critical", False) self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") self.ec.set(self.iface2, 'hw_mode', "g") @@ -79,7 +78,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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") @@ -97,24 +96,24 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.wait_finished([self.app1]) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.FAILED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) def test_deploy_with_node_and_iface_nc(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, "critical", False) self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.node2, "critical", False) self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") @@ -123,7 +122,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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") @@ -141,25 +140,25 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.wait_finished([self.app1]) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.FAILED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) def test_deploy_with_node_iface_channel_nc(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, "critical", False) self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.node2, "critical", False) self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") @@ -168,7 +167,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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, "critical", False) self.ec.set(self.channel, 'version', "5") @@ -183,21 +182,21 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.wait_finished([self.app1]) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.FAILED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) def test_deploy_with_app_nc(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") @@ -205,7 +204,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.node2, 'xmppPassword', "1234") self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") self.ec.set(self.iface2, 'hw_mode', "g") @@ -213,7 +212,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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") @@ -221,7 +220,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.channel, 'xmppPassword', "1234") self.ec.set(self.channel, 'version', "5") - self.app2 = self.ec.register_resource("OMFApplication") + self.app2 = self.ec.register_resource("omf::Application") self.ec.set(self.app2, "critical", False) self.ec.set(self.app2, 'appid', 'Kill#22') self.ec.set(self.app2, 'version', "5") @@ -238,35 +237,35 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2]) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.STOPPED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) def test_deploy_with_all_nc_and_app_critical(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, "critical", False) self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, "critical", False) self.ec.set(self.iface2, 'version', "5") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, "critical", False) self.ec.set(self.channel, 'channel', "6") self.ec.set(self.channel, 'version', "5") - self.app2 = self.ec.register_resource("OMFApplication") + self.app2 = self.ec.register_resource("omf::Application") self.ec.set(self.app2, 'appid', 'Kill#22') self.ec.set(self.app2, 'version', "5") @@ -282,17 +281,17 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2]) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): @@ -303,7 +302,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec = ExperimentController(exp_id = str(OMFVLCWrongCaseWithNonCriticalDep.id)) OMFVLCWrongCaseWithNonCriticalDep.id += 1 - 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") @@ -311,7 +310,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): 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") @@ -319,7 +318,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.iface1, 'ip', "10.0.0.17/24") self.ec.set(self.iface1, 'version', "5") - self.app1 = self.ec.register_resource("OMFApplication") + self.app1 = self.ec.register_resource("omf::Application") self.ec.set(self.app1, 'appid', 'Kill#1') self.ec.set(self.app1, 'command', "/usr/bin/test -1") self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") @@ -329,7 +328,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.register_connection(self.node1, self.iface1) def test_deploy_with_app_nc_and_critical_wrong(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") @@ -337,7 +336,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.node2, 'xmppPassword', "1234") self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") self.ec.set(self.iface2, 'hw_mode', "g") @@ -345,7 +344,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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") @@ -353,12 +352,12 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.channel, 'xmppPassword', "1234") self.ec.set(self.channel, 'version', "5") - self.app2 = self.ec.register_resource("OMFApplication") + self.app2 = self.ec.register_resource("omf::Application") self.ec.set(self.app2, "critical", False) self.ec.set(self.app2, 'appid', 'Kill#32') 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, 'appid', 'Kill#33') self.ec.set(self.app3, 'version', "5") @@ -376,22 +375,22 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2, self.app3]) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.FAILED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.RELEASED) def test_deploy_with_app_nc_and_critical_right(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") @@ -399,7 +398,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.node2, 'xmppPassword', "1234") self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") self.ec.set(self.iface2, 'hw_mode', "g") @@ -407,7 +406,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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") @@ -415,12 +414,12 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.channel, 'xmppPassword', "1234") self.ec.set(self.channel, 'version', "5") - self.app2 = self.ec.register_resource("OMFApplication") + self.app2 = self.ec.register_resource("omf::Application") self.ec.set(self.app2, "critical", False) self.ec.set(self.app2, 'appid', 'Kill#32') 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, 'appid', 'Kill#3') self.ec.set(self.app3, 'command', "/usr/bin/test -1") self.ec.set(self.app3, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") @@ -440,24 +439,24 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2, self.app3]) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.STOPPED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.RELEASED) def test_deploy_with_many_app_nc_and_critical(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") @@ -465,7 +464,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.node2, 'xmppPassword', "1234") self.ec.set(self.node2, 'version', "5") - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") self.ec.set(self.iface2, 'hw_mode', "g") @@ -473,7 +472,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.iface2, 'ip', "10.0.0.37/24") self.ec.set(self.iface2, '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") @@ -481,30 +480,30 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.set(self.channel, 'xmppPassword', "1234") self.ec.set(self.channel, 'version', "5") - self.app2 = self.ec.register_resource("OMFApplication") + self.app2 = self.ec.register_resource("omf::Application") self.ec.set(self.app2, "critical", False) self.ec.set(self.app2, 'appid', 'Kill#32') 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, "critical", False) self.ec.set(self.app3, 'appid', 'Kill#3') self.ec.set(self.app3, 'command', "/usr/bin/test -1") self.ec.set(self.app3, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") 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, 'appid', 'Kill#4') self.ec.set(self.app4, 'command', "/usr/bin/test -1") self.ec.set(self.app4, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") 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, "critical", False) self.ec.set(self.app5, 'appid', 'Kill#32') self.ec.set(self.app5, 'version', "5") - self.app6 = self.ec.register_resource("OMFApplication") + self.app6 = self.ec.register_resource("omf::Application") self.ec.set(self.app6, 'appid', 'Kill#6') self.ec.set(self.app6, 'command', "/usr/bin/test -1") self.ec.set(self.app6, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") @@ -530,26 +529,26 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.ec.wait_finished([self.app1, self.app2, self.app3, self.app4, self.app5, self.app6]) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) - self.assertEquals(self.ec.get_resource(self.app5).state, ResourceState.FAILED) - self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED) + self.assertEqual(self.ec.get_resource(self.app5).state, ResourceState.FAILED) + self.assertEqual(self.ec.get_resource(self.app6).state, ResourceState.STOPPED) self.ec.shutdown() - self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app4).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app5).state, ResourceState.RELEASED) - self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app4).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app5).state, ResourceState.RELEASED) + self.assertEqual(self.ec.get_resource(self.app6).state, ResourceState.RELEASED) if __name__ == '__main__':