Changing ResourceManager naming for platform::ResourceName

[nepi.git] / examples / omf / vod_exp / vod_experiment.py

diff --git a/examples/omf/vod_exp/vod_experiment.py b/examples/omf/vod_exp/vod_experiment.py
index 7fd5e1a..910b95c 100755 (executable)
--- a/examples/omf/vod_exp/vod_experiment.py
+++ b/examples/omf/vod_exp/vod_experiment.py
@@ -46,7 +46,7 @@ sfaPrivateKey = '/home/alina/.sfi/aquereilhac.pkey'
 # Functions for nodes and ifaces registration
 
 def create_planetlab_node(ec, host):
-    node = ec.register_resource("PlanetlabSfaNode")
+    node = ec.register_resource("planetlab::sfa::Node")
     ec.set(node, "hostname", host)
     ec.set(node, "username", "inria_nepi")
     ec.set(node, "sfauser", sfauser)
@@ -55,7 +55,7 @@ def create_planetlab_node(ec, host):
     return node
 
 def create_omf_node(ec, host):
-    node = ec.register_resource("WilabtSfaNode")
+    node = ec.register_resource("wilabt::sfa::Node")
     ec.set(node, "host", host)
     ec.set(node, "slicename", slicename)
     ec.set(node, "sfauser", sfauser)
@@ -70,7 +70,7 @@ def create_omf_node(ec, host):
     return node
 
 def create_omf_iface(ec, ip, node):
-    iface = ec.register_resource("OMFWifiInterface")
+    iface = ec.register_resource("omf::WifiInterface")
     ec.set(iface, 'name', 'wlan0')
     ec.set(iface, 'mode', "adhoc")
     ec.set(iface, 'hw_mode', "g")
@@ -107,7 +107,7 @@ omf_ifaces = [iface_center, iface_client1, iface_client2, iface_client3, iface_c
 
 # Register channel
 
-chan = ec.register_resource("OMFChannel")
+chan = ec.register_resource("omf::Channel")
 ec.set(chan, 'channel', "6")
 
 # Register connection ifaces - channel
@@ -132,7 +132,7 @@ time.sleep(3)
 # Functions for applications registration in the nodes
 
 def create_vlc_server(ec, video_server, mode):
-    vlc_server = ec.register_resource("LinuxApplication")
+    vlc_server = ec.register_resource("linux::Application")
     ec.set(vlc_server, "depends", "vlc")
     ec.set(vlc_server, "sources", "examples/omf/demo_openlab/big_buck_bunny_240p_mpeg4_lq.ts")
     # Depending on the mode selected to run the experiment, 
@@ -148,7 +148,7 @@ def create_vlc_server(ec, video_server, mode):
     return vlc_server
 
 def create_omf_app(ec, command, node):
-    app = ec.register_resource("OMFApplication")
+    app = ec.register_resource("omf::Application")
     ec.set(app, 'command', command)
     ec.register_connection(app, node)
     return app
@@ -179,7 +179,7 @@ ec.register_condition(upload_conf, ResourceAction.START, vlc_server, ResourceSta
 ec.register_condition(vlc_wificenter, ResourceAction.START, upload_conf, ResourceState.STARTED , "2s")
 
 # measurements in video server (PL node)
-measure_videoserver = ec.register_resource("LinuxApplication")
+measure_videoserver = ec.register_resource("linux::Application")
 ec.set(measure_videoserver, "depends", "tcpdump")
 ec.set(measure_videoserver, "sudo", True)
 command = "tcpdump -i eth0 not arp -n -w /tmp/capplserver_%s.pcap" % ("$(date +'%Y%m%d%H%M%S')")