replacing assertEquals into assertEqual
[nepi.git] / test / resources / omf / omf5_vlc_wrong_critical.py
index 96230b4..17960b6 100755 (executable)
@@ -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 OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.ec = ExperimentController(exp_id = str(OMFVLCWrongCaseAllCritical.id))
         OMFVLCWrongCaseAllCritical.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 OMFVLCWrongCaseAllCritical(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 OMFVLCWrongCaseAllCritical(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', '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")
@@ -67,10 +66,10 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.ec.register_connection(self.node1, self.iface1)
 
     def test_deploy_wo_node(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         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")
@@ -78,7 +77,7 @@ class OMFVLCWrongCaseAllCritical(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")
@@ -96,27 +95,27 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.node2).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_wo_hostname(self):
 
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         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.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")
@@ -124,7 +123,7 @@ class OMFVLCWrongCaseAllCritical(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")
@@ -142,19 +141,19 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.node2).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_wo_iface(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
@@ -162,10 +161,10 @@ class OMFVLCWrongCaseAllCritical(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, '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")
@@ -183,19 +182,19 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.iface2).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_wo_ip(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
@@ -203,14 +202,14 @@ class OMFVLCWrongCaseAllCritical(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")
         self.ec.set(self.iface2, 'essid', "vlcexp")
         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")
@@ -228,19 +227,19 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.iface2).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_wo_channel(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
@@ -248,14 +247,14 @@ class OMFVLCWrongCaseAllCritical(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")
         self.ec.set(self.iface2, 'essid', "vlcexp")
         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, 'version', "5")
 
         self.ec.register_connection(self.iface1, self.channel)
@@ -268,19 +267,19 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.channel).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_wo_app(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
@@ -288,7 +287,7 @@ class OMFVLCWrongCaseAllCritical(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")
@@ -296,7 +295,7 @@ class OMFVLCWrongCaseAllCritical(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")
@@ -304,7 +303,7 @@ class OMFVLCWrongCaseAllCritical(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, 'version', "5")
 
         self.ec.register_connection(self.iface1, self.channel)
@@ -319,20 +318,20 @@ class OMFVLCWrongCaseAllCritical(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)
 
     def test_deploy_wo_app_path(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
@@ -340,7 +339,7 @@ class OMFVLCWrongCaseAllCritical(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")
@@ -348,7 +347,7 @@ class OMFVLCWrongCaseAllCritical(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")
@@ -356,7 +355,7 @@ class OMFVLCWrongCaseAllCritical(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, 'appid', 'Vlc#2')
         self.ec.set(self.app2, 'version', "5")
 
@@ -372,17 +371,17 @@ class OMFVLCWrongCaseAllCritical(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)
 
 
 if __name__ == '__main__':