From ac866efb762875550bdc0c05d693e5eb026f435e Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Sat, 6 Dec 2014 15:56:13 +0100 Subject: [PATCH] Changing reschedule_delay internals --- src/nepi/execution/ec.py | 8 ++++++++ src/nepi/execution/resource.py | 18 +++++++++++------- src/nepi/resources/linux/application.py | 4 ++-- src/nepi/resources/linux/ccn/ccnapplication.py | 5 ++--- src/nepi/resources/linux/ccn/ccncat.py | 5 ++--- src/nepi/resources/linux/ccn/ccncontent.py | 4 ++-- src/nepi/resources/linux/ccn/ccnd.py | 4 ++-- src/nepi/resources/linux/ccn/ccnpeek.py | 5 ++--- src/nepi/resources/linux/ccn/ccnping.py | 4 ++-- src/nepi/resources/linux/ccn/ccnpingserver.py | 2 +- src/nepi/resources/linux/ccn/ccnpoke.py | 5 ++--- src/nepi/resources/linux/ccn/ccnr.py | 4 ++-- src/nepi/resources/linux/ccn/fibentry.py | 4 ++-- src/nepi/resources/linux/gretunnel.py | 3 +-- src/nepi/resources/linux/interface.py | 6 +++--- src/nepi/resources/linux/node.py | 6 +++--- .../linux/ns3/ccn/ns3ccncatdceapplication.py | 2 +- .../linux/ns3/ccn/ns3ccndceapplication.py | 2 +- .../linux/ns3/ccn/ns3ccnddceapplication.py | 2 +- .../linux/ns3/ccn/ns3ccnpeekdceapplication.py | 2 +- .../linux/ns3/ccn/ns3ccnpokedceapplication.py | 3 +-- .../linux/ns3/ccn/ns3ccnrdceapplication.py | 2 +- .../linux/ns3/ccn/ns3fibentrydceapplication.py | 2 +- .../resources/linux/ns3/ns3dceapplication.py | 2 +- .../linux/ns3/ns3pingdceapplication.py | 2 +- src/nepi/resources/linux/ns3/ns3simulation.py | 4 ++-- src/nepi/resources/linux/tap.py | 7 +++---- src/nepi/resources/linux/tunnel.py | 5 ++--- src/nepi/resources/linux/udptest.py | 3 +-- src/nepi/resources/linux/udptunnel.py | 3 +-- .../resources/ns3/classes/aarf_wifi_manager.py | 2 +- .../ns3/classes/aarfcd_wifi_manager.py | 2 +- .../resources/ns3/classes/adhoc_wifi_mac.py | 2 +- .../ns3/classes/aloha_noack_net_device.py | 2 +- .../resources/ns3/classes/amrr_wifi_manager.py | 2 +- src/nepi/resources/ns3/classes/ap_wifi_mac.py | 2 +- .../resources/ns3/classes/arf_wifi_manager.py | 2 +- .../resources/ns3/classes/arp_l3protocol.py | 2 +- .../ns3/classes/base_station_net_device.py | 2 +- .../ns3/classes/binary_error_model.py | 2 +- .../ns3/classes/binary_error_sixlow_model.py | 2 +- .../resources/ns3/classes/bridge_channel.py | 2 +- .../resources/ns3/classes/bridge_net_device.py | 2 +- .../ns3/classes/bulk_send_application.py | 2 +- .../resources/ns3/classes/burst_error_model.py | 2 +- .../resources/ns3/classes/cara_wifi_manager.py | 2 +- .../constant_acceleration_mobility_model.py | 2 +- .../constant_position_mobility_model.py | 2 +- .../ns3/classes/constant_rate_wifi_manager.py | 2 +- .../constant_speed_propagation_delay_model.py | 2 +- .../constant_velocity_mobility_model.py | 2 +- .../classes/cost231propagation_loss_model.py | 2 +- src/nepi/resources/ns3/classes/csma_channel.py | 2 +- .../resources/ns3/classes/csma_net_device.py | 2 +- .../resources/ns3/classes/dce_application.py | 2 +- .../resources/ns3/classes/drop_tail_queue.py | 2 +- .../resources/ns3/classes/dsrdsr_routing.py | 2 +- .../resources/ns3/classes/emu_net_device.py | 2 +- .../resources/ns3/classes/error_channel.py | 2 +- .../ns3/classes/error_channel_sixlow.py | 2 +- .../resources/ns3/classes/error_net_device.py | 2 +- .../resources/ns3/classes/fd_net_device.py | 2 +- .../ns3/classes/fixed_rss_loss_model.py | 2 +- .../classes/friis_propagation_loss_model.py | 2 +- .../ns3/classes/gauss_markov_mobility_model.py | 2 +- .../ns3/classes/hierarchical_mobility_model.py | 2 +- .../hybrid_buildings_propagation_loss_model.py | 2 +- .../resources/ns3/classes/icmpv4l4protocol.py | 2 +- .../resources/ns3/classes/icmpv6l4protocol.py | 2 +- .../ns3/classes/ideal_wifi_manager.py | 2 +- .../resources/ns3/classes/ipv4l3protocol.py | 2 +- .../itu_r1411los_propagation_loss_model.py | 2 +- ...nlos_over_rooftop_propagation_loss_model.py | 2 +- .../classes/jakes_propagation_loss_model.py | 2 +- .../kun2600mhz_propagation_loss_model.py | 2 +- .../resources/ns3/classes/list_error_model.py | 2 +- .../log_distance_propagation_loss_model.py | 2 +- .../ns3/classes/loopback_net_device.py | 2 +- .../ns3/classes/lr_wpan_net_device.py | 2 +- .../ns3/classes/lte_enb_net_device.py | 2 +- .../ns3/classes/lte_simple_net_device.py | 2 +- .../resources/ns3/classes/lte_ue_net_device.py | 2 +- .../classes/matrix_propagation_loss_model.py | 2 +- .../resources/ns3/classes/mesh_point_device.py | 2 +- .../ns3/classes/mesh_wifi_interface_mac.py | 2 +- .../ns3/classes/minstrel_wifi_manager.py | 2 +- .../classes/multi_model_spectrum_channel.py | 2 +- .../classes/nakagami_propagation_loss_model.py | 2 +- .../ns3/classes/nist_error_rate_model.py | 2 +- src/nepi/resources/ns3/classes/node.py | 2 +- .../classes/non_communicating_net_device.py | 2 +- src/nepi/resources/ns3/classes/ocb_wifi_mac.py | 2 +- .../oh_buildings_propagation_loss_model.py | 2 +- .../okumura_hata_propagation_loss_model.py | 2 +- .../ns3/classes/on_off_application.py | 2 +- .../resources/ns3/classes/onoe_wifi_manager.py | 2 +- src/nepi/resources/ns3/classes/packet_sink.py | 2 +- src/nepi/resources/ns3/classes/ping6.py | 2 +- .../ns3/classes/point_to_point_channel.py | 2 +- .../ns3/classes/point_to_point_net_device.py | 2 +- .../classes/point_to_point_remote_channel.py | 2 +- src/nepi/resources/ns3/classes/radvd.py | 2 +- .../random_direction2d_mobility_model.py | 2 +- .../classes/random_propagation_delay_model.py | 2 +- .../classes/random_propagation_loss_model.py | 2 +- .../classes/random_walk2d_mobility_model.py | 2 +- .../classes/random_waypoint_mobility_model.py | 2 +- .../classes/range_propagation_loss_model.py | 2 +- .../resources/ns3/classes/rate_error_model.py | 2 +- .../ns3/classes/receive_list_error_model.py | 2 +- src/nepi/resources/ns3/classes/red_queue.py | 2 +- .../resources/ns3/classes/rraa_wifi_manager.py | 2 +- .../resources/ns3/classes/simple_channel.py | 2 +- .../resources/ns3/classes/simple_net_device.py | 2 +- .../classes/single_model_spectrum_channel.py | 2 +- .../ns3/classes/six_low_pan_net_device.py | 2 +- src/nepi/resources/ns3/classes/sta_wifi_mac.py | 2 +- ...ady_state_random_waypoint_mobility_model.py | 2 +- .../classes/subscriber_station_net_device.py | 2 +- src/nepi/resources/ns3/classes/tap_bridge.py | 2 +- .../resources/ns3/classes/tcp_l4protocol.py | 2 +- ...hree_log_distance_propagation_loss_model.py | 2 +- .../two_ray_ground_propagation_loss_model.py | 2 +- src/nepi/resources/ns3/classes/uan_channel.py | 2 +- src/nepi/resources/ns3/classes/udp_client.py | 2 +- .../resources/ns3/classes/udp_echo_client.py | 2 +- .../resources/ns3/classes/udp_echo_server.py | 2 +- .../resources/ns3/classes/udp_l4protocol.py | 2 +- src/nepi/resources/ns3/classes/udp_server.py | 2 +- .../resources/ns3/classes/udp_trace_client.py | 2 +- src/nepi/resources/ns3/classes/v4ping.py | 2 +- .../ns3/classes/virtual_net_device.py | 2 +- .../ns3/classes/waypoint_mobility_model.py | 2 +- .../resources/ns3/classes/wifi_net_device.py | 2 +- .../ns3/classes/yans_error_rate_model.py | 2 +- .../resources/ns3/classes/yans_wifi_channel.py | 2 +- .../resources/ns3/classes/yans_wifi_phy.py | 2 +- src/nepi/resources/ns3/ns3application.py | 5 ++--- src/nepi/resources/ns3/ns3base.py | 4 ++-- src/nepi/resources/ns3/ns3ccndceapplication.py | 2 +- src/nepi/resources/ns3/ns3dceapplication.py | 4 ++-- .../templates/resource_manager_template.txt | 2 +- src/nepi/resources/omf/application.py | 4 ++-- src/nepi/resources/omf/channel.py | 2 +- src/nepi/resources/omf/interface.py | 10 +++++----- src/nepi/resources/omf/node.py | 6 +++--- src/nepi/resources/omf/omf_resource.py | 2 +- src/nepi/resources/omf/wilabt_node.py | 2 +- src/nepi/resources/planetlab/node.py | 2 +- .../resources/planetlab/openvswitch/ovs.py | 6 ++---- .../resources/planetlab/openvswitch/ovsport.py | 6 ++---- src/nepi/resources/planetlab/sfa_node.py | 2 +- src/nepi/resources/planetlab/tap.py | 7 +++---- src/nepi/resources/planetlab/vroute.py | 5 ++--- 154 files changed, 204 insertions(+), 209 deletions(-) diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py index 0c92cb14..427eb42a 100644 --- a/src/nepi/execution/ec.py +++ b/src/nepi/execution/ec.py @@ -278,6 +278,14 @@ class ExperimentController(object): """ return self._logger + @property + def fm(self): + """ Returns the failure manager + + """ + + return self.fm + @property def failure_level(self): """ Returns the level of FAILURE of th experiment diff --git a/src/nepi/execution/resource.py b/src/nepi/execution/resource.py index 0f75e9a8..d868c262 100644 --- a/src/nepi/execution/resource.py +++ b/src/nepi/execution/resource.py @@ -31,8 +31,6 @@ import sys import threading import weakref -reschedule_delay = "0.5s" - class ResourceAction: """ Action that a user can order to a Resource Manager @@ -142,6 +140,7 @@ class ResourceManager(Logger): _traces = None _help = None _backend = None + _reschedule_delay = "0.5s" @classmethod def _register_attribute(cls, attr): @@ -422,6 +421,11 @@ class ResourceManager(Logger): """ Get the current state of the RM """ return self._state + @property + def reschedule_delay(self): + """ Returns default reschedule delay """ + return self._reschedule_delay + def log_message(self, msg): """ Returns the log message formatted with added information. @@ -784,7 +788,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay # check state and time elapsed on all RMs for guid in group: @@ -853,7 +857,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if set conditions are met @@ -878,7 +882,7 @@ class ResourceManager(Logger): #import pdb;pdb.set_trace() reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if conditions to start are met @@ -920,7 +924,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if conditions to stop are met if self.ec.abort: @@ -953,7 +957,7 @@ class ResourceManager(Logger): """ reschedule = False - delay = reschedule_delay + delay = self.reschedule_delay ## evaluate if conditions to deploy are met if self.ec.abort: diff --git a/src/nepi/resources/linux/application.py b/src/nepi/resources/linux/application.py index 35a78849..00cd6c77 100644 --- a/src/nepi/resources/linux/application.py +++ b/src/nepi/resources/linux/application.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.node import LinuxNode from nepi.util.sshfuncs import ProcStatus from nepi.util.timefuncs import tnow, tdiffsec @@ -527,7 +527,7 @@ class LinuxApplication(ResourceManager): node = self.node if not node or node.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: command = self.get("command") or "" self.info("Deploying command '%s' " % command) diff --git a/src/nepi/resources/linux/ccn/ccnapplication.py b/src/nepi/resources/linux/ccn/ccnapplication.py index 49b2bdc5..e56fdee7 100644 --- a/src/nepi/resources/linux/ccn/ccnapplication.py +++ b/src/nepi/resources/linux/ccn/ccnapplication.py @@ -17,8 +17,7 @@ # # Author: Alina Quereilhac -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnd import LinuxCCND @@ -46,7 +45,7 @@ class LinuxCCNApplication(LinuxApplication): def do_deploy(self): if not self.ccnd or self.ccnd.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: command = self.get("command") or "" diff --git a/src/nepi/resources/linux/ccn/ccncat.py b/src/nepi/resources/linux/ccn/ccncat.py index f5eb2690..f0f1beac 100644 --- a/src/nepi/resources/linux/ccn/ccncat.py +++ b/src/nepi/resources/linux/ccn/ccncat.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication import os @@ -48,7 +47,7 @@ class LinuxCCNCat(LinuxCCNApplication): def do_deploy(self): if not self.ccnd or self.ccnd.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: command = self.get("command") if not command: diff --git a/src/nepi/resources/linux/ccn/ccncontent.py b/src/nepi/resources/linux/ccn/ccncontent.py index c7ce3bf8..f75f0a03 100644 --- a/src/nepi/resources/linux/ccn/ccncontent.py +++ b/src/nepi/resources/linux/ccn/ccncontent.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import clsinit_copy, ResourceState, \ - ResourceAction, reschedule_delay + ResourceAction from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnr import LinuxCCNR from nepi.util.timefuncs import tnow @@ -77,7 +77,7 @@ class LinuxCCNContent(LinuxApplication): self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) # ccnr needs to wait until ccnd is deployed and running - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: if not self.get("command"): self.set("command", self._start_command) diff --git a/src/nepi/resources/linux/ccn/ccnd.py b/src/nepi/resources/linux/ccn/ccnd.py index 1fc8979b..cbb751c1 100644 --- a/src/nepi/resources/linux/ccn/ccnd.py +++ b/src/nepi/resources/linux/ccn/ccnd.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.node import OSType from nepi.util.timefuncs import tnow, tdiffsec @@ -141,7 +141,7 @@ class LinuxCCND(LinuxApplication): self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) # 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: if not self.get("command"): self.set("command", self._start_command) diff --git a/src/nepi/resources/linux/ccn/ccnpeek.py b/src/nepi/resources/linux/ccn/ccnpeek.py index b1deeca6..1f1338ce 100644 --- a/src/nepi/resources/linux/ccn/ccnpeek.py +++ b/src/nepi/resources/linux/ccn/ccnpeek.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication import os @@ -43,7 +42,7 @@ class LinuxCCNPeek(LinuxCCNApplication): def do_deploy(self): if not self.ccnd or self.ccnd.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: command = self.get("command") if not command: diff --git a/src/nepi/resources/linux/ccn/ccnping.py b/src/nepi/resources/linux/ccn/ccnping.py index cbe599e1..978ec044 100644 --- a/src/nepi/resources/linux/ccn/ccnping.py +++ b/src/nepi/resources/linux/ccn/ccnping.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.ccn.ccnpingserver import LinuxCCNPingServer from nepi.util.timefuncs import tnow, tdiffsec @@ -70,7 +70,7 @@ class LinuxCCNPing(LinuxCCNPingServer): self.ccnpingserver.state < ResourceState.STARTED: self.debug("---- RESCHEDULING START---- ccnpingserver state %s " % \ self.ccnpingserver.state ) - self.ec.schedule(reschedule_delay, self.start) + self.ec.schedule(self.reschedule_delay, self.start) else: super(LinuxCCNPing, self).do_start() diff --git a/src/nepi/resources/linux/ccn/ccnpingserver.py b/src/nepi/resources/linux/ccn/ccnpingserver.py index 865b104c..cc593737 100644 --- a/src/nepi/resources/linux/ccn/ccnpingserver.py +++ b/src/nepi/resources/linux/ccn/ccnpingserver.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication from nepi.util.timefuncs import tnow, tdiffsec diff --git a/src/nepi/resources/linux/ccn/ccnpoke.py b/src/nepi/resources/linux/ccn/ccnpoke.py index 6fa5a2bf..3511fdc1 100644 --- a/src/nepi/resources/linux/ccn/ccnpoke.py +++ b/src/nepi/resources/linux/ccn/ccnpoke.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication import os @@ -48,7 +47,7 @@ class LinuxCCNPoke(LinuxCCNApplication): def do_deploy(self): if not self.ccnd or self.ccnd.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: command = self.get("command") if not command: diff --git a/src/nepi/resources/linux/ccn/ccnr.py b/src/nepi/resources/linux/ccn/ccnr.py index 9ac5cce0..50421da9 100644 --- a/src/nepi/resources/linux/ccn/ccnr.py +++ b/src/nepi/resources/linux/ccn/ccnr.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import clsinit_copy, ResourceState, \ - ResourceAction, reschedule_delay + ResourceAction from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnd import LinuxCCND from nepi.util.timefuncs import tnow @@ -205,7 +205,7 @@ class LinuxCCNR(LinuxApplication): self.debug("---- RESCHEDULING DEPLOY ---- CCND state %s " % self.ccnd.state ) # ccnr needs to wait until ccnd is deployed and running - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: if not self.get("command"): self.set("command", self._start_command) diff --git a/src/nepi/resources/linux/ccn/fibentry.py b/src/nepi/resources/linux/ccn/fibentry.py index 4b7e9c48..13d9a1a8 100644 --- a/src/nepi/resources/linux/ccn/fibentry.py +++ b/src/nepi/resources/linux/ccn/fibentry.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import clsinit_copy, ResourceState, \ - ResourceAction, reschedule_delay + ResourceAction from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnd import LinuxCCND from nepi.util.timefuncs import tnow @@ -139,7 +139,7 @@ class LinuxFIBEntry(LinuxApplication): # Wait until associated ccnd is provisioned if not self.ccnd or self.ccnd.state < ResourceState.READY: # ccnr needs to wait until ccnd is deployed and running - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: if not self.get("ip"): host = self.get("host") diff --git a/src/nepi/resources/linux/gretunnel.py b/src/nepi/resources/linux/gretunnel.py index d69ac30f..087eb7a8 100644 --- a/src/nepi/resources/linux/gretunnel.py +++ b/src/nepi/resources/linux/gretunnel.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.tunnel import LinuxTunnel from nepi.util.sshfuncs import ProcStatus from nepi.util.timefuncs import tnow, tdiffsec diff --git a/src/nepi/resources/linux/interface.py b/src/nepi/resources/linux/interface.py index bb352e1a..01237d16 100644 --- a/src/nepi/resources/linux/interface.py +++ b/src/nepi/resources/linux/interface.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Types, Flags from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.node import LinuxNode from nepi.resources.linux.channel import LinuxChannel @@ -233,9 +233,9 @@ class LinuxInterface(ResourceManager): chan = self.channel if not node or node.state < ResourceState.PROVISIONED: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) elif not chan or chan.state < ResourceState.READY: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: # Verify if the interface exists in node. If not, configue # if yes, load existing configuration diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py index 62ada380..96c9acd4 100644 --- a/src/nepi/resources/linux/node.py +++ b/src/nepi/resources/linux/node.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux import rpmfuncs, debfuncs from nepi.util import sshfuncs, execfuncs from nepi.util.sshfuncs import ProcStatus @@ -396,7 +396,7 @@ class LinuxNode(ResourceManager): ifaces = self.get_connected(LinuxInterface.get_rtype()) for iface in ifaces: if iface.state < ResourceState.READY: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return super(LinuxNode, self).do_deploy() @@ -407,7 +407,7 @@ class LinuxNode(ResourceManager): # Node needs to wait until all associated RMs are released # before it can be released if rm.state != ResourceState.RELEASED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return tear_down = self.get("tearDown") diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccncatdceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccncatdceapplication.py index e7c37311..9904fe4a 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccncatdceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccncatdceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py index ef3e8a79..e72239a4 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.ns3.ns3ccndceapplication import NS3BaseCCNDceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py index 226acf07..a42bb5d9 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication import os diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py index cd7b0f60..feb17604 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py index daac2b57..e364c513 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ccn.ns3ccndceapplication \ import LinuxNS3CCNDceApplication diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py index a9a548d9..a3719ba0 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ccn/ns3fibentrydceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3fibentrydceapplication.py index 61378256..a9bae5cf 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3fibentrydceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3fibentrydceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ns3dceapplication.py b/src/nepi/resources/linux/ns3/ns3dceapplication.py index df24dbdb..9ad3692e 100644 --- a/src/nepi/resources/linux/ns3/ns3dceapplication.py +++ b/src/nepi/resources/linux/ns3/ns3dceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.ns3.ns3dceapplication import NS3BaseDceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py index 1f5a6781..99003ed6 100644 --- a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py +++ b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.ns3.ns3dceapplication import LinuxNS3DceApplication @clsinit_copy diff --git a/src/nepi/resources/linux/ns3/ns3simulation.py b/src/nepi/resources/linux/ns3/ns3simulation.py index cb5c6c58..61eae0ab 100644 --- a/src/nepi/resources/linux/ns3/ns3simulation.py +++ b/src/nepi/resources/linux/ns3/ns3simulation.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, ResourceFactory, reschedule_delay + ResourceState, ResourceFactory from nepi.resources.linux.application import LinuxApplication from nepi.util.timefuncs import tnow, tdiffsec from nepi.resources.ns3.ns3simulation import NS3Simulation @@ -257,7 +257,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation): self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) # 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: if not self.get("command"): self.set("command", self._start_command) diff --git a/src/nepi/resources/linux/tap.py b/src/nepi/resources/linux/tap.py index b93ee800..6477bd3d 100644 --- a/src/nepi/resources/linux/tap.py +++ b/src/nepi/resources/linux/tap.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.node import LinuxNode from nepi.util.timefuncs import tnow, tdiffsec @@ -176,7 +175,7 @@ class LinuxTap(LinuxApplication): def do_deploy(self): if not self.node or self.node.state < ResourceState.PROVISIONED: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: if not self.get("deviceName"): self.set("deviceName", "%s%d" % (self.vif_prefix, self.guid)) @@ -241,7 +240,7 @@ class LinuxTap(LinuxApplication): for rm in rms: if rm.state < ResourceState.STOPPED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return super(LinuxTap, self).do_release() diff --git a/src/nepi/resources/linux/tunnel.py b/src/nepi/resources/linux/tunnel.py index 8e0760d9..a8434423 100644 --- a/src/nepi/resources/linux/tunnel.py +++ b/src/nepi/resources/linux/tunnel.py @@ -17,8 +17,7 @@ # # Author: Alina Quereilhac -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.util.timefuncs import tnow, tdiffsec @@ -113,7 +112,7 @@ class LinuxTunnel(LinuxApplication): def do_deploy(self): if (not self.endpoint1 or self.endpoint1.state < ResourceState.READY) or \ (not self.endpoint2 or self.endpoint2.state < ResourceState.READY): - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: self.do_discover() self.do_provision() diff --git a/src/nepi/resources/linux/udptest.py b/src/nepi/resources/linux/udptest.py index 46accbc3..857ea374 100644 --- a/src/nepi/resources/linux/udptest.py +++ b/src/nepi/resources/linux/udptest.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.util.timefuncs import tnow diff --git a/src/nepi/resources/linux/udptunnel.py b/src/nepi/resources/linux/udptunnel.py index 1643b904..258fbbbc 100644 --- a/src/nepi/resources/linux/udptunnel.py +++ b/src/nepi/resources/linux/udptunnel.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.tunnel import LinuxTunnel from nepi.util.sshfuncs import ProcStatus from nepi.util.timefuncs import tnow, tdiffsec diff --git a/src/nepi/resources/ns3/classes/aarf_wifi_manager.py b/src/nepi/resources/ns3/classes/aarf_wifi_manager.py index d78d93de..e6bf0b6c 100644 --- a/src/nepi/resources/ns3/classes/aarf_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/aarf_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/aarfcd_wifi_manager.py b/src/nepi/resources/ns3/classes/aarfcd_wifi_manager.py index 57aa02fd..2ac02e8a 100644 --- a/src/nepi/resources/ns3/classes/aarfcd_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/aarfcd_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/adhoc_wifi_mac.py b/src/nepi/resources/ns3/classes/adhoc_wifi_mac.py index a53df077..1274abac 100644 --- a/src/nepi/resources/ns3/classes/adhoc_wifi_mac.py +++ b/src/nepi/resources/ns3/classes/adhoc_wifi_mac.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifimac import NS3BaseWifiMac @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/aloha_noack_net_device.py b/src/nepi/resources/ns3/classes/aloha_noack_net_device.py index b45b431f..2094b8a8 100644 --- a/src/nepi/resources/ns3/classes/aloha_noack_net_device.py +++ b/src/nepi/resources/ns3/classes/aloha_noack_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/amrr_wifi_manager.py b/src/nepi/resources/ns3/classes/amrr_wifi_manager.py index 99c1f9ae..4a911e7e 100644 --- a/src/nepi/resources/ns3/classes/amrr_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/amrr_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/ap_wifi_mac.py b/src/nepi/resources/ns3/classes/ap_wifi_mac.py index 8802aa70..f97e40c7 100644 --- a/src/nepi/resources/ns3/classes/ap_wifi_mac.py +++ b/src/nepi/resources/ns3/classes/ap_wifi_mac.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifimac import NS3BaseWifiMac @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/arf_wifi_manager.py b/src/nepi/resources/ns3/classes/arf_wifi_manager.py index 577d0911..ac6e0782 100644 --- a/src/nepi/resources/ns3/classes/arf_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/arf_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/arp_l3protocol.py b/src/nepi/resources/ns3/classes/arp_l3protocol.py index d027d524..d6e18765 100644 --- a/src/nepi/resources/ns3/classes/arp_l3protocol.py +++ b/src/nepi/resources/ns3/classes/arp_l3protocol.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3arpl3protocol import NS3BaseArpL3Protocol @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/base_station_net_device.py b/src/nepi/resources/ns3/classes/base_station_net_device.py index c0130be1..5c3a4bb5 100644 --- a/src/nepi/resources/ns3/classes/base_station_net_device.py +++ b/src/nepi/resources/ns3/classes/base_station_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/binary_error_model.py b/src/nepi/resources/ns3/classes/binary_error_model.py index 9b6b2b80..4287a66e 100644 --- a/src/nepi/resources/ns3/classes/binary_error_model.py +++ b/src/nepi/resources/ns3/classes/binary_error_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errormodel import NS3BaseErrorModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/binary_error_sixlow_model.py b/src/nepi/resources/ns3/classes/binary_error_sixlow_model.py index ba3f2417..20458e1d 100644 --- a/src/nepi/resources/ns3/classes/binary_error_sixlow_model.py +++ b/src/nepi/resources/ns3/classes/binary_error_sixlow_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errormodel import NS3BaseErrorModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/bridge_channel.py b/src/nepi/resources/ns3/classes/bridge_channel.py index 4075f54c..27176b6f 100644 --- a/src/nepi/resources/ns3/classes/bridge_channel.py +++ b/src/nepi/resources/ns3/classes/bridge_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/bridge_net_device.py b/src/nepi/resources/ns3/classes/bridge_net_device.py index d1313c49..012865b9 100644 --- a/src/nepi/resources/ns3/classes/bridge_net_device.py +++ b/src/nepi/resources/ns3/classes/bridge_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/bulk_send_application.py b/src/nepi/resources/ns3/classes/bulk_send_application.py index f7db2e92..1724ccdf 100644 --- a/src/nepi/resources/ns3/classes/bulk_send_application.py +++ b/src/nepi/resources/ns3/classes/bulk_send_application.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/burst_error_model.py b/src/nepi/resources/ns3/classes/burst_error_model.py index bac2cb0f..929134c5 100644 --- a/src/nepi/resources/ns3/classes/burst_error_model.py +++ b/src/nepi/resources/ns3/classes/burst_error_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errormodel import NS3BaseErrorModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/cara_wifi_manager.py b/src/nepi/resources/ns3/classes/cara_wifi_manager.py index 35df2557..3d9e3b4b 100644 --- a/src/nepi/resources/ns3/classes/cara_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/cara_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/constant_acceleration_mobility_model.py b/src/nepi/resources/ns3/classes/constant_acceleration_mobility_model.py index 662f9e7e..2348f7c9 100644 --- a/src/nepi/resources/ns3/classes/constant_acceleration_mobility_model.py +++ b/src/nepi/resources/ns3/classes/constant_acceleration_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/constant_position_mobility_model.py b/src/nepi/resources/ns3/classes/constant_position_mobility_model.py index 03ec389e..73298059 100644 --- a/src/nepi/resources/ns3/classes/constant_position_mobility_model.py +++ b/src/nepi/resources/ns3/classes/constant_position_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/constant_rate_wifi_manager.py b/src/nepi/resources/ns3/classes/constant_rate_wifi_manager.py index 7d81a743..d8a54506 100644 --- a/src/nepi/resources/ns3/classes/constant_rate_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/constant_rate_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/constant_speed_propagation_delay_model.py b/src/nepi/resources/ns3/classes/constant_speed_propagation_delay_model.py index 9722bd48..10db0847 100644 --- a/src/nepi/resources/ns3/classes/constant_speed_propagation_delay_model.py +++ b/src/nepi/resources/ns3/classes/constant_speed_propagation_delay_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationdelaymodel import NS3BasePropagationDelayModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/constant_velocity_mobility_model.py b/src/nepi/resources/ns3/classes/constant_velocity_mobility_model.py index e0dfd0f5..b243bed6 100644 --- a/src/nepi/resources/ns3/classes/constant_velocity_mobility_model.py +++ b/src/nepi/resources/ns3/classes/constant_velocity_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/cost231propagation_loss_model.py b/src/nepi/resources/ns3/classes/cost231propagation_loss_model.py index 2bbbe3da..3975aaa8 100644 --- a/src/nepi/resources/ns3/classes/cost231propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/cost231propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/csma_channel.py b/src/nepi/resources/ns3/classes/csma_channel.py index d839f328..88cfcf78 100644 --- a/src/nepi/resources/ns3/classes/csma_channel.py +++ b/src/nepi/resources/ns3/classes/csma_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/csma_net_device.py b/src/nepi/resources/ns3/classes/csma_net_device.py index b368b27b..d15b5e2b 100644 --- a/src/nepi/resources/ns3/classes/csma_net_device.py +++ b/src/nepi/resources/ns3/classes/csma_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/dce_application.py b/src/nepi/resources/ns3/classes/dce_application.py index 9b42c54e..71fd60d6 100644 --- a/src/nepi/resources/ns3/classes/dce_application.py +++ b/src/nepi/resources/ns3/classes/dce_application.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3dceapplication import NS3BaseDceApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/drop_tail_queue.py b/src/nepi/resources/ns3/classes/drop_tail_queue.py index 550d925e..b0f1e402 100644 --- a/src/nepi/resources/ns3/classes/drop_tail_queue.py +++ b/src/nepi/resources/ns3/classes/drop_tail_queue.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3queue import NS3BaseQueue @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/dsrdsr_routing.py b/src/nepi/resources/ns3/classes/dsrdsr_routing.py index c8d88bd7..00fe9ce0 100644 --- a/src/nepi/resources/ns3/classes/dsrdsr_routing.py +++ b/src/nepi/resources/ns3/classes/dsrdsr_routing.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3base import NS3Base @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/emu_net_device.py b/src/nepi/resources/ns3/classes/emu_net_device.py index 09a81c5b..583a76e1 100644 --- a/src/nepi/resources/ns3/classes/emu_net_device.py +++ b/src/nepi/resources/ns3/classes/emu_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/error_channel.py b/src/nepi/resources/ns3/classes/error_channel.py index 1a9e2adc..7a1d89be 100644 --- a/src/nepi/resources/ns3/classes/error_channel.py +++ b/src/nepi/resources/ns3/classes/error_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/error_channel_sixlow.py b/src/nepi/resources/ns3/classes/error_channel_sixlow.py index 3e679151..ba16f653 100644 --- a/src/nepi/resources/ns3/classes/error_channel_sixlow.py +++ b/src/nepi/resources/ns3/classes/error_channel_sixlow.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/error_net_device.py b/src/nepi/resources/ns3/classes/error_net_device.py index 7b59ba8b..c8c2ee1d 100644 --- a/src/nepi/resources/ns3/classes/error_net_device.py +++ b/src/nepi/resources/ns3/classes/error_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/fd_net_device.py b/src/nepi/resources/ns3/classes/fd_net_device.py index 4ba2a9fd..c28d351f 100644 --- a/src/nepi/resources/ns3/classes/fd_net_device.py +++ b/src/nepi/resources/ns3/classes/fd_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3fdnetdevice import NS3BaseFdNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/fixed_rss_loss_model.py b/src/nepi/resources/ns3/classes/fixed_rss_loss_model.py index 518b4c51..88c67936 100644 --- a/src/nepi/resources/ns3/classes/fixed_rss_loss_model.py +++ b/src/nepi/resources/ns3/classes/fixed_rss_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/friis_propagation_loss_model.py b/src/nepi/resources/ns3/classes/friis_propagation_loss_model.py index f8bedb44..f23198fd 100644 --- a/src/nepi/resources/ns3/classes/friis_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/friis_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/gauss_markov_mobility_model.py b/src/nepi/resources/ns3/classes/gauss_markov_mobility_model.py index 1d380a76..24657d48 100644 --- a/src/nepi/resources/ns3/classes/gauss_markov_mobility_model.py +++ b/src/nepi/resources/ns3/classes/gauss_markov_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/hierarchical_mobility_model.py b/src/nepi/resources/ns3/classes/hierarchical_mobility_model.py index 97ce062b..accb4d71 100644 --- a/src/nepi/resources/ns3/classes/hierarchical_mobility_model.py +++ b/src/nepi/resources/ns3/classes/hierarchical_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/hybrid_buildings_propagation_loss_model.py b/src/nepi/resources/ns3/classes/hybrid_buildings_propagation_loss_model.py index 26c12a9e..13c9ad60 100644 --- a/src/nepi/resources/ns3/classes/hybrid_buildings_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/hybrid_buildings_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/icmpv4l4protocol.py b/src/nepi/resources/ns3/classes/icmpv4l4protocol.py index 202137fa..1189c367 100644 --- a/src/nepi/resources/ns3/classes/icmpv4l4protocol.py +++ b/src/nepi/resources/ns3/classes/icmpv4l4protocol.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3icmpv4l4protocol import NS3BaseIcmpv4L4Protocol @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/icmpv6l4protocol.py b/src/nepi/resources/ns3/classes/icmpv6l4protocol.py index 23e37b12..ecdc3437 100644 --- a/src/nepi/resources/ns3/classes/icmpv6l4protocol.py +++ b/src/nepi/resources/ns3/classes/icmpv6l4protocol.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3base import NS3Base @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/ideal_wifi_manager.py b/src/nepi/resources/ns3/classes/ideal_wifi_manager.py index 93b19b7b..60fd2740 100644 --- a/src/nepi/resources/ns3/classes/ideal_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/ideal_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/ipv4l3protocol.py b/src/nepi/resources/ns3/classes/ipv4l3protocol.py index 8c7228d9..28590662 100644 --- a/src/nepi/resources/ns3/classes/ipv4l3protocol.py +++ b/src/nepi/resources/ns3/classes/ipv4l3protocol.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3ipv4l3protocol import NS3BaseIpv4L3Protocol @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/itu_r1411los_propagation_loss_model.py b/src/nepi/resources/ns3/classes/itu_r1411los_propagation_loss_model.py index ffac6539..e2af0ade 100644 --- a/src/nepi/resources/ns3/classes/itu_r1411los_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/itu_r1411los_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/itu_r1411nlos_over_rooftop_propagation_loss_model.py b/src/nepi/resources/ns3/classes/itu_r1411nlos_over_rooftop_propagation_loss_model.py index 8496fcde..cfb526f2 100644 --- a/src/nepi/resources/ns3/classes/itu_r1411nlos_over_rooftop_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/itu_r1411nlos_over_rooftop_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/jakes_propagation_loss_model.py b/src/nepi/resources/ns3/classes/jakes_propagation_loss_model.py index af4729c6..0b8febf1 100644 --- a/src/nepi/resources/ns3/classes/jakes_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/jakes_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/kun2600mhz_propagation_loss_model.py b/src/nepi/resources/ns3/classes/kun2600mhz_propagation_loss_model.py index 925f3cd2..0a36ae3f 100644 --- a/src/nepi/resources/ns3/classes/kun2600mhz_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/kun2600mhz_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/list_error_model.py b/src/nepi/resources/ns3/classes/list_error_model.py index a607117f..37ee665c 100644 --- a/src/nepi/resources/ns3/classes/list_error_model.py +++ b/src/nepi/resources/ns3/classes/list_error_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errormodel import NS3BaseErrorModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/log_distance_propagation_loss_model.py b/src/nepi/resources/ns3/classes/log_distance_propagation_loss_model.py index 5f3c5fd6..cecbbb8d 100644 --- a/src/nepi/resources/ns3/classes/log_distance_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/log_distance_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/loopback_net_device.py b/src/nepi/resources/ns3/classes/loopback_net_device.py index a9e61620..8ec7c221 100644 --- a/src/nepi/resources/ns3/classes/loopback_net_device.py +++ b/src/nepi/resources/ns3/classes/loopback_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/lr_wpan_net_device.py b/src/nepi/resources/ns3/classes/lr_wpan_net_device.py index 0a74fffe..3cb48885 100644 --- a/src/nepi/resources/ns3/classes/lr_wpan_net_device.py +++ b/src/nepi/resources/ns3/classes/lr_wpan_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/lte_enb_net_device.py b/src/nepi/resources/ns3/classes/lte_enb_net_device.py index 0184c10e..fa76e145 100644 --- a/src/nepi/resources/ns3/classes/lte_enb_net_device.py +++ b/src/nepi/resources/ns3/classes/lte_enb_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/lte_simple_net_device.py b/src/nepi/resources/ns3/classes/lte_simple_net_device.py index b38a7e9d..2a39f88a 100644 --- a/src/nepi/resources/ns3/classes/lte_simple_net_device.py +++ b/src/nepi/resources/ns3/classes/lte_simple_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/lte_ue_net_device.py b/src/nepi/resources/ns3/classes/lte_ue_net_device.py index ba6ed701..5b1c4d09 100644 --- a/src/nepi/resources/ns3/classes/lte_ue_net_device.py +++ b/src/nepi/resources/ns3/classes/lte_ue_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/matrix_propagation_loss_model.py b/src/nepi/resources/ns3/classes/matrix_propagation_loss_model.py index 4d14e14f..4823eaba 100644 --- a/src/nepi/resources/ns3/classes/matrix_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/matrix_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/mesh_point_device.py b/src/nepi/resources/ns3/classes/mesh_point_device.py index 945952a8..a1e970bb 100644 --- a/src/nepi/resources/ns3/classes/mesh_point_device.py +++ b/src/nepi/resources/ns3/classes/mesh_point_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/mesh_wifi_interface_mac.py b/src/nepi/resources/ns3/classes/mesh_wifi_interface_mac.py index b7360814..9715df85 100644 --- a/src/nepi/resources/ns3/classes/mesh_wifi_interface_mac.py +++ b/src/nepi/resources/ns3/classes/mesh_wifi_interface_mac.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifimac import NS3BaseWifiMac @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/minstrel_wifi_manager.py b/src/nepi/resources/ns3/classes/minstrel_wifi_manager.py index 2ebdc02e..2d998b9d 100644 --- a/src/nepi/resources/ns3/classes/minstrel_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/minstrel_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/multi_model_spectrum_channel.py b/src/nepi/resources/ns3/classes/multi_model_spectrum_channel.py index c8d6e64d..6bd1fab0 100644 --- a/src/nepi/resources/ns3/classes/multi_model_spectrum_channel.py +++ b/src/nepi/resources/ns3/classes/multi_model_spectrum_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/nakagami_propagation_loss_model.py b/src/nepi/resources/ns3/classes/nakagami_propagation_loss_model.py index 371a8952..82d81090 100644 --- a/src/nepi/resources/ns3/classes/nakagami_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/nakagami_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/nist_error_rate_model.py b/src/nepi/resources/ns3/classes/nist_error_rate_model.py index 5a433b4f..d84d9f79 100644 --- a/src/nepi/resources/ns3/classes/nist_error_rate_model.py +++ b/src/nepi/resources/ns3/classes/nist_error_rate_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errorratemodel import NS3BaseErrorRateModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/node.py b/src/nepi/resources/ns3/classes/node.py index f7581927..b9782dc9 100644 --- a/src/nepi/resources/ns3/classes/node.py +++ b/src/nepi/resources/ns3/classes/node.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3node import NS3BaseNode @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/non_communicating_net_device.py b/src/nepi/resources/ns3/classes/non_communicating_net_device.py index 4fb08e7c..9c102fa3 100644 --- a/src/nepi/resources/ns3/classes/non_communicating_net_device.py +++ b/src/nepi/resources/ns3/classes/non_communicating_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/ocb_wifi_mac.py b/src/nepi/resources/ns3/classes/ocb_wifi_mac.py index cdb1ebc1..b171b142 100644 --- a/src/nepi/resources/ns3/classes/ocb_wifi_mac.py +++ b/src/nepi/resources/ns3/classes/ocb_wifi_mac.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifimac import NS3BaseWifiMac @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/oh_buildings_propagation_loss_model.py b/src/nepi/resources/ns3/classes/oh_buildings_propagation_loss_model.py index 530d9ae6..41063f79 100644 --- a/src/nepi/resources/ns3/classes/oh_buildings_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/oh_buildings_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/okumura_hata_propagation_loss_model.py b/src/nepi/resources/ns3/classes/okumura_hata_propagation_loss_model.py index ec267774..9f1854e1 100644 --- a/src/nepi/resources/ns3/classes/okumura_hata_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/okumura_hata_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/on_off_application.py b/src/nepi/resources/ns3/classes/on_off_application.py index ffae8e9f..f5fb399a 100644 --- a/src/nepi/resources/ns3/classes/on_off_application.py +++ b/src/nepi/resources/ns3/classes/on_off_application.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/onoe_wifi_manager.py b/src/nepi/resources/ns3/classes/onoe_wifi_manager.py index f01a090c..0a51da88 100644 --- a/src/nepi/resources/ns3/classes/onoe_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/onoe_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/packet_sink.py b/src/nepi/resources/ns3/classes/packet_sink.py index 701c8d0b..468c67d0 100644 --- a/src/nepi/resources/ns3/classes/packet_sink.py +++ b/src/nepi/resources/ns3/classes/packet_sink.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/ping6.py b/src/nepi/resources/ns3/classes/ping6.py index c1af6438..4ca26a1c 100644 --- a/src/nepi/resources/ns3/classes/ping6.py +++ b/src/nepi/resources/ns3/classes/ping6.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/point_to_point_channel.py b/src/nepi/resources/ns3/classes/point_to_point_channel.py index e943fc76..3bbdde41 100644 --- a/src/nepi/resources/ns3/classes/point_to_point_channel.py +++ b/src/nepi/resources/ns3/classes/point_to_point_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/point_to_point_net_device.py b/src/nepi/resources/ns3/classes/point_to_point_net_device.py index 699a7851..a135cb2b 100644 --- a/src/nepi/resources/ns3/classes/point_to_point_net_device.py +++ b/src/nepi/resources/ns3/classes/point_to_point_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/point_to_point_remote_channel.py b/src/nepi/resources/ns3/classes/point_to_point_remote_channel.py index 2c3ccf1f..187c05c9 100644 --- a/src/nepi/resources/ns3/classes/point_to_point_remote_channel.py +++ b/src/nepi/resources/ns3/classes/point_to_point_remote_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/radvd.py b/src/nepi/resources/ns3/classes/radvd.py index d9ac1870..eaeacddd 100644 --- a/src/nepi/resources/ns3/classes/radvd.py +++ b/src/nepi/resources/ns3/classes/radvd.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/random_direction2d_mobility_model.py b/src/nepi/resources/ns3/classes/random_direction2d_mobility_model.py index 6d2e75d5..7e9d339f 100644 --- a/src/nepi/resources/ns3/classes/random_direction2d_mobility_model.py +++ b/src/nepi/resources/ns3/classes/random_direction2d_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/random_propagation_delay_model.py b/src/nepi/resources/ns3/classes/random_propagation_delay_model.py index 30a5f29a..5f44f06d 100644 --- a/src/nepi/resources/ns3/classes/random_propagation_delay_model.py +++ b/src/nepi/resources/ns3/classes/random_propagation_delay_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationdelaymodel import NS3BasePropagationDelayModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/random_propagation_loss_model.py b/src/nepi/resources/ns3/classes/random_propagation_loss_model.py index 05f02289..3c6e414b 100644 --- a/src/nepi/resources/ns3/classes/random_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/random_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/random_walk2d_mobility_model.py b/src/nepi/resources/ns3/classes/random_walk2d_mobility_model.py index 3d5773bd..d954df5e 100644 --- a/src/nepi/resources/ns3/classes/random_walk2d_mobility_model.py +++ b/src/nepi/resources/ns3/classes/random_walk2d_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/random_waypoint_mobility_model.py b/src/nepi/resources/ns3/classes/random_waypoint_mobility_model.py index 6ca4a270..dfcc410a 100644 --- a/src/nepi/resources/ns3/classes/random_waypoint_mobility_model.py +++ b/src/nepi/resources/ns3/classes/random_waypoint_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/range_propagation_loss_model.py b/src/nepi/resources/ns3/classes/range_propagation_loss_model.py index 529e5204..50124003 100644 --- a/src/nepi/resources/ns3/classes/range_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/range_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/rate_error_model.py b/src/nepi/resources/ns3/classes/rate_error_model.py index 2d56a347..69ca7f1e 100644 --- a/src/nepi/resources/ns3/classes/rate_error_model.py +++ b/src/nepi/resources/ns3/classes/rate_error_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errormodel import NS3BaseErrorModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/receive_list_error_model.py b/src/nepi/resources/ns3/classes/receive_list_error_model.py index 2f1652c4..94436212 100644 --- a/src/nepi/resources/ns3/classes/receive_list_error_model.py +++ b/src/nepi/resources/ns3/classes/receive_list_error_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errormodel import NS3BaseErrorModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/red_queue.py b/src/nepi/resources/ns3/classes/red_queue.py index d68166e7..e245db2e 100644 --- a/src/nepi/resources/ns3/classes/red_queue.py +++ b/src/nepi/resources/ns3/classes/red_queue.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3queue import NS3BaseQueue @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/rraa_wifi_manager.py b/src/nepi/resources/ns3/classes/rraa_wifi_manager.py index bfae1062..50ed6701 100644 --- a/src/nepi/resources/ns3/classes/rraa_wifi_manager.py +++ b/src/nepi/resources/ns3/classes/rraa_wifi_manager.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiremotestationmanager import NS3BaseWifiRemoteStationManager @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/simple_channel.py b/src/nepi/resources/ns3/classes/simple_channel.py index 37a9c426..1aede900 100644 --- a/src/nepi/resources/ns3/classes/simple_channel.py +++ b/src/nepi/resources/ns3/classes/simple_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/simple_net_device.py b/src/nepi/resources/ns3/classes/simple_net_device.py index 293394aa..ce1365f2 100644 --- a/src/nepi/resources/ns3/classes/simple_net_device.py +++ b/src/nepi/resources/ns3/classes/simple_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/single_model_spectrum_channel.py b/src/nepi/resources/ns3/classes/single_model_spectrum_channel.py index 3328562f..12f604e4 100644 --- a/src/nepi/resources/ns3/classes/single_model_spectrum_channel.py +++ b/src/nepi/resources/ns3/classes/single_model_spectrum_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/six_low_pan_net_device.py b/src/nepi/resources/ns3/classes/six_low_pan_net_device.py index 842e20ea..f9ec851d 100644 --- a/src/nepi/resources/ns3/classes/six_low_pan_net_device.py +++ b/src/nepi/resources/ns3/classes/six_low_pan_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/sta_wifi_mac.py b/src/nepi/resources/ns3/classes/sta_wifi_mac.py index 650b8ca9..2b7da556 100644 --- a/src/nepi/resources/ns3/classes/sta_wifi_mac.py +++ b/src/nepi/resources/ns3/classes/sta_wifi_mac.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifimac import NS3BaseWifiMac @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/steady_state_random_waypoint_mobility_model.py b/src/nepi/resources/ns3/classes/steady_state_random_waypoint_mobility_model.py index 65b99b66..250a1919 100644 --- a/src/nepi/resources/ns3/classes/steady_state_random_waypoint_mobility_model.py +++ b/src/nepi/resources/ns3/classes/steady_state_random_waypoint_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/subscriber_station_net_device.py b/src/nepi/resources/ns3/classes/subscriber_station_net_device.py index 18441c22..dde62eaa 100644 --- a/src/nepi/resources/ns3/classes/subscriber_station_net_device.py +++ b/src/nepi/resources/ns3/classes/subscriber_station_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/tap_bridge.py b/src/nepi/resources/ns3/classes/tap_bridge.py index 8438d285..4b391189 100644 --- a/src/nepi/resources/ns3/classes/tap_bridge.py +++ b/src/nepi/resources/ns3/classes/tap_bridge.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/tcp_l4protocol.py b/src/nepi/resources/ns3/classes/tcp_l4protocol.py index ef21f8f8..5983e5bf 100644 --- a/src/nepi/resources/ns3/classes/tcp_l4protocol.py +++ b/src/nepi/resources/ns3/classes/tcp_l4protocol.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3base import NS3Base @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/three_log_distance_propagation_loss_model.py b/src/nepi/resources/ns3/classes/three_log_distance_propagation_loss_model.py index 620d904c..f09f4328 100644 --- a/src/nepi/resources/ns3/classes/three_log_distance_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/three_log_distance_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/two_ray_ground_propagation_loss_model.py b/src/nepi/resources/ns3/classes/two_ray_ground_propagation_loss_model.py index 0dfadb8c..b8cd1610 100644 --- a/src/nepi/resources/ns3/classes/two_ray_ground_propagation_loss_model.py +++ b/src/nepi/resources/ns3/classes/two_ray_ground_propagation_loss_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3propagationlossmodel import NS3BasePropagationLossModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/uan_channel.py b/src/nepi/resources/ns3/classes/uan_channel.py index 4683b789..c13edc07 100644 --- a/src/nepi/resources/ns3/classes/uan_channel.py +++ b/src/nepi/resources/ns3/classes/uan_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3channel import NS3BaseChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/udp_client.py b/src/nepi/resources/ns3/classes/udp_client.py index e242eb6d..7b813085 100644 --- a/src/nepi/resources/ns3/classes/udp_client.py +++ b/src/nepi/resources/ns3/classes/udp_client.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/udp_echo_client.py b/src/nepi/resources/ns3/classes/udp_echo_client.py index 9293b077..f888906f 100644 --- a/src/nepi/resources/ns3/classes/udp_echo_client.py +++ b/src/nepi/resources/ns3/classes/udp_echo_client.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/udp_echo_server.py b/src/nepi/resources/ns3/classes/udp_echo_server.py index cd73643c..6de5828f 100644 --- a/src/nepi/resources/ns3/classes/udp_echo_server.py +++ b/src/nepi/resources/ns3/classes/udp_echo_server.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/udp_l4protocol.py b/src/nepi/resources/ns3/classes/udp_l4protocol.py index c81c1621..f97701d6 100644 --- a/src/nepi/resources/ns3/classes/udp_l4protocol.py +++ b/src/nepi/resources/ns3/classes/udp_l4protocol.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3base import NS3Base @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/udp_server.py b/src/nepi/resources/ns3/classes/udp_server.py index 86b109b6..4121ccf8 100644 --- a/src/nepi/resources/ns3/classes/udp_server.py +++ b/src/nepi/resources/ns3/classes/udp_server.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/udp_trace_client.py b/src/nepi/resources/ns3/classes/udp_trace_client.py index 26bc7b53..5b80476c 100644 --- a/src/nepi/resources/ns3/classes/udp_trace_client.py +++ b/src/nepi/resources/ns3/classes/udp_trace_client.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/v4ping.py b/src/nepi/resources/ns3/classes/v4ping.py index c9a09587..c1c35be9 100644 --- a/src/nepi/resources/ns3/classes/v4ping.py +++ b/src/nepi/resources/ns3/classes/v4ping.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/virtual_net_device.py b/src/nepi/resources/ns3/classes/virtual_net_device.py index a57f3639..a2f5d09e 100644 --- a/src/nepi/resources/ns3/classes/virtual_net_device.py +++ b/src/nepi/resources/ns3/classes/virtual_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3netdevice import NS3BaseNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/waypoint_mobility_model.py b/src/nepi/resources/ns3/classes/waypoint_mobility_model.py index 116ab45a..f110f1ef 100644 --- a/src/nepi/resources/ns3/classes/waypoint_mobility_model.py +++ b/src/nepi/resources/ns3/classes/waypoint_mobility_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3mobilitymodel import NS3BaseMobilityModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/wifi_net_device.py b/src/nepi/resources/ns3/classes/wifi_net_device.py index 92dd859b..a5c11a2a 100644 --- a/src/nepi/resources/ns3/classes/wifi_net_device.py +++ b/src/nepi/resources/ns3/classes/wifi_net_device.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifinetdevice import NS3BaseWifiNetDevice @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/yans_error_rate_model.py b/src/nepi/resources/ns3/classes/yans_error_rate_model.py index 0e119dd5..375303a5 100644 --- a/src/nepi/resources/ns3/classes/yans_error_rate_model.py +++ b/src/nepi/resources/ns3/classes/yans_error_rate_model.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3errorratemodel import NS3BaseErrorRateModel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/yans_wifi_channel.py b/src/nepi/resources/ns3/classes/yans_wifi_channel.py index 314d391a..42192f6e 100644 --- a/src/nepi/resources/ns3/classes/yans_wifi_channel.py +++ b/src/nepi/resources/ns3/classes/yans_wifi_channel.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifichannel import NS3BaseWifiChannel @clsinit_copy diff --git a/src/nepi/resources/ns3/classes/yans_wifi_phy.py b/src/nepi/resources/ns3/classes/yans_wifi_phy.py index 2c6ad1c6..6bd392d6 100644 --- a/src/nepi/resources/ns3/classes/yans_wifi_phy.py +++ b/src/nepi/resources/ns3/classes/yans_wifi_phy.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.ns3.ns3wifiphy import NS3BaseWifiPhy @clsinit_copy diff --git a/src/nepi/resources/ns3/ns3application.py b/src/nepi/resources/ns3/ns3application.py index 302e1289..1007c5f4 100644 --- a/src/nepi/resources/ns3/ns3application.py +++ b/src/nepi/resources/ns3/ns3application.py @@ -17,8 +17,7 @@ # # Author: Alina Quereilhac -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.ns3.ns3base import NS3Base @clsinit_copy @@ -59,7 +58,7 @@ class NS3BaseApplication(NS3Base): def do_start(self): if self.simulation.state < ResourceState.STARTED: self.debug("---- RESCHEDULING START ----" ) - self.ec.schedule(reschedule_delay, self.start) + self.ec.schedule(self.reschedule_delay, self.start) else: super(NS3BaseApplication, self).do_start() self._start_time = self.simulation.start_time diff --git a/src/nepi/resources/ns3/ns3base.py b/src/nepi/resources/ns3/ns3base.py index ef345ff1..73ec178a 100644 --- a/src/nepi/resources/ns3/ns3base.py +++ b/src/nepi/resources/ns3/ns3base.py @@ -18,7 +18,7 @@ # 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 @@ -118,7 +118,7 @@ class NS3Base(ResourceManager): def do_deploy(self): if self._wait_rms(): self.debug("---- RESCHEDULING DEPLOY ----" ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: self.do_discover() self.do_provision() diff --git a/src/nepi/resources/ns3/ns3ccndceapplication.py b/src/nepi/resources/ns3/ns3ccndceapplication.py index 4d199c93..edacf8a1 100644 --- a/src/nepi/resources/ns3/ns3ccndceapplication.py +++ b/src/nepi/resources/ns3/ns3ccndceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.ns3.ns3dceapplication import NS3BaseDceApplication import os diff --git a/src/nepi/resources/ns3/ns3dceapplication.py b/src/nepi/resources/ns3/ns3dceapplication.py index c42e32b4..4b40ef93 100644 --- a/src/nepi/resources/ns3/ns3dceapplication.py +++ b/src/nepi/resources/ns3/ns3dceapplication.py @@ -18,7 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.ns3.ns3application import NS3BaseApplication from nepi.resources.ns3.ns3wrapper import SIMULATOR_UUID @@ -186,7 +186,7 @@ class NS3BaseDceApplication(NS3BaseApplication): def do_start(self): if self.simulation.state < ResourceState.STARTED: self.debug("---- RESCHEDULING START ----" ) - self.ec.schedule(reschedule_delay, self.start) + self.ec.schedule(self.reschedule_delay, self.start) else: self._configure_traces() super(NS3BaseApplication, self).do_start() diff --git a/src/nepi/resources/ns3/templates/resource_manager_template.txt b/src/nepi/resources/ns3/templates/resource_manager_template.txt index c3b6a582..8463ebb3 100644 --- a/src/nepi/resources/ns3/templates/resource_manager_template.txt +++ b/src/nepi/resources/ns3/templates/resource_manager_template.txt @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState @clsinit_copy diff --git a/src/nepi/resources/omf/application.py b/src/nepi/resources/omf/application.py index 7a87d2a0..0c4bc469 100644 --- a/src/nepi/resources/omf/application.py +++ b/src/nepi/resources/omf/application.py @@ -22,7 +22,7 @@ import os from nepi.util.timefuncs import tnow from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.execution.trace import Trace, TraceAttr from nepi.execution.attribute import Attribute, Flags from nepi.resources.omf.omf_resource import ResourceGateway, OMFResource @@ -182,7 +182,7 @@ class OMFApplication(OMFResource): if not self.node or self.node.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return ## For performance test diff --git a/src/nepi/resources/omf/channel.py b/src/nepi/resources/omf/channel.py index 7cda160a..e3e42cd6 100644 --- a/src/nepi/resources/omf/channel.py +++ b/src/nepi/resources/omf/channel.py @@ -20,7 +20,7 @@ from nepi.util.timefuncs import tnow from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.execution.attribute import Attribute, Flags from nepi.resources.omf.omf_resource import ResourceGateway, OMFResource diff --git a/src/nepi/resources/omf/interface.py b/src/nepi/resources/omf/interface.py index cd09cc4c..472672c1 100644 --- a/src/nepi/resources/omf/interface.py +++ b/src/nepi/resources/omf/interface.py @@ -21,7 +21,7 @@ import os, time from nepi.util.timefuncs import tnow from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.execution.attribute import Attribute, Flags from nepi.resources.omf.node import OMFNode, confirmation_counter, reschedule_check @@ -129,7 +129,7 @@ class OMFWifiInterface(OMFResource): """ if self.node.state < ResourceState.READY: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return False for attrname in ["mode", "type", "essid"]: @@ -155,7 +155,7 @@ class OMFWifiInterface(OMFResource): """ if self.channel.state < ResourceState.READY: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return False attrval = self.get("ip") @@ -206,13 +206,13 @@ class OMFWifiInterface(OMFResource): if not self.node or self.node.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return if not self.channel or self.channel.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- channel state %s " % self.channel.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return ## For performance test diff --git a/src/nepi/resources/omf/node.py b/src/nepi/resources/omf/node.py index ce2f6c97..048da190 100644 --- a/src/nepi/resources/omf/node.py +++ b/src/nepi/resources/omf/node.py @@ -20,7 +20,7 @@ from nepi.util.timefuncs import tnow from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.execution.attribute import Attribute, Flags from nepi.resources.omf.omf_resource import ResourceGateway, OMFResource from nepi.resources.omf.omf_api_factory import OMFAPIFactory @@ -152,7 +152,7 @@ class OMFNode(OMFResource): if rm_list: for rm in rm_list: if rm.state < ResourceState.RELEASED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return from nepi.resources.omf.interface import OMFWifiInterface @@ -160,7 +160,7 @@ class OMFNode(OMFResource): if rm_list: for rm in rm_list: if rm.state < ResourceState.RELEASED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return if self._omf_api: diff --git a/src/nepi/resources/omf/omf_resource.py b/src/nepi/resources/omf/omf_resource.py index faec4656..6f60b09f 100644 --- a/src/nepi/resources/omf/omf_resource.py +++ b/src/nepi/resources/omf/omf_resource.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState class ResourceGateway: diff --git a/src/nepi/resources/omf/wilabt_node.py b/src/nepi/resources/omf/wilabt_node.py index 0918c3f8..bc24906e 100644 --- a/src/nepi/resources/omf/wilabt_node.py +++ b/src/nepi/resources/omf/wilabt_node.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.omf.node import OMFNode from nepi.util.sfaapi import SFAAPIFactory from nepi.util.execfuncs import lexec diff --git a/src/nepi/resources/planetlab/node.py b/src/nepi/resources/planetlab/node.py index d8a4edaf..dc70df56 100644 --- a/src/nepi/resources/planetlab/node.py +++ b/src/nepi/resources/planetlab/node.py @@ -20,7 +20,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.node import LinuxNode from nepi.resources.planetlab.plcapi import PLCAPIFactory from nepi.util.execfuncs import lexec diff --git a/src/nepi/resources/planetlab/openvswitch/ovs.py b/src/nepi/resources/planetlab/openvswitch/ovs.py index fb921e97..84e45e14 100644 --- a/src/nepi/resources/planetlab/openvswitch/ovs.py +++ b/src/nepi/resources/planetlab/openvswitch/ovs.py @@ -27,8 +27,6 @@ from nepi.resources.planetlab.node import PlanetlabNode from nepi.resources.linux.application import LinuxApplication import os -reschedule_delay = "0.5s" - @clsinit_copy class OVSSwitch(LinuxApplication): """ @@ -133,7 +131,7 @@ class OVSSwitch(LinuxApplication): """ if not self.node or self.node.state < ResourceState.READY: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return self.do_discover() @@ -301,7 +299,7 @@ class OVSSwitch(LinuxApplication): for rm in rms : if rm.state < ResourceState.RELEASED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return cmd = "sliver-ovs del-bridge %s" % self.get('bridge_name') diff --git a/src/nepi/resources/planetlab/openvswitch/ovsport.py b/src/nepi/resources/planetlab/openvswitch/ovsport.py index 8275249f..107c809d 100644 --- a/src/nepi/resources/planetlab/openvswitch/ovsport.py +++ b/src/nepi/resources/planetlab/openvswitch/ovsport.py @@ -28,8 +28,6 @@ from nepi.resources.linux.application import LinuxApplication import os -reschedule_delay = "0.5s" - @clsinit_copy class OVSPort(LinuxApplication): """ @@ -272,7 +270,7 @@ class OVSPort(LinuxApplication): if not self.ovsswitch or self.ovsswitch.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- OVSwitch state %s " % self.ovsswitch.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return self.do_discover() @@ -295,7 +293,7 @@ class OVSPort(LinuxApplication): rm = self.get_connected(LinuxUdpTunnel.get_rtype()) if rm and rm[0].state < ResourceState.STOPPED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return cmd = "sliver-ovs del_port %s" % self.get('port_name') diff --git a/src/nepi/resources/planetlab/sfa_node.py b/src/nepi/resources/planetlab/sfa_node.py index a8bad103..f87831c1 100644 --- a/src/nepi/resources/planetlab/sfa_node.py +++ b/src/nepi/resources/planetlab/sfa_node.py @@ -19,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.resources.linux.node import LinuxNode from nepi.util.sfaapi import SFAAPIFactory from nepi.util.execfuncs import lexec diff --git a/src/nepi/resources/planetlab/tap.py b/src/nepi/resources/planetlab/tap.py index 4df138bb..0002c50c 100644 --- a/src/nepi/resources/planetlab/tap.py +++ b/src/nepi/resources/planetlab/tap.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.resources.planetlab.node import PlanetlabNode from nepi.util.timefuncs import tnow, tdiffsec @@ -193,7 +192,7 @@ class PlanetlabTap(LinuxApplication): def do_deploy(self): if not self.node or self.node.state < ResourceState.PROVISIONED: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: if not self.get("command"): self.set("command", self._start_command) @@ -261,7 +260,7 @@ class PlanetlabTap(LinuxApplication): for rm in rms: if rm.state < ResourceState.STOPPED: - self.ec.schedule(reschedule_delay, self.release) + self.ec.schedule(self.reschedule_delay, self.release) return super(PlanetlabTap, self).do_release() diff --git a/src/nepi/resources/planetlab/vroute.py b/src/nepi/resources/planetlab/vroute.py index ad0b83e9..6b34f94c 100644 --- a/src/nepi/resources/planetlab/vroute.py +++ b/src/nepi/resources/planetlab/vroute.py @@ -18,8 +18,7 @@ # Author: Alina Quereilhac from nepi.execution.attribute import Attribute, Flags, Types -from nepi.execution.resource import clsinit_copy, ResourceState, \ - reschedule_delay +from nepi.execution.resource import clsinit_copy, ResourceState from nepi.resources.linux.application import LinuxApplication from nepi.resources.planetlab.node import PlanetlabNode from nepi.resources.planetlab.tap import PlanetlabTap @@ -93,7 +92,7 @@ class PlanetlabVroute(LinuxApplication): def do_deploy(self): if not self.tap or self.tap.state < ResourceState.PROVISIONED: - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: if not self.get("command"): self.set("command", self._start_command) -- 2.43.0