X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fns3%2Fns3base.py;h=ef345ff104e113d6c0c0a612238c180271d64a70;hb=96ce55552a850e2fc155710a80c8453e0f201783;hp=085412b6faf346ca6374fec3f94d1b33f5bfa7db;hpb=04094716c3ff011e697e1e8871328a4a06aab83d;p=nepi.git

diff --git a/src/nepi/resources/ns3/ns3base.py b/src/nepi/resources/ns3/ns3base.py
index 085412b6..ef345ff1 100644
--- a/src/nepi/resources/ns3/ns3base.py
+++ b/src/nepi/resources/ns3/ns3base.py
@@ -19,12 +19,9 @@
 
 from nepi.execution.resource import ResourceManager, clsinit_copy, \
         ResourceState, reschedule_delay
-
 from nepi.execution.attribute import Flags
 from nepi.execution.trace import TraceAttr
 
-reschedule_delay = "2s"
-
 @clsinit_copy
 class NS3Base(ResourceManager):
     _rtype = "abstract::ns3::Object"
@@ -35,6 +32,7 @@ class NS3Base(ResourceManager):
         self._uuid = None
         self._connected = set()
         self._trace_filename = dict()
+        self._node = None
 
     @property
     def connected(self):
@@ -50,15 +48,17 @@ class NS3Base(ResourceManager):
 
     @property
     def node(self):
-        from nepi.resources.ns3.ns3node import NS3BaseNode
-        nodes = self.get_connected(NS3BaseNode.get_rtype())
-        if nodes: return nodes[0]
-        return None
+        if not self._node:
+            from nepi.resources.ns3.ns3node import NS3BaseNode
+            nodes = self.get_connected(NS3BaseNode.get_rtype())
+            if nodes: self._node = nodes[0]
+
+        return self._node
 
     def trace(self, name, attr = TraceAttr.ALL, block = 512, offset = 0):
         filename = self._trace_filename.get(name)
         if not filename:
-            self.error("Can resolve trace %s. Did you enabled it?" % name)
+            self.error("Can not resolve trace %s. Did you enabled it?" % name)
             return ""
 
         return self.simulation.trace(filename, attr, block, offset)
@@ -83,10 +83,10 @@ class NS3Base(ResourceManager):
 
         kwargs = dict()
         for attr in self._attrs.values():
-            if not (attr.has_changed() and attr.has_flag(Flags.Construct)):
+            if not ( attr.has_flag(Flags.Construct) and attr.has_changed ):
                 continue
 
-            kwargs[attr.name] = attr.value
+            kwargs[attr.name] = attr._value
 
         self._uuid = self.simulation.factory(self.get_rtype(), **kwargs)
 
@@ -102,14 +102,11 @@ class NS3Base(ResourceManager):
     def _wait_rms(self):
         """ Returns True if dependent RMs are not yer READY, False otherwise"""
         for rm in self._rms_to_wait:
-            if rm and rm.state < ResourceState.READY:
+            if rm.state < ResourceState.READY:
                 return True
         return False
 
     def do_provision(self):
-        # TODO: create run dir for ns3 object !!!!
-        # self.simulation.node.mkdir(self.run_home)
-
         self._instantiate_object()
         self._connect_object()
         self._configure_object()
@@ -148,3 +145,23 @@ class NS3Base(ResourceManager):
     def state(self):
         return self._state
 
+    def get(self, name):
+        if self.state in [ResourceState.READY, ResourceState.STARTED] and \
+                self.has_flag(name, Flags.Reserved) and \
+                not self.has_flag(name, Flags.NoRead): 
+            return self.simulation.ns3_get(self.uuid, name)
+        else:
+            value = super(NS3Base, self).get(name)
+
+        return value
+
+    def set(self, name, value):
+        if self.state in [ResourceState.READY, ResourceState.STARTED] and \
+                self.has_flag(name, Flags.Reserved) and \
+                not (self.has_flag(Flags.NoWrite) or self.has_flag(name, Flags.Design)): 
+            self.simulation.ns3_set(self.uuid, name, value)
+        
+        value = super(NS3Base, self).set(name, value)
+
+        return value
+