Changing ResourceManager naming for platform::ResourceName

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

diff --git a/examples/omf/nitos_omf6_vlc.py b/examples/omf/nitos_omf6_vlc.py
index ec7f7be..9b7443b 100644 (file)
--- a/examples/omf/nitos_omf6_vlc.py
+++ b/examples/omf/nitos_omf6_vlc.py
@@ -80,7 +80,7 @@ chan = options.channel
 ec = ExperimentController(exp_id="nitos_omf6_vlc")
 
 # Create and Configure the Nodes
-node1 = ec.register_resource("OMFNode")
+node1 = ec.register_resource("omf::Node")
 ec.set(node1, "hostname", nodex)
 ec.set(node1, "xmppUser", slicename)
 ec.set(node1, "xmppServer", "nitlab.inf.uth.gr")
@@ -88,7 +88,7 @@ ec.set(node1, "xmppPort", "5222")
 ec.set(node1, "xmppPassword", "1234")
 
 # Create and Configure the Interfaces
-iface1 = ec.register_resource("OMFWifiInterface")
+iface1 = ec.register_resource("omf::WifiInterface")
 ec.set(iface1, "name", "wlan0")
 ec.set(iface1, "mode", "adhoc")
 ec.set(iface1, "hw_mode", "g")
@@ -97,7 +97,7 @@ ec.set(iface1, "ip", "192.168.0.%s/24" % nodex[-2:])
 ec.register_connection(node1, iface1)
 
 # Create and Configure the Nodes
-node2 = ec.register_resource("OMFNode")
+node2 = ec.register_resource("omf::Node")
 ec.set(node2, "hostname", nodez)
 ec.set(node2, "xmppUser", slicename)
 ec.set(node2, "xmppServer", "nitlab.inf.uth.gr")
@@ -105,7 +105,7 @@ ec.set(node2, "xmppPort", "5222")
 ec.set(node2, "xmppPassword", "1234")
 
 # Create and Configure the Interfaces
-iface2 = ec.register_resource("OMFWifiInterface")
+iface2 = ec.register_resource("omf::WifiInterface")
 ec.set(iface2, "name", "wlan0")
 ec.set(iface2, "mode", "adhoc")
 ec.set(iface2, "hw_mode", "g")
@@ -114,7 +114,7 @@ ec.set(iface2, "ip", "192.168.0.%s/24" % nodez[-2:])
 ec.register_connection(node2, iface2)
 
 # Create and Configure the Channel
-channel = ec.register_resource("OMFChannel")
+channel = ec.register_resource("omf::Channel")
 ec.set(channel, "channel", chan)
 ec.set(channel, "xmppUser", slicename)
 ec.set(channel, "xmppServer", "nitlab.inf.uth.gr")
@@ -126,14 +126,14 @@ ec.register_connection(iface2, channel)
 client_ip = "192.168.0.%s" % nodez[-2:]
 
 # Create and Configure the Application
-app1 = ec.register_resource("OMFApplication")
+app1 = ec.register_resource("omf::Application")
 ec.set(app1, "command", 
     "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority /root/vlc/vlc-1.1.13/cvlc /root/10-by-p0d.avi --sout '#rtp{dst=%s,port=5004,mux=ts}'" % client_ip) 
 ec.register_connection(app1, node1)
 
 ## Add a OMFApplication to run the client VLC and count the numer of bytes 
 ## transmitted,  using wc.
-app2 = ec.register_resource("OMFApplication")
+app2 = ec.register_resource("omf::Application")
 ec.set(app2, "command", 
     "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority /root/vlc/vlc-1.1.13/cvlc rtp://%s:5004 | wc -c "% client_ip)