Fixes ns-3/DCE

[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 aa3f51b..016cfa7 100644 (file)
--- a/src/nepi/resources/ns3/resource_manager_generator.py
+++ b/src/nepi/resources/ns3/resource_manager_generator.py
@@ -17,56 +17,66 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+# 
+# Instructions. Run with:
+#
+#  PYTHONPATH=$PYTHONPATH:~/repos/nepi/src python src/nepi/resources/ns3/resource_manager_generator.py
+#
+
 # 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",
         "ns3::PropagationLossModel",
+        "ns3::MobilityModel",
         "ns3::PropagationDelayModel",
         "ns3::WifiRemoteStationManager",
+        "ns3::WifiNetDevice",
+        "ns3::WifiChannel",
         "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::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"
 
-    return (base_class_import, base_class)
+    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 (None, None)
 
 def create_ns3_rms():
     ns3 = load_ns3_module()
@@ -80,7 +90,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 \
@@ -99,8 +110,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()
@@ -146,12 +155,15 @@ def template_attributes(ns3, tid):
         if not attr_info.accessor.HasGetter():
             continue
 
-        attr_flags = "None"
+        attr_flags = "Flags.Reserved"
         flags = attr_info.flags
-        if (flags & ns3.TypeId.ATTR_SET) != ns3.TypeId.ATTR_SET:
-            attr_flags = "Flags.Design"
-        elif (flags & ns3.TypeId.ATTR_CONSTRUCT) == ns3.TypeId.ATTR_CONSTRUCT:
-            attr_flags = "Flags.Construct"
+        if (flags & ns3.TypeId.ATTR_CONSTRUCT) == ns3.TypeId.ATTR_CONSTRUCT:
+            attr_flags += " | Flags.Construct"
+        else:
+            if (flags & ns3.TypeId.ATTR_GET) != ns3.TypeId.ATTR_GET:
+                attr_flags += " | Flags.NoRead"
+            elif (flags & ns3.TypeId.ATTR_SET) != ns3.TypeId.ATTR_SET:
+                attr_flags += " | Flags.NoWrite"
 
         attr_name = attr_info.name
         checker = attr_info.checker