X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Fnepi_omf5_plexus_vlc.py;fp=examples%2Fomf%2Fnepi_omf_vlc_experiment.py;h=12930139b944eb3a6166a112b657abe836ad1cf6;hb=f025a30a215310a9803067a25e244137b71f56f2;hp=1cfd242cbaafa995fc6bbbd572bf15f29e9e3a77;hpb=e55b2f40b75bd704ca0f2ad03e78511fbca0791e;p=nepi.git

diff --git a/examples/omf/nepi_omf_vlc_experiment.py b/examples/omf/nepi_omf5_plexus_vlc.py
similarity index 69%
rename from examples/omf/nepi_omf_vlc_experiment.py
rename to examples/omf/nepi_omf5_plexus_vlc.py
index 1cfd242c..12930139 100644
--- a/examples/omf/nepi_omf_vlc_experiment.py
+++ b/examples/omf/nepi_omf5_plexus_vlc.py
@@ -51,61 +51,72 @@ ec = ExperimentController()
 # Create and Configure the Nodes
 node1 = ec.register_resource("OMFNode")
 ec.set(node1, 'hostname', 'omf.plexus.wlab17')
-ec.set(node1, 'xmppSlice', "nepi")
-ec.set(node1, 'xmppHost', "xmpp-plexus.onelab.eu")
+ec.set(node1, 'xmppUser', "nepi")
+ec.set(node1, 'xmppServer', "xmpp-plexus.onelab.eu")
 ec.set(node1, 'xmppPort', "5222")
 ec.set(node1, 'xmppPassword', "1234")
+ec.set(node1, 'version', "5")
 
 node2 = ec.register_resource("OMFNode")
 ec.set(node2, 'hostname', "omf.plexus.wlab37")
-ec.set(node2, 'xmppSlice', "nepi")
-ec.set(node2, 'xmppHost', "xmpp-plexus.onelab.eu")
+ec.set(node2, 'xmppUser', "nepi")
+ec.set(node2, 'xmppServer', "xmpp-plexus.onelab.eu")
 ec.set(node2, 'xmppPort', "5222")
 ec.set(node2, 'xmppPassword', "1234")
+ec.set(node2, 'version', "5")
 
 # Create and Configure the Interfaces
 iface1 = ec.register_resource("OMFWifiInterface")
-ec.set(iface1, 'alias', "w0")
+ec.set(iface1, 'name', "wlan0")
 ec.set(iface1, 'mode', "adhoc")
-ec.set(iface1, 'type', "g")
+ec.set(iface1, 'hw_mode', "g")
 ec.set(iface1, 'essid', "vlcexp")
 ec.set(iface1, 'ip', "10.0.0.17")
+ec.set(iface1, 'version', "5")
 
 iface2 = ec.register_resource("OMFWifiInterface")
-ec.set(iface2, 'alias', "w0")
+ec.set(iface2, 'name', "wlan0")
 ec.set(iface2, 'mode', "adhoc")
-ec.set(iface2, 'type', 'g')
+ec.set(iface2, 'hw_mode', 'g')
 ec.set(iface2, 'essid', "vlcexp")
-ec.set(iface2, 'ip', "10.0.0.37")
+ec.set(iface2, 'ip', "10.0.0.37/24")
+ec.set(iface2, 'version', "5")
 
 # Create and Configure the Channel
 channel = ec.register_resource("OMFChannel")
 ec.set(channel, 'channel', "6")
-ec.set(channel, 'xmppSlice', "nepi")
-ec.set(channel, 'xmppHost', "xmpp-plexus.onelab.eu")
+ec.set(channel, 'xmppUser', "nepi")
+ec.set(channel, 'xmppServer', "xmpp-plexus.onelab.eu")
 ec.set(channel, 'xmppPort', "5222")
 ec.set(channel, 'xmppPassword', "1234")
+ec.set(channel, 'version', "5")
 
 # Create and Configure the Application
 app1 = ec.register_resource("OMFApplication")
 ec.set(app1, 'appid', 'Vlc#1')
-ec.set(app1, 'path', "/opt/vlc-1.1.13/cvlc")
-ec.set(app1, 'args', "--quiet /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
-#ec.set(app1, 'args', "--quiet /opt/big_buck_bunny_240p_mpeg4.ts --sout '#rtp{dst=10.0.0.XX,port=1234,mux=ts} '")
-#ec.set(app1, 'args', "--quiet /opt/big_buck_bunny_240p_mpeg4_lq.ts --sout '#rtp{dst=10.0.0.XX,port=1234,mux=ts} '")
+ec.set(app1, 'command', "/opt/vlc-1.1.13/cvlc --quiet /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.37,port=1234,mux=ts}'")
+#ec.set(app1, 'command', "/opt/vlc-1.1.13/cvlc --quiet /opt/big_buck_bunny_240p_mpeg4.ts --sout '#rtp{dst=10.0.0.XX,port=1234,mux=ts} '")
+#ec.set(app1, 'command', "/opt/vlc-1.1.13/cvlc --quiet /opt/big_buck_bunny_240p_mpeg4_lq.ts --sout '#rtp{dst=10.0.0.XX,port=1234,mux=ts} '")
 ec.set(app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
+ec.set(app1, 'version', "5")
 
 app2 = ec.register_resource("OMFApplication")
 ec.set(app2, 'appid', 'Vlc#2')
-ec.set(app2, 'path', "/opt/vlc-1.1.13/cvlc")
-ec.set(app2, 'args', "--quiet rtp://10.0.0.37:1234")
+ec.set(app2, 'command', "/opt/vlc-1.1.13/cvlc --quiet rtp://10.0.0.37:1234")
 ec.set(app2, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
+ec.set(app2, 'version', "5")
 
 app3 = ec.register_resource("OMFApplication")
-ec.set(app3, 'appid', 'Kill#2')
-ec.set(app3, 'path', "/usr/bin/killall")
-ec.set(app3, 'args', "vlc")
+ec.set(app3, 'appid', 'Kill#1')
+ec.set(app3, 'command', "/usr/bin/killall vlc")
 ec.set(app3, 'env', " ")
+ec.set(app3, 'version', "5")
+
+app4 = ec.register_resource("OMFApplication")
+ec.set(app4, 'appid', 'Kill#2')
+ec.set(app4, 'command', "/usr/bin/killall vlc")
+ec.set(app4, 'env', " ")
+ec.set(app4, 'version', "5")
 
 # Connection
 ec.register_connection(app3, node1)
@@ -115,12 +126,13 @@ ec.register_connection(iface1, channel)
 ec.register_connection(iface2, channel)
 ec.register_connection(node2, iface2)
 ec.register_connection(app2, node2)
+ec.register_connection(app4, node2)
 
 # User Behaviour
 ec.register_condition(app2, ResourceAction.START, app1, ResourceState.STARTED , "4s")
 ec.register_condition([app1, app2], ResourceAction.STOP, app2, ResourceState.STARTED , "22s")
-ec.register_condition(app3, ResourceAction.START, app2, ResourceState.STARTED , "25s")
-ec.register_condition(app3, ResourceAction.STOP, app3, ResourceState.STARTED , "1s")
+ec.register_condition([app3, app4], ResourceAction.START, app2, ResourceState.STOPPED , "1s")
+ec.register_condition([app3, app4], ResourceAction.STOP, app3, ResourceState.STARTED , "1s")
 
 # Deploy
 ec.deploy()