git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added routes to OMF nodes
[nepi.git]
/
src
/
nepi
/
testbeds
/
ns3
/
factories_metadata.py
diff --git
a/src/nepi/testbeds/ns3/factories_metadata.py
b/src/nepi/testbeds/ns3/factories_metadata.py
index
201c932
..
a7921a8
100644
(file)
--- a/
src/nepi/testbeds/ns3/factories_metadata.py
+++ b/
src/nepi/testbeds/ns3/factories_metadata.py
@@
-477,7
+477,7
@@
def configure_node(testbed_instance, guid):
ns3 = testbed_instance.ns3
routes = testbed_instance._add_route[guid]
for route in routes:
ns3 = testbed_instance.ns3
routes = testbed_instance._add_route[guid]
for route in routes:
- (destination, netprefix, nexthop, metric) = route
+ (destination, netprefix, nexthop, metric
, device
) = route
address = ns3.Ipv4Address(destination)
if nexthop:
nexthop_address = ns3.Ipv4Address(nexthop)
address = ns3.Ipv4Address(destination)
if nexthop:
nexthop_address = ns3.Ipv4Address(nexthop)
@@
-497,7
+497,7
@@
def configure_node(testbed_instance, guid):
break
if ifindex < 0:
# Check previous ptp routes
break
if ifindex < 0:
# Check previous ptp routes
- for chaindest, chainprefix, chainhop, metric in routes:
+ for chaindest, chainprefix, chainhop, metric
, device
in routes:
if chaindest == nexthop and chainprefix == 32:
chainhop_address = ns3.Ipv4Address(chainhop)
for ifidx in xrange(nifaces):
if chaindest == nexthop and chainprefix == 32:
chainhop_address = ns3.Ipv4Address(chainhop)
for ifidx in xrange(nifaces):