Changing ResourceManager naming for platform::ResourceName

[nepi.git] / examples / omf / testing / nepi_omf5_nitos_ccnring.py

diff --git a/examples/omf/testing/nepi_omf5_nitos_ccnring.py b/examples/omf/testing/nepi_omf5_nitos_ccnring.py
index 86370d4..4ca07ff 100644 (file)
--- a/examples/omf/testing/nepi_omf5_nitos_ccnring.py
+++ b/examples/omf/testing/nepi_omf5_nitos_ccnring.py
@@ -48,7 +48,7 @@ from optparse import OptionParser, SUPPRESS_HELP
 
 ###  Define OMF Method to simplify definition of resources ###
 def add_node(ec, hostname, xmppServer, xmppUser, xmppPort = "5222", xmppPassword = "1234"):
-    node = ec.register_resource("OMFNode")
+    node = ec.register_resource("omf::Node")
     ec.set(node, 'hostname', hostname)
     ec.set(node, 'xmppServer', xmppServer)
     ec.set(node, 'xmppUser', xmppUser)
@@ -59,7 +59,7 @@ def add_node(ec, hostname, xmppServer, xmppUser, xmppPort = "5222", xmppPassword
 
 def add_interface(ec, ip, xmppServer, xmppUser, essid = "ccn", name = "wlan0", mode = "adhoc",
                  typ = "g", xmppPort = "5222", xmppPassword = "1234"):
-    iface = ec.register_resource("OMFWifiInterface")
+    iface = ec.register_resource("omf::WifiInterface")
     ec.set(iface, 'name', name)
     ec.set(iface, 'mode', mode)
     ec.set(iface, 'hw_mode', typ)
@@ -69,7 +69,7 @@ def add_interface(ec, ip, xmppServer, xmppUser, essid = "ccn", name = "wlan0", m
     return iface
 
 def add_channel(ec, channel, xmppServer, xmppUser, xmppPort = "5222", xmppPassword = "1234"):
-    chan = ec.register_resource("OMFChannel")
+    chan = ec.register_resource("omf::Channel")
     ec.set(chan, 'channel', channel)
     ec.set(chan, 'xmppServer', xmppServer)
     ec.set(chan, 'xmppUser', xmppUser)
@@ -80,7 +80,7 @@ def add_channel(ec, channel, xmppServer, xmppUser, xmppPort = "5222", xmppPasswo
 
 def add_app(ec, host,  appid, command, env, xmppServer, xmppUser, 
                 xmppPort = "5222", xmppPassword = "1234"):
-    app = ec.register_resource("OMFApplication")
+    app = ec.register_resource("omf::Application")
     ec.set(app, 'appid', appid)
     ec.set(app, 'command', command)
     ec.set(app, 'env', env)