X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=test%2Fresources%2Fomf%2Fomf5_vlc_wrong_non_critical.py;fp=test%2Fresources%2Fomf%2Fvlc_wrong_non_critical.py;h=d693685a139718189f9ff15a66d6f4213c6bda62;hb=f025a30a215310a9803067a25e244137b71f56f2;hp=429326439dbff56963f287f70d17d7c9391b145f;hpb=e55b2f40b75bd704ca0f2ad03e78511fbca0791e;p=nepi.git diff --git a/test/resources/omf/vlc_wrong_non_critical.py b/test/resources/omf/omf5_vlc_wrong_non_critical.py similarity index 81% rename from test/resources/omf/vlc_wrong_non_critical.py rename to test/resources/omf/omf5_vlc_wrong_non_critical.py index 42932643..d693685a 100755 --- a/test/resources/omf/vlc_wrong_non_critical.py +++ b/test/resources/omf/omf5_vlc_wrong_non_critical.py @@ -26,7 +26,7 @@ from nepi.resources.omf.node import OMFNode from nepi.resources.omf.application import OMFApplication from nepi.resources.omf.interface import OMFWifiInterface from nepi.resources.omf.channel import OMFChannel -from nepi.resources.omf.omf_api import OMFAPIFactory +from nepi.resources.omf.omf_api_factory import OMFAPIFactory from nepi.util.timefuncs import * @@ -43,23 +43,25 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.node1 = self.ec.register_resource("OMFNode") self.ec.set(self.node1, 'hostname', 'omf.plexus.wlab17') - self.ec.set(self.node1, 'xmppSlice', "nepi") - self.ec.set(self.node1, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.node1, '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.ec.set(self.node1, 'version', "5") self.iface1 = self.ec.register_resource("OMFWifiInterface") - self.ec.set(self.iface1, 'alias', "w0") + self.ec.set(self.iface1, 'name', "wlan0") self.ec.set(self.iface1, 'mode', "adhoc") - self.ec.set(self.iface1, 'type', "g") + self.ec.set(self.iface1, 'hw_mode', "g") self.ec.set(self.iface1, 'essid', "vlcexp") - self.ec.set(self.iface1, 'ip', "10.0.0.17") + self.ec.set(self.iface1, 'ip', "10.0.0.17/24") + self.ec.set(self.iface1, 'version', "5") self.app1 = self.ec.register_resource("OMFApplication") self.ec.set(self.app1, 'appid', 'Kill#1') - self.ec.set(self.app1, 'path', "/usr/bin/test") - self.ec.set(self.app1, 'args', "-1") + self.ec.set(self.app1, 'command', "/usr/bin/test -1") self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") + self.ec.set(self.app1, 'version', "5") self.ec.register_connection(self.app1, self.node1) self.ec.register_connection(self.node1, self.iface1) @@ -67,20 +69,23 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): def test_deploy_with_node_nc(self): self.node2 = self.ec.register_resource("OMFNode") self.ec.set(self.node2, "critical", False) + self.ec.set(self.node2, 'version', "5") self.iface2 = self.ec.register_resource("OMFWifiInterface") - self.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") - self.ec.set(self.channel, 'xmppSlice', "nepi") - self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.channel, 'xmppUser', "nepi") + self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.channel, 'xmppPort', "5222") self.ec.set(self.channel, 'xmppPassword', "1234") + self.ec.set(self.channel, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -107,21 +112,24 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): def test_deploy_with_node_and_iface_nc(self): self.node2 = self.ec.register_resource("OMFNode") self.ec.set(self.node2, "critical", False) + self.ec.set(self.node2, 'version', "5") self.iface2 = self.ec.register_resource("OMFWifiInterface") self.ec.set(self.node2, "critical", False) - self.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") - self.ec.set(self.channel, 'xmppSlice', "nepi") - self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.channel, 'xmppUser', "nepi") + self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.channel, 'xmppPort', "5222") self.ec.set(self.channel, 'xmppPassword', "1234") + self.ec.set(self.channel, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -149,18 +157,21 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.node2 = self.ec.register_resource("OMFNode") 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.ec.set(self.node2, "critical", False) - self.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") self.ec.set(self.channel, "critical", False) + self.ec.set(self.channel, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -188,28 +199,32 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): def test_deploy_with_app_nc(self): self.node2 = self.ec.register_resource("OMFNode") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') - self.ec.set(self.node2, 'xmppSlice', "nepi") - self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu") + 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.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") - self.ec.set(self.channel, 'xmppSlice', "nepi") - self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.channel, 'xmppUser', "nepi") + self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.channel, 'xmppPort', "5222") self.ec.set(self.channel, 'xmppPassword', "1234") + self.ec.set(self.channel, 'version', "5") self.app2 = self.ec.register_resource("OMFApplication") self.ec.set(self.app2, "critical", False) self.ec.set(self.app2, 'appid', 'Kill#22') + self.ec.set(self.app2, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -240,16 +255,20 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase): self.node2 = self.ec.register_resource("OMFNode") 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.ec.set(self.iface2, "critical", False) + self.ec.set(self.iface2, 'version', "5") self.channel = self.ec.register_resource("OMFChannel") 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.ec.set(self.app2, 'appid', 'Kill#22') + self.ec.set(self.app2, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -286,23 +305,25 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): self.node1 = self.ec.register_resource("OMFNode") self.ec.set(self.node1, 'hostname', 'omf.plexus.wlab17') - self.ec.set(self.node1, 'xmppSlice', "nepi") - self.ec.set(self.node1, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.node1, '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.ec.set(self.node1, 'version', "5") self.iface1 = self.ec.register_resource("OMFWifiInterface") - self.ec.set(self.iface1, 'alias', "w0") + self.ec.set(self.iface1, 'name', "wlan0") self.ec.set(self.iface1, 'mode', "adhoc") - self.ec.set(self.iface1, 'type', "g") + self.ec.set(self.iface1, 'hw_mode', "g") self.ec.set(self.iface1, 'essid', "vlcexp") - self.ec.set(self.iface1, 'ip', "10.0.0.17") + self.ec.set(self.iface1, 'ip', "10.0.0.17/24") + self.ec.set(self.iface1, 'version', "5") self.app1 = self.ec.register_resource("OMFApplication") self.ec.set(self.app1, 'appid', 'Kill#1') - self.ec.set(self.app1, 'path', "/usr/bin/test") - self.ec.set(self.app1, 'args', "-1") + self.ec.set(self.app1, 'command', "/usr/bin/test -1") self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") + self.ec.set(self.app1, 'version', "5") self.ec.register_connection(self.app1, self.node1) self.ec.register_connection(self.node1, self.iface1) @@ -310,31 +331,36 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): def test_deploy_with_app_nc_and_critical_wrong(self): self.node2 = self.ec.register_resource("OMFNode") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') - self.ec.set(self.node2, 'xmppSlice', "nepi") - self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu") + 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.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") - self.ec.set(self.channel, 'xmppSlice', "nepi") - self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.channel, 'xmppUser', "nepi") + self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.channel, 'xmppPort', "5222") self.ec.set(self.channel, 'xmppPassword', "1234") + self.ec.set(self.channel, 'version', "5") self.app2 = self.ec.register_resource("OMFApplication") 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.ec.set(self.app3, 'appid', 'Kill#33') + self.ec.set(self.app3, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -367,34 +393,38 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): def test_deploy_with_app_nc_and_critical_right(self): self.node2 = self.ec.register_resource("OMFNode") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') - self.ec.set(self.node2, 'xmppSlice', "nepi") - self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu") + 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.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") - self.ec.set(self.channel, 'xmppSlice', "nepi") - self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.channel, 'xmppUser', "nepi") + self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.channel, 'xmppPort', "5222") self.ec.set(self.channel, 'xmppPassword', "1234") + self.ec.set(self.channel, 'version', "5") self.app2 = self.ec.register_resource("OMFApplication") 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.ec.set(self.app3, 'appid', 'Kill#3') - self.ec.set(self.app3, 'path', "/usr/bin/test") - self.ec.set(self.app3, 'args', "-1") + 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.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2) @@ -429,51 +459,56 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase): def test_deploy_with_many_app_nc_and_critical(self): self.node2 = self.ec.register_resource("OMFNode") self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab37') - self.ec.set(self.node2, 'xmppSlice', "nepi") - self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu") + 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.ec.set(self.iface2, 'alias', "w0") + self.ec.set(self.iface2, 'name', "wlan0") self.ec.set(self.iface2, 'mode', "adhoc") - self.ec.set(self.iface2, 'type', "g") + self.ec.set(self.iface2, 'hw_mode', "g") self.ec.set(self.iface2, 'essid', "vlcexp") - self.ec.set(self.iface2, 'ip', "10.0.0.37") + 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.ec.set(self.channel, 'channel', "6") - self.ec.set(self.channel, 'xmppSlice', "nepi") - self.ec.set(self.channel, 'xmppHost', "xmpp-plexus.onelab.eu") + self.ec.set(self.channel, 'xmppUser', "nepi") + self.ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu") self.ec.set(self.channel, 'xmppPort', "5222") self.ec.set(self.channel, 'xmppPassword', "1234") + self.ec.set(self.channel, 'version', "5") self.app2 = self.ec.register_resource("OMFApplication") 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.ec.set(self.app3, "critical", False) self.ec.set(self.app3, 'appid', 'Kill#3') - self.ec.set(self.app3, 'path', "/usr/bin/test") - self.ec.set(self.app3, 'args', "-1") + 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.ec.set(self.app4, 'appid', 'Kill#4') - self.ec.set(self.app4, 'path', "/usr/bin/test") - self.ec.set(self.app4, 'args', "-1") + 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.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.ec.set(self.app6, 'appid', 'Kill#6') - self.ec.set(self.app6, 'path', "/usr/bin/test") - self.ec.set(self.app6, 'args', "-1") + self.ec.set(self.app6, 'command', "/usr/bin/test -1") self.ec.set(self.app6, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority") + self.ec.set(self.app6, 'version', "5") self.ec.register_connection(self.iface1, self.channel) self.ec.register_connection(self.node2, self.iface2)