nothing

[nepi.git] / examples / vlc_wireless_netns_ns3.py

diff --git a/examples/vlc_wireless_netns_ns3.py b/examples/vlc_wireless_netns_ns3.py
index eddefae..1ecea3f 100644 (file)
--- a/examples/vlc_wireless_netns_ns3.py
+++ b/examples/vlc_wireless_netns_ns3.py
@@ -114,12 +114,12 @@ class VlcWirelessNetnsNs3Example(object):
     def run(self):
         bounds_width = bounds_height = 200
         x = y = 100
-        speed = 1
+        speed = 7
 
         exp_desc = ExperimentDescription()
 
         ## NS3 Testbed instance description ##
-        testbed_version = "3_9_RC3"
+        testbed_version = "3_9"
         testbed_id = "ns3"
         ns3_provider = FactoriesProvider(testbed_id, testbed_version)
         ns3_desc = exp_desc.add_testbed_description(ns3_provider)
@@ -152,7 +152,7 @@ class VlcWirelessNetnsNs3Example(object):
         netns_provider = FactoriesProvider(testbed_id, testbed_version)
         netns_desc1 = exp_desc.add_testbed_description(netns_provider)
         netns_desc1.set_attribute_value("homeDirectory", self.root_dir)
-        #netns_desc1.set_attribute_value("enableDebug", True
+        #netns_desc1.set_attribute_value("enableDebug", True)
         # create node 3
         node3 = netns_desc1.create("Node")
         node3.set_attribute_value("forward_X11", True)
@@ -161,7 +161,7 @@ class VlcWirelessNetnsNs3Example(object):
         # create vlc server
         # DEBUG!! target = "{#[vlc_client].addr[0].[Address]#}"
         target = "10.0.2.2" 
-        command = "vlc -I dummy -vvv %s --sout '#rtp{dst=%s,port=5004,mux=ts}' vlc:quit" \
+        command = "vlc -I dummy %s --sout '#rtp{dst=%s,port=5004,mux=ts}' vlc://quit" \
                 % (self.movie, target)
         vlc_server = netns_desc1.create("Application")
         vlc_server.set_attribute_value("command", command)
@@ -190,9 +190,6 @@ class VlcWirelessNetnsNs3Example(object):
         vlc_client.set_attribute_value("command", command)
         vlc_client.set_attribute_value("user", self.user)
         vlc_client.connector("node").connect(node4.connector("apps"))
-        #vlc_trace = vlc_server.get_trace("StderrTrace")
-        #vlc_trace.get_attribute("Filename").value = "vlc_server.err"
-        #vlc_trace.enable()        
 
         #command = "xterm"
         #xterm2 = netns_desc2.create("Application")
@@ -201,8 +198,8 @@ class VlcWirelessNetnsNs3Example(object):
         #xterm2.connector("node").connect(node4.connector("apps"))
 
         ## testbed_interconnection
-        fdnd1.connector("fd").connect(tap1.connector("fd"))
-        fdnd2.connector("fd").connect(tap2.connector("fd"))
+        fdnd1.connector("->fd").connect(tap1.connector("fd->"))
+        fdnd2.connector("->fd").connect(tap2.connector("fd->"))
       
         self.add_route(node4, "10.0.0.0", 24, "10.0.2.1")
         self.add_route(node4, "10.0.1.0", 24, "10.0.2.1")
@@ -215,7 +212,8 @@ class VlcWirelessNetnsNs3Example(object):
         xml = exp_desc.to_xml()
         controller = ExperimentController(xml, self.root_dir)
         controller.start()
-        while not controller.is_finished(vlc_server.guid):
+        while not controller.is_finished(vlc_server.guid) and \
+                not controller.is_finished(vlc_client.guid):
             time.sleep(0.5)
         controller.stop()
         controller.shutdown()