X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Fnepi_omf5_nitos_vlc.py;fp=examples%2Fomf%2Fnepi_omf_vlc_nitos.py;h=d0d590a19fe8f285e8204690dae21cff92e8e257;hb=f025a30a215310a9803067a25e244137b71f56f2;hp=9f1b6883de55df21cfbc0fd7581347c599a9d6e1;hpb=e55b2f40b75bd704ca0f2ad03e78511fbca0791e;p=nepi.git

diff --git a/examples/omf/nepi_omf_vlc_nitos.py b/examples/omf/nepi_omf5_nitos_vlc.py
similarity index 79%
rename from examples/omf/nepi_omf_vlc_nitos.py
rename to examples/omf/nepi_omf5_nitos_vlc.py
index 9f1b6883..d0d590a1 100644
--- a/examples/omf/nepi_omf_vlc_nitos.py
+++ b/examples/omf/nepi_omf5_nitos_vlc.py
@@ -51,65 +51,70 @@ ec = ExperimentController()
 # Create and Configure the Nodes
 node1 = ec.register_resource("OMFNode")
 ec.set(node1, 'hostname', 'omf.nitos.node0XX')
-ec.set(node1, 'xmppSlice', "ZZZ")
-ec.set(node1, 'xmppHost', "nitlab.inf.uth.gr")
+ec.set(node1, 'xmppServer', "ZZZ")
+ec.set(node1, 'xmppUser', "nitlab.inf.uth.gr")
 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.nitos.node0YY")
-ec.set(node2, 'xmppSlice', "ZZZ")
-ec.set(node2, 'xmppHost', "nitlab.inf.uth.gr")
+ec.set(node2, 'xmppServer', "ZZZ")
+ec.set(node2, 'xmppUser', "nitlab.inf.uth.gr")
 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', "192.168.0.XX")
+ec.set(iface1, 'ip', "192.168.0.XX/24")
+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', "192.168.0.YY")
+ec.set(iface2, 'ip', "192.168.0.YY/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', "ZZZ")
-ec.set(channel, 'xmppHost', "nitlab.inf.uth.gr")
+ec.set(channel, 'xmppServer', "ZZZ")
+ec.set(channel, 'xmppUser', "nitlab.inf.uth.gr")
 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', "/root/vlc-1.1.13/cvlc")
-ec.set(app1, 'args', "/root/10-by-p0d.avi --sout '#rtp{dst=192.168.0.YY,port=1234,mux=ts}'")
+ec.set(app1, 'command', "/root/vlc/vlc-1.1.13/cvlc /root/10-by-p0d.avi --sout '#rtp{dst=192.168.0.YY,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', "/root/vlc-1.1.13/cvlc")
-ec.set(app2, 'args', "rtp://192.168.0.YY:1234")
+ec.set(app2, 'command', "/root/vlc/vlc-1.1.13/cvlc rtp://192.168.0.YY: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_app")
+ec.set(app3, 'command', "/usr/bin/killall vlc_app")
 ec.set(app3, 'env', " ")
+ec.set(app3, 'version', "5")
 
 app4 = ec.register_resource("OMFApplication")
 ec.set(app4, 'appid', 'Kill#1')
-ec.set(app4, 'path', "/usr/bin/killall")
-ec.set(app4, 'args', "vlc_app")
+ec.set(app4, 'command', "/usr/bin/killall vlc_app")
 ec.set(app4, 'env', " ")
+ec.set(app4, 'version', "5")
 
 # Connection
 ec.register_connection(app3, node1)