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
still making both branches closer
[nepi.git]
/
src
/
nepi
/
resources
/
ns3
/
ns3route.py
diff --git
a/src/nepi/resources/ns3/ns3route.py
b/src/nepi/resources/ns3/ns3route.py
index
db2c147
..
48a0358
100644
(file)
--- a/
src/nepi/resources/ns3/ns3route.py
+++ b/
src/nepi/resources/ns3/ns3route.py
@@
-21,8
+21,6
@@
from nepi.execution.resource import clsinit_copy
from nepi.execution.trace import Trace
from nepi.resources.ns3.ns3base import NS3Base
from nepi.execution.trace import Trace
from nepi.resources.ns3.ns3base import NS3Base
-import ipaddr
-
@clsinit_copy
class NS3Route(NS3Base):
_rtype = "ns3::Route"
@clsinit_copy
class NS3Route(NS3Base):
_rtype = "ns3::Route"
@@
-53,7
+51,7
@@
class NS3Route(NS3Base):
if not nodes:
msg = "Device not connected to node"
self.error(msg)
if not nodes:
msg = "Device not connected to node"
self.error(msg)
- raise RuntimeError
, msg
+ raise RuntimeError
(msg)
return nodes[0]
return nodes[0]
@@
-83,7
+81,7
@@
class NS3Route(NS3Base):
msg = "Could not configure route %s/%s hop: %s" % (network, prefix,
nexthop)
self.error(msg)
msg = "Could not configure route %s/%s hop: %s" % (network, prefix,
nexthop)
self.error(msg)
- raise RuntimeError
, msg
+ raise RuntimeError
(msg)
def _connect_object(self):
node = self.node
def _connect_object(self):
node = self.node