From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 12 May 2011 13:12:24 +0000 (+0200)
Subject: Fix stupid bug: missing ns3 reference in _add_static_route
X-Git-Tag: nepi_v2~45
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=84564a075cafea90f217505a93fa185f2d57bc31;p=nepi.git

Fix stupid bug: missing ns3 reference in _add_static_route
---

diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py
index c570e9a1..8fd79b1e 100644
--- a/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py
+++ b/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py
@@ -241,7 +241,7 @@ def configure_device(testbed_instance, guid):
         ipv4.SetMetric(ifindex, 1)
         ipv4.SetUp(ifindex)
 
-def _add_static_route(static_routing, 
+def _add_static_route(ns3, static_routing, 
         address, netprefix, nexthop_address, ifindex):
     if netprefix == 0:
         # Default route: 0.0.0.0/0
@@ -255,7 +255,7 @@ def _add_static_route(static_routing,
         static_routing.AddNetworkRouteTo(address, mask, nexthop_address, 
                 ifindex) 
 
-def _add_static_route_if(static_routing, address, netprefix, ifindex):
+def _add_static_route_if(ns3, static_routing, address, netprefix, ifindex):
     if netprefix == 0:
         # Default route: 0.0.0.0/0
         static_routing.SetDefaultRoute(ifindex) 
@@ -297,12 +297,12 @@ def configure_node(testbed_instance, guid):
                     ifindex = ipv4.GetInterfaceForPrefix(nexthop_address, ifmask)
                     if ifindex == ifidx:
                         break
-            _add_static_route(static_routing, 
+            _add_static_route(ns3, static_routing, 
                 address, netprefix, nexthop_address, ifindex)
         else:
             mask = ns3.Ipv4Mask("/%d" % netprefix) 
             ifindex = ipv4.GetInterfaceForPrefix(address, mask)
-            _add_static_route_if(static_routing, 
+            _add_static_route_if(ns3, static_routing, 
                 address, netprefix, nexthop_address, ifindex)
 
 factories_info = dict({