X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fomf6_vlc_wrong_critical.py;fp=test%2Fresources%2Fomf%2Fvlc_wrong_critical.py;h=f49cb56084be09b2fc2f936356ff4e8f47c718f1;hb=f025a30a215310a9803067a25e244137b71f56f2;hp=4a9dd1964c4954ca914241d7e0a10ecedc9e6797;hpb=e55b2f40b75bd704ca0f2ad03e78511fbca0791e;p=nepi.git

diff --git a/test/resources/omf/vlc_wrong_critical.py b/test/resources/omf/omf6_vlc_wrong_critical.py
old mode 100755
new mode 100644
similarity index 74%
rename from test/resources/omf/vlc_wrong_critical.py
rename to test/resources/omf/omf6_vlc_wrong_critical.py
index 4a9dd196..f49cb560
--- a/test/resources/omf/vlc_wrong_critical.py
+++ b/test/resources/omf/omf6_vlc_wrong_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 *
 
@@ -42,25 +42,25 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         OMFVLCWrongCaseAllCritical.id += 1
 
         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, '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.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.12/24")
 
         self.app1 = self.ec.register_resource("OMFApplication")
         self.ec.set(self.app1, 'appid', 'Vlc#1')
-        self.ec.set(self.app1, 'path', "/opt/vlc-1.1.13/cvlc")
-        self.ec.set(self.app1, 'args', "/opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
+        self.ec.set(self.app1, 'command', "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.49,port=1234,mux=ts}'")
         self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
 
+
         self.ec.register_connection(self.app1, self.node1)
         self.ec.register_connection(self.node1, self.iface1)
 
@@ -68,18 +68,14 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.node2 = self.ec.register_resource("OMFNode")
 
         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.49/24")
         
         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, 'xmppPort', "5222")
-        self.ec.set(self.channel, 'xmppPassword', "1234")
 
         self.ec.register_connection(self.iface1, self.channel)
         self.ec.register_connection(self.node2, self.iface2)
@@ -105,27 +101,24 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
     def test_deploy_wo_hostname(self):
 
         self.node2 = self.ec.register_resource("OMFNode")
-        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.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.49/24")
         
         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, 'xmppPort', "5222")
-        self.ec.set(self.channel, 'xmppPassword', "1234")
 
         self.ec.register_connection(self.iface1, self.channel)
         self.ec.register_connection(self.node2, self.iface2)
+        self.ec.register_connection(self.iface2, self.channel)
 
         self.ec.register_condition([self.app1], ResourceAction.STOP, self.app1, ResourceState.STARTED , "2s")
 
@@ -146,9 +139,9 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
     def test_deploy_wo_iface(self):
         self.node2 = self.ec.register_resource("OMFNode")
-        self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
-        self.ec.set(self.node2, 'xmppSlice', "nepi")
-        self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu")
+        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")
 
@@ -156,13 +149,10 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         
         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, 'xmppPort', "5222")
-        self.ec.set(self.channel, 'xmppPassword', "1234")
 
         self.ec.register_connection(self.iface1, self.channel)
         self.ec.register_connection(self.node2, self.iface2)
+        self.ec.register_connection(self.iface2, self.channel)
 
         self.ec.register_condition([self.app1], ResourceAction.STOP, self.app1, ResourceState.STARTED , "2s")
 
@@ -181,29 +171,63 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
         self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
+    def test_deploy_wo_channel(self):
+        self.node2 = self.ec.register_resource("OMFNode")
+        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.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.ec.register_connection(self.iface1, self.channel)
+        self.ec.register_connection(self.node2, self.iface2)
+        self.ec.register_connection(self.iface2, self.channel)
+
+        self.ec.register_condition([self.app1], ResourceAction.STOP, self.app1, ResourceState.STARTED , "2s")
+        self.ec.deploy()
+
+        self.ec.wait_finished([self.app1])
+
+        self.assertEquals(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)
+
     def test_deploy_wo_ip(self):
         self.node2 = self.ec.register_resource("OMFNode")
-        self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
-        self.ec.set(self.node2, 'xmppSlice', "nepi")
-        self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu")
+        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.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, 'essid', "vlcexp")     
+        self.ec.set(self.iface2, 'hw_mode', "g")
+        self.ec.set(self.iface2, 'essid', "vlcexp")
 
         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, 'xmppPort', "5222")
-        self.ec.set(self.channel, 'xmppPassword', "1234")
 
         self.ec.register_connection(self.iface1, self.channel)
         self.ec.register_connection(self.node2, self.iface2)
+        self.ec.register_connection(self.iface2, self.channel)
 
         self.ec.register_condition([self.app1], ResourceAction.STOP, self.app1, ResourceState.STARTED , "2s")
 
@@ -224,25 +248,21 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
     def test_deploy_wo_app(self):
         self.node2 = self.ec.register_resource("OMFNode")
-        self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
-        self.ec.set(self.node2, 'xmppSlice', "nepi")
-        self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu")
+        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.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.49/24")
 
         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, 'xmppPort', "5222")
-        self.ec.set(self.channel, 'xmppPassword', "1234")
 
         self.app2 = self.ec.register_resource("OMFApplication")
 
@@ -272,25 +292,21 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
     def test_deploy_wo_app_path(self):
         self.node2 = self.ec.register_resource("OMFNode")
-        self.ec.set(self.node2, 'hostname', 'omf.plexus.wlab17')
-        self.ec.set(self.node2, 'xmppSlice', "nepi")
-        self.ec.set(self.node2, 'xmppHost', "xmpp-plexus.onelab.eu")
+        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.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.49/24")
 
         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, 'xmppPort', "5222")
-        self.ec.set(self.channel, 'xmppPassword', "1234")
 
         self.app2 = self.ec.register_resource("OMFApplication")
         self.ec.set(self.app2, 'appid', 'Vlc#2')