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
applied the except and raise fixers to the master branch to close the gap with py3
[nepi.git]
/
src
/
nepi
/
resources
/
ns3
/
ns3ipv4l3protocol.py
diff --git
a/src/nepi/resources/ns3/ns3ipv4l3protocol.py
b/src/nepi/resources/ns3/ns3ipv4l3protocol.py
index
5eb3f45
..
c82e9a1
100644
(file)
--- a/
src/nepi/resources/ns3/ns3ipv4l3protocol.py
+++ b/
src/nepi/resources/ns3/ns3ipv4l3protocol.py
@@
-3,9
+3,8
@@
# Copyright (C) 2014 INRIA
#
# This program is free software: you can redistribute it and/or modify
# Copyright (C) 2014 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
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-28,6
+27,7
@@
class NS3BaseIpv4L3Protocol(NS3Base):
super(NS3BaseIpv4L3Protocol, self).__init__(ec, guid)
self.list_routing_uuid = None
self.static_routing_uuid = None
super(NS3BaseIpv4L3Protocol, self).__init__(ec, guid)
self.list_routing_uuid = None
self.static_routing_uuid = None
+ self.global_routing_uuid = None
@property
def node(self):
@property
def node(self):
@@
-37,7
+37,7
@@
class NS3BaseIpv4L3Protocol(NS3Base):
if not nodes:
msg = "Ipv4L3Protocol not connected to node"
self.error(msg)
if not nodes:
msg = "Ipv4L3Protocol not connected to node"
self.error(msg)
- raise RuntimeError
, msg
+ raise RuntimeError
(msg)
return nodes[0]
return nodes[0]
@@
-55,7
+55,11
@@
class NS3BaseIpv4L3Protocol(NS3Base):
self.static_routing_uuid = simulation.create("Ipv4StaticRouting")
simulation.invoke(self.list_routing_uuid, "AddRoutingProtocol",
self.static_routing_uuid = simulation.create("Ipv4StaticRouting")
simulation.invoke(self.list_routing_uuid, "AddRoutingProtocol",
- self.static_routing_uuid, 1)
+ self.static_routing_uuid, 0)
+
+ self.global_routing_uuid = simulation.create("Ipv4GlobalRouting")
+ simulation.invoke(self.list_routing_uuid, "AddRoutingProtocol",
+ self.global_routing_uuid, -10)
def _connect_object(self):
pass
def _connect_object(self):
pass