use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / src / nepi / resources / ns3 / resource_manager_generator.py

diff --git a/src/nepi/resources/ns3/resource_manager_generator.py b/src/nepi/resources/ns3/resource_manager_generator.py
index 9ec844e..9097906 100644 (file)
--- 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,17 +16,28 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+#
+# Instructions to automatically generate ns-3 ResourceManagers
+# 
+# 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
 
 import os
 import re
 
-base_types = ["ns3::Node",
-        "ns3::Application", 
-        "ns3::NetDevice",
-        "ns3::Channel",
-        "ns3::Queue",
+adapted_types = ["ns3::Node",
         "ns3::Icmpv4L4Protocol",
         "ns3::ArpL3Protocol",
         "ns3::Ipv4L3Protocol",
@@ -40,36 +50,42 @@ base_types = ["ns3::Node",
         "ns3::WifiPhy",
         "ns3::WifiMac",
         "ns3::ErrorModel",
-        "ns3::ErrorRateModel"]
-
-def discard(ns3, tid):
-    rtype = tid.GetName()
-    type_id = ns3.TypeId()
-
-    for type_name in base_types:
-        tid_base = type_id.LookupByName(type_name)
-        if type_name == rtype or tid.IsChildOf(tid_base):
-            return False
+        "ns3::ErrorRateModel",
+        "ns3::Application", 
+        "ns3::FdNetDevice",
+        #"ns3::DceApplication", 
+        "ns3::NetDevice",
+        "ns3::Channel",
+        "ns3::Queue"]
 
-    return True
+base_types = ["ns3::IpL4Protocol"]
 
 def select_base_class(ns3, tid): 
-    base_class_import = "from nepi.resources.ns3.ns3base import NS3Base"
-    base_class = "NS3Base"
+    base_class_import = None
+    base_class = None
    
     rtype = tid.GetName()
 
     type_id = ns3.TypeId()
 
-    for type_name in base_types:
+    for type_name in adapted_types:
         tid_base = type_id.LookupByName(type_name)
         if type_name == rtype or tid.IsChildOf(tid_base):
             base_class = "NS3Base" + type_name.replace("ns3::", "")
             base_module = "ns3" + type_name.replace("ns3::", "").lower()
             base_class_import = "from nepi.resources.ns3.%s import %s " % (
                     base_module, base_class)
+            return (base_class_import, base_class)
+
+    base_class_import = "from nepi.resources.ns3.ns3base import NS3Base"
+    base_class = "NS3Base"
+
+    for type_name in base_types:
+        tid_base = type_id.LookupByName(type_name)
+        if type_name == rtype or tid.IsChildOf(tid_base):
+            return (base_class_import, base_class)
 
-    return (base_class_import, base_class)
+    return (None, None)
 
 def create_ns3_rms():
     ns3 = load_ns3_module()
@@ -83,7 +99,8 @@ def create_ns3_rms():
     for i in xrange(tid_count):
         tid = type_id.GetRegistered(i)
         
-        if discard(ns3, tid):
+        (base_class_import, base_class) = select_base_class(ns3, tid)
+        if not base_class:
             continue
         
         if tid.MustHideFromDocumentation() or \
@@ -102,8 +119,6 @@ def create_ns3_rms():
         attributes = "\n" + attributes if attributes else "pass"
         traces = "\n" + traces if traces else "pass"
 
-        (base_class_import, base_class) = select_base_class(ns3, tid)
-
         category = tid.GetGroupName()
 
         rtype = tid.GetName()
@@ -130,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()