X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fns3%2Fns3base.py;h=26632e0b49ced5c9f8877431567f39beceb0b45a;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=ba035969aa8bbe5c813e380942bc4e254c19e04e;hpb=ab601cf5f7775071e59c6bdbb3369889244f70a5;p=nepi.git diff --git a/src/nepi/resources/ns3/ns3base.py b/src/nepi/resources/ns3/ns3base.py index ba035969..26632e0b 100644 --- a/src/nepi/resources/ns3/ns3base.py +++ b/src/nepi/resources/ns3/ns3base.py @@ -3,9 +3,8 @@ # 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 @@ -18,19 +17,21 @@ # Author: Alina Quereilhac from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay - + ResourceState from nepi.execution.attribute import Flags +from nepi.execution.trace import TraceAttr @clsinit_copy class NS3Base(ResourceManager): _rtype = "abstract::ns3::Object" - _backend_type = "ns3" + _platform = "ns3" def __init__(self, ec, guid): super(NS3Base, self).__init__(ec, guid) self._uuid = None self._connected = set() + self._trace_filename = dict() + self._node = None @property def connected(self): @@ -41,25 +42,39 @@ class NS3Base(ResourceManager): return self._uuid @property - def simulator(self): - # Ns3 RMs should be connected to the simulator through a ns3 node - node = self.node - if node: return node.simulator - return None - + def simulation(self): + return self.node.simulation + @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 not resolve trace %s. Did you enabled it?" % name) + return "" + + return self.simulation.trace(filename, attr, block, offset) @property - def others_to_wait(self): - others = set() + def _rms_to_wait(self): + """ Returns the collection of ns-3 RMs that this RM needs to + wait for before start + + This method should be overriden to wait for other ns-3 + objects to be deployed before proceeding with the deployment + + """ + rms = set() node = self.node - if node: others.add(node) - return others + if node: rms.add(node) + return rms def _instantiate_object(self): if self.uuid: @@ -67,12 +82,12 @@ 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.simulator.factory(self.get_rtype(), **kwargs) + self._uuid = self.simulation.factory(self.get_rtype(), **kwargs) def _configure_object(self): pass @@ -80,26 +95,17 @@ class NS3Base(ResourceManager): def _connect_object(self): node = self.node if node and node.uuid not in self.connected: - self.simulator.invoke(node.uuid, "AggregateObject", self.uuid) + self.simulation.invoke(node.uuid, "AggregateObject", self.uuid) self._connected.add(node.uuid) - def _wait_others(self): - """ Returns the collection of ns-3 RMs that this RM needs to - wait for before start - - This method should be overriden to wait for other ns-3 - objects to be deployed before proceeding with the deployment - - """ - for other in self.others_to_wait: - if other and other.state < ResourceState.READY: + def _wait_rms(self): + """ Returns True if dependent RMs are not yer READY, False otherwise""" + for rm in self._rms_to_wait: + if rm.state < ResourceState.READY: return True return False def do_provision(self): - # create run dir for ns3 object - # self.simulator.node.mkdir(self.run_home) - self._instantiate_object() self._connect_object() self._configure_object() @@ -109,37 +115,52 @@ class NS3Base(ResourceManager): super(NS3Base, self).do_provision() def do_deploy(self): - if not self.simulator or self.simulator.state < ResourceState.READY or \ - self._wait_others(): + if self._wait_rms(): self.debug("---- RESCHEDULING DEPLOY ----" ) - - # ccnd needs to wait until node is deployed and running - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: - # TODO: CREATE AND CONFIGURE NS-3 C++ OBJECT self.do_discover() self.do_provision() - self.debug("----- READY ---- ") self.set_ready() def do_start(self): if self.state == ResourceState.READY: - # No need to do anything, simulator.Run() will start every object + # No need to do anything, simulation.Run() will start every object self.info("Starting") self.set_started() else: - msg = " Failed " + msg = "Failed" self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) def do_stop(self): if self.state == ResourceState.STARTED: - # No need to do anything, simulator.Destroy() will stop every object - self.info("Stopping command '%s'" % command) + # No need to do anything, simulation.Destroy() will stop every object + self.info("Stopping") self.set_stopped() @property 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 +