X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fns3%2Fresource_manager_generator.py;h=90979065ab21976842b04db842f0f5f2840dd1da;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=016cfa7fe290ef79609501c9a6da025ab02ac563;hpb=a7e76f2c5b9646f44e5cbf6c558ed08b5b73ce28;p=nepi.git

diff --git a/src/nepi/resources/ns3/resource_manager_generator.py b/src/nepi/resources/ns3/resource_manager_generator.py
index 016cfa7f..90979065 100644
--- a/src/nepi/resources/ns3/resource_manager_generator.py
+++ b/src/nepi/resources/ns3/resource_manager_generator.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,12 +16,21 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+#
+# Instructions to automatically generate ns-3 ResourceManagers
 # 
-# Instructions. Run with:
+# Configure the ns-3 enviorment (e.g.):
+#
+#  export PYTHONPATH=~/.nepi/nepi-usr/bin/ns-3/ns-3.20/optimized/build/lib/python/site-packages
+#  export LD_LIBRARY_PATH=~/.nepi/nepi-usr/bin/ns-3/ns-3.20/optimized/build/lib
+#
+# Run the RM generator:
 #
 #  PYTHONPATH=$PYTHONPATH:~/repos/nepi/src python src/nepi/resources/ns3/resource_manager_generator.py
 #
 
+from __future__ import print_function
+
 # Force the load of ns3 libraries
 from nepi.resources.ns3.ns3wrapper import load_ns3_module
 
@@ -44,6 +52,7 @@ adapted_types = ["ns3::Node",
         "ns3::ErrorModel",
         "ns3::ErrorRateModel",
         "ns3::Application", 
+        "ns3::FdNetDevice",
         #"ns3::DceApplication", 
         "ns3::NetDevice",
         "ns3::Channel",
@@ -136,8 +145,8 @@ def create_ns3_rms():
                 replace("-","_").lower() + ".py"
 
         f = open(os.path.join(d, "classes", fname), "w")
-        print os.path.join(d, fname)
-        print template
+        print(os.path.join(d, fname))
+        print(template)
         f.write(template)
         f.close()