Merge with head

[nepi.git] / examples / wimax_ns3.py

diff --git a/examples/wimax_ns3.py b/examples/wimax_ns3.py
index f8cdece..c6680cd 100644 (file)
--- a/examples/wimax_ns3.py
+++ b/examples/wimax_ns3.py
@@ -78,9 +78,8 @@ class Roads09Example(object):
     def run(self):
         exp_desc = ExperimentDescription()
 
-        testbed_version = "3_9"
         testbed_id = "ns3"
-        ns3_provider = FactoriesProvider(testbed_id, testbed_version)
+        ns3_provider = FactoriesProvider(testbed_id)
         ns3_desc = exp_desc.add_testbed_description(ns3_provider)
         ns3_desc.set_attribute_value("homeDirectory", self.root_dir)
         ns3_desc.set_attribute_value("StopTime", "7.1s")
@@ -132,6 +131,7 @@ class Roads09Example(object):
         controller.shutdown()
 
     def clean(self):
+        print self.root_dir
         #shutil.rmtree(self.root_dir)
         pass