X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fomf6_vlc_wrong_non_critical.py;h=77f44411b70fea85c58f62fd24d6335c85033cc4;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=ef1d5c843064517dabaebc4e6197ffbe79e19a25;hpb=6096716dbc88a1d9e6a1be8cac477006225d890e;p=nepi.git diff --git a/test/resources/omf/omf6_vlc_wrong_non_critical.py b/test/resources/omf/omf6_vlc_wrong_non_critical.py index ef1d5c84..77f44411 100755 --- a/test/resources/omf/omf6_vlc_wrong_non_critical.py +++ b/test/resources/omf/omf6_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 @@ -19,7 +18,8 @@ # Author: Julien Tribino -from nepi.execution.resource import ResourceFactory, ResourceManager, ResourceAction, ResourceState +from nepi.execution.resource import ResourceFactory, ResourceManager, \ + ResourceAction, ResourceState from nepi.execution.ec import ExperimentController from nepi.resources.omf.node import OMFNode @@ -41,21 +41,21 @@ 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', '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.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, 'essid', "vlcexp") self.ec.set(self.iface1, 'ip', "10.0.0.12/24") - 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") @@ -64,17 +64,17 @@ 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.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") self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, 'channel', "6") self.ec.register_connection(self.iface1, self.channel) @@ -87,23 +87,23 @@ 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.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") @@ -111,7 +111,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, 'channel', "6") self.ec.register_connection(self.iface1, self.channel) @@ -124,24 +124,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_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', 'wlab49') - 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") @@ -149,7 +149,7 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - 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) @@ -163,37 +163,37 @@ 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_app_nc(self): - self.node2 = self.ec.register_resource("OMFNode") + self.node2 = self.ec.register_resource("omf::Node") self.ec.set(self.node2, 'hostname', 'wlab49') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.node2, 'xmppPort', "5222") self.ec.set(self.node2, 'xmppPassword', "1234") - 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") self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, 'channel', "6") - 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') @@ -209,32 +209,32 @@ 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', 'wlab49') - self.iface2 = self.ec.register_resource("OMFWifiInterface") + self.iface2 = self.ec.register_resource("omf::WifiInterface") self.ec.set(self.iface2, "critical", False) - 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.app2 = self.ec.register_resource("OMFApplication") + self.app2 = self.ec.register_resource("omf::Application") self.ec.set(self.app2, 'appid', 'Kill#22') self.ec.register_connection(self.iface1, self.channel) @@ -249,17 +249,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): @@ -270,21 +270,21 @@ 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', '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.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, 'essid', "vlcexp") self.ec.set(self.iface1, 'ip', "10.0.0.12/24") - 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") @@ -293,28 +293,28 @@ 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', 'wlab49') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.node2, 'xmppPort', "5222") self.ec.set(self.node2, 'xmppPassword', "1234") - 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") self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, 'channel', "6") - 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.app3 = self.ec.register_resource("OMFApplication") + self.app3 = self.ec.register_resource("omf::Application") self.ec.set(self.app3, 'appid', 'Kill#33') self.ec.register_connection(self.iface1, self.channel) @@ -331,43 +331,43 @@ 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', 'wlab49') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.node2, 'xmppPort', "5222") self.ec.set(self.node2, 'xmppPassword', "1234") - 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") self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, 'channel', "6") - 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.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 -3") self.ec.set(self.app3, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") @@ -386,59 +386,59 @@ 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.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', 'wlab49') self.ec.set(self.node2, 'xmppUser', "nepi") self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.node2, 'xmppPort', "5222") self.ec.set(self.node2, 'xmppPassword', "1234") - 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") self.ec.set(self.iface2, 'essid', "vlcexp") self.ec.set(self.iface2, 'ip', "10.0.0.49/24") - self.channel = self.ec.register_resource("OMFChannel") + self.channel = self.ec.register_resource("omf::Channel") self.ec.set(self.channel, 'channel', "6") - 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.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 -3") self.ec.set(self.app3, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") - 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 -4") self.ec.set(self.app4, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") - 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.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 -6") self.ec.set(self.app6, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") @@ -463,25 +463,25 @@ 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.app4).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.app4).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__':