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
f8f3670
..
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
@@
-24,6
+23,12
@@
from nepi.resources.ns3.ns3base import NS3Base
class NS3BaseIpv4L3Protocol(NS3Base):
_rtype = "abstract::ns3::Ipv4L3Protocol"
class NS3BaseIpv4L3Protocol(NS3Base):
_rtype = "abstract::ns3::Ipv4L3Protocol"
+ def __init__(self, ec, guid):
+ 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):
from nepi.resources.ns3.ns3node import NS3BaseNode
@property
def node(self):
from nepi.resources.ns3.ns3node import NS3BaseNode
@@
-32,22
+37,29
@@
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]
@property
def _rms_to_wait(self):
rms = set()
return nodes[0]
@property
def _rms_to_wait(self):
rms = set()
- rms.add(self.
node
)
+ rms.add(self.
simulation
)
return rms
def _configure_object(self):
return rms
def _configure_object(self):
- simulator = self.simulator
+ simulation = self.simulation
+
+ self.list_routing_uuid = simulation.create("Ipv4ListRouting")
+ simulation.invoke(self.uuid, "SetRoutingProtocol", self.list_routing_uuid)
- uuid_list_routing = simulator.create("Ipv4ListRouting")
- simulator.invoke(self.uuid, "SetRoutingProtocol", uuid_list_routing)
+ self.static_routing_uuid = simulation.create("Ipv4StaticRouting")
+ simulation.invoke(self.list_routing_uuid, "AddRoutingProtocol",
+ self.static_routing_uuid, 0)
- uuid_static_routing = simulator.create("Ipv4StaticRouting")
- simulator.invoke(uuid_list_routing, "AddRoutingProtocol", uuid_static_routing, 1)
+ self.global_routing_uuid = simulation.create("Ipv4GlobalRouting")
+ simulation.invoke(self.list_routing_uuid, "AddRoutingProtocol",
+ self.global_routing_uuid, -10)
+ def _connect_object(self):
+ pass