X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fns3%2Fns3ipv4l3protocol.py;h=5d539430c8b0d1a886e22312a528a81410c9239c;hb=f4a5a9a345818610739e9e5841b9da5b1a062f5d;hp=526cae7d29992e20d388ff1a349f0669e9222d9a;hpb=68adac66099b08e3daae7a84b29af0f7c69ee955;p=nepi.git

diff --git a/src/nepi/resources/ns3/ns3ipv4l3protocol.py b/src/nepi/resources/ns3/ns3ipv4l3protocol.py
index 526cae7d..5d539430 100644
--- a/src/nepi/resources/ns3/ns3ipv4l3protocol.py
+++ b/src/nepi/resources/ns3/ns3ipv4l3protocol.py
@@ -24,6 +24,12 @@ from nepi.resources.ns3.ns3base import NS3Base
 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
@@ -39,15 +45,22 @@ class NS3BaseIpv4L3Protocol(NS3Base):
     @property
     def _rms_to_wait(self):
         rms = set()
-        rms.add(self.node)
+        rms.add(self.simulation)
         return rms
 
     def _configure_object(self):
         simulation = self.simulation
 
-        uuid_list_routing = simulation.create("Ipv4ListRouting")
-        simulation.invoke(self.uuid, "SetRoutingProtocol", uuid_list_routing)
+        self.list_routing_uuid = simulation.create("Ipv4ListRouting")
+        simulation.invoke(self.uuid, "SetRoutingProtocol", self.list_routing_uuid)
+
+        self.static_routing_uuid = simulation.create("Ipv4StaticRouting")
+        simulation.invoke(self.list_routing_uuid, "AddRoutingProtocol", 
+                self.static_routing_uuid, 0)
 
-        uuid_static_routing = simulation.create("Ipv4StaticRouting")
-        simulation.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