update test and examples for OMF6 in OMF section

[nepi.git] / examples / omf / nepi_omf5_nitos_xeyes.py

diff --git a/examples/omf/nepi_omf_xeyes_nitos.py b/examples/omf/nepi_omf5_nitos_xeyes.py
similarity index 85%
rename from examples/omf/nepi_omf_xeyes_nitos.py
rename to examples/omf/nepi_omf5_nitos_xeyes.py
index bfa5bfe..8fd81fe 100644 (file)
--- a/examples/omf/nepi_omf_xeyes_nitos.py
+++ b/examples/omf/nepi_omf5_nitos_xeyes.py
@@ -49,43 +49,43 @@ 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")
 
 # 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', "xeyes")
-ec.set(iface1, 'ip', "192.168.0.XX")
-ec.set(iface1, 'xmppSlice', "ZZZ")
-ec.set(iface1, 'xmppHost', "nitlab.inf.uth.gr")
-ec.set(iface1, 'xmppPort', "5222")
-ec.set(iface1, 'xmppPassword', "1234")
+ec.set(iface1, 'ip', "192.168.0.XX/24")
+ec.set(iface1, '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', 'XEyes#1')
-ec.set(app1, 'path', "/usr/bin/xeyes")
-ec.set(app1, 'args', " ")
+ec.set(app1, 'command', "/usr/bin/xeyes")
 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', 'Kill#1')
 ec.set(app2, 'path', "/usr/bin/kill")
 ec.set(app2, 'args', "xeyes")
 ec.set(app2, 'env', " ")
+ec.set(app2, 'version', "5")
 
 # Connection
 ec.register_connection(app2, node1)