git://git.onelab.eu
/
nepi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
559d7cd
)
Changing reschedule_delay internals
author
Alina Quereilhac
<alina.quereilhac@inria.fr>
Sat, 6 Dec 2014 14:56:13 +0000
(15:56 +0100)
committer
Alina Quereilhac
<alina.quereilhac@inria.fr>
Sat, 6 Dec 2014 14:56:13 +0000
(15:56 +0100)
154 files changed:
src/nepi/execution/ec.py
patch
|
blob
|
history
src/nepi/execution/resource.py
patch
|
blob
|
history
src/nepi/resources/linux/application.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccncat.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccncontent.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnd.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnpeek.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnping.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnpingserver.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnpoke.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/ccnr.py
patch
|
blob
|
history
src/nepi/resources/linux/ccn/fibentry.py
patch
|
blob
|
history
src/nepi/resources/linux/gretunnel.py
patch
|
blob
|
history
src/nepi/resources/linux/interface.py
patch
|
blob
|
history
src/nepi/resources/linux/node.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3ccncatdceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ccn/ns3fibentrydceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ns3dceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ns3pingdceapplication.py
patch
|
blob
|
history
src/nepi/resources/linux/ns3/ns3simulation.py
patch
|
blob
|
history
src/nepi/resources/linux/tap.py
patch
|
blob
|
history
src/nepi/resources/linux/tunnel.py
patch
|
blob
|
history
src/nepi/resources/linux/udptest.py
patch
|
blob
|
history
src/nepi/resources/linux/udptunnel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/aarf_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/aarfcd_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/adhoc_wifi_mac.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/aloha_noack_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/amrr_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/ap_wifi_mac.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/arf_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/arp_l3protocol.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/base_station_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/binary_error_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/binary_error_sixlow_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/bridge_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/bridge_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/bulk_send_application.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/burst_error_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/cara_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/constant_acceleration_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/constant_position_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/constant_rate_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/constant_speed_propagation_delay_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/constant_velocity_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/cost231propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/csma_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/csma_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/dce_application.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/drop_tail_queue.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/dsrdsr_routing.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/emu_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/error_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/error_channel_sixlow.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/error_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/fd_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/fixed_rss_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/friis_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/gauss_markov_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/hierarchical_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/hybrid_buildings_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/icmpv4l4protocol.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/icmpv6l4protocol.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/ideal_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/ipv4l3protocol.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/itu_r1411los_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/itu_r1411nlos_over_rooftop_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/jakes_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/kun2600mhz_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/list_error_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/log_distance_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/loopback_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/lr_wpan_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/lte_enb_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/lte_simple_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/lte_ue_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/matrix_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/mesh_point_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/mesh_wifi_interface_mac.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/minstrel_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/multi_model_spectrum_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/nakagami_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/nist_error_rate_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/node.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/non_communicating_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/ocb_wifi_mac.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/oh_buildings_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/okumura_hata_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/on_off_application.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/onoe_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/packet_sink.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/ping6.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/point_to_point_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/point_to_point_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/point_to_point_remote_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/radvd.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/random_direction2d_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/random_propagation_delay_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/random_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/random_walk2d_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/random_waypoint_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/range_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/rate_error_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/receive_list_error_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/red_queue.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/rraa_wifi_manager.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/simple_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/simple_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/single_model_spectrum_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/six_low_pan_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/sta_wifi_mac.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/steady_state_random_waypoint_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/subscriber_station_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/tap_bridge.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/tcp_l4protocol.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/three_log_distance_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/two_ray_ground_propagation_loss_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/uan_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/udp_client.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/udp_echo_client.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/udp_echo_server.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/udp_l4protocol.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/udp_server.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/udp_trace_client.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/v4ping.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/virtual_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/waypoint_mobility_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/wifi_net_device.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/yans_error_rate_model.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/yans_wifi_channel.py
patch
|
blob
|
history
src/nepi/resources/ns3/classes/yans_wifi_phy.py
patch
|
blob
|
history
src/nepi/resources/ns3/ns3application.py
patch
|
blob
|
history
src/nepi/resources/ns3/ns3base.py
patch
|
blob
|
history
src/nepi/resources/ns3/ns3ccndceapplication.py
patch
|
blob
|
history
src/nepi/resources/ns3/ns3dceapplication.py
patch
|
blob
|
history
src/nepi/resources/ns3/templates/resource_manager_template.txt
patch
|
blob
|
history
src/nepi/resources/omf/application.py
patch
|
blob
|
history
src/nepi/resources/omf/channel.py
patch
|
blob
|
history
src/nepi/resources/omf/interface.py
patch
|
blob
|
history
src/nepi/resources/omf/node.py
patch
|
blob
|
history
src/nepi/resources/omf/omf_resource.py
patch
|
blob
|
history
src/nepi/resources/omf/wilabt_node.py
patch
|
blob
|
history
src/nepi/resources/planetlab/node.py
patch
|
blob
|
history
src/nepi/resources/planetlab/openvswitch/ovs.py
patch
|
blob
|
history
src/nepi/resources/planetlab/openvswitch/ovsport.py
patch
|
blob
|
history
src/nepi/resources/planetlab/sfa_node.py
patch
|
blob
|
history
src/nepi/resources/planetlab/tap.py
patch
|
blob
|
history
src/nepi/resources/planetlab/vroute.py
patch
|
blob
|
history
diff --git
a/src/nepi/execution/ec.py
b/src/nepi/execution/ec.py
index
0c92cb1
..
427eb42
100644
(file)
--- a/
src/nepi/execution/ec.py
+++ b/
src/nepi/execution/ec.py
@@
-278,6
+278,14
@@
class ExperimentController(object):
"""
return self._logger
"""
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
@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
0f75e9a
..
d868c26
100644
(file)
--- a/
src/nepi/execution/resource.py
+++ b/
src/nepi/execution/resource.py
@@
-31,8
+31,6
@@
import sys
import threading
import weakref
import threading
import weakref
-reschedule_delay = "0.5s"
-
class ResourceAction:
""" Action that a user can order to a Resource Manager
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
_traces = None
_help = None
_backend = None
+ _reschedule_delay = "0.5s"
@classmethod
def _register_attribute(cls, attr):
@classmethod
def _register_attribute(cls, attr):
@@
-422,6
+421,11
@@
class ResourceManager(Logger):
""" Get the current state of the RM """
return self._state
""" 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.
def log_message(self, msg):
""" Returns the log message formatted with added information.
@@
-784,7
+788,7
@@
class ResourceManager(Logger):
"""
reschedule = False
"""
reschedule = False
- delay = reschedule_delay
+ delay =
self.
reschedule_delay
# check state and time elapsed on all RMs
for guid in group:
# check state and time elapsed on all RMs
for guid in group:
@@
-853,7
+857,7
@@
class ResourceManager(Logger):
"""
reschedule = False
"""
reschedule = False
- delay = reschedule_delay
+ delay =
self.
reschedule_delay
## evaluate if set conditions are met
## evaluate if set conditions are met
@@
-878,7
+882,7
@@
class ResourceManager(Logger):
#import pdb;pdb.set_trace()
reschedule = False
#import pdb;pdb.set_trace()
reschedule = False
- delay = reschedule_delay
+ delay =
self.
reschedule_delay
## evaluate if conditions to start are met
## evaluate if conditions to start are met
@@
-920,7
+924,7
@@
class ResourceManager(Logger):
"""
reschedule = False
"""
reschedule = False
- delay = reschedule_delay
+ delay =
self.
reschedule_delay
## evaluate if conditions to stop are met
if self.ec.abort:
## evaluate if conditions to stop are met
if self.ec.abort:
@@
-953,7
+957,7
@@
class ResourceManager(Logger):
"""
reschedule = False
"""
reschedule = False
- delay = reschedule_delay
+ delay =
self.
reschedule_delay
## evaluate if conditions to deploy are met
if self.ec.abort:
## 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
35a7884
..
00cd6c7
100644
(file)
--- 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, \
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
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 )
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)
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
49b2bdc
..
e56fdee
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccnapplication.py
+++ b/
src/nepi/resources/linux/ccn/ccnapplication.py
@@
-17,8
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-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
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 )
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 ""
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
f5eb269
..
f0f1bea
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccncat.py
+++ b/
src/nepi/resources/linux/ccn/ccncat.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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 )
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:
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
c7ce3bf
..
f75f0a0
100644
(file)
--- 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, \
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
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.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)
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
1fc8979
..
cbb751c
100644
(file)
--- 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, \
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
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.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)
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
b1deeca
..
1f1338c
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccnpeek.py
+++ b/
src/nepi/resources/linux/ccn/ccnpeek.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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 )
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:
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
cbe599e
..
978ec04
100644
(file)
--- 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, \
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
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.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()
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
865b104
..
cc59373
100644
(file)
--- 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, \
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
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
6fa5a2b
..
3511fdc
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccnpoke.py
+++ b/
src/nepi/resources/linux/ccn/ccnpoke.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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 )
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:
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
9ac5cce
..
50421da
100644
(file)
--- 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, \
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
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.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)
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
4b7e9c4
..
13d9a1a
100644
(file)
--- 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, \
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
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
# 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")
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
d69ac30
..
087eb7a
100644
(file)
--- a/
src/nepi/resources/linux/gretunnel.py
+++ b/
src/nepi/resources/linux/gretunnel.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
bb352e1
..
01237d1
100644
(file)
--- 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, \
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
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:
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:
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
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
62ada38
..
96c9acd
100644
(file)
--- 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, \
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
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:
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()
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:
# 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")
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
e7c3731
..
9904fe4
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
ef3e8a7
..
e72239a
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
226acf0
..
a42bb5d
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
cd7b0f6
..
feb1760
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
daac2b5
..
e364c51
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
a9a548d
..
a3719ba
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
6137825
..
a9bae5c
100644
(file)
--- 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 <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
df24dbd
..
9ad3692
100644
(file)
--- a/
src/nepi/resources/linux/ns3/ns3dceapplication.py
+++ b/
src/nepi/resources/linux/ns3/ns3dceapplication.py
@@
-18,7
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
1f5a678
..
99003ed
100644
(file)
--- a/
src/nepi/resources/linux/ns3/ns3pingdceapplication.py
+++ b/
src/nepi/resources/linux/ns3/ns3pingdceapplication.py
@@
-18,7
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
cb5c6c5
..
61eae0a
100644
(file)
--- 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, \
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
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.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)
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
b93ee80
..
6477bd3
100644
(file)
--- a/
src/nepi/resources/linux/tap.py
+++ b/
src/nepi/resources/linux/tap.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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:
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))
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:
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()
return
super(LinuxTap, self).do_release()
diff --git
a/src/nepi/resources/linux/tunnel.py
b/src/nepi/resources/linux/tunnel.py
index
8e0760d
..
a843442
100644
(file)
--- a/
src/nepi/resources/linux/tunnel.py
+++ b/
src/nepi/resources/linux/tunnel.py
@@
-17,8
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-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
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):
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()
else:
self.do_discover()
self.do_provision()
diff --git
a/src/nepi/resources/linux/udptest.py
b/src/nepi/resources/linux/udptest.py
index
46accbc
..
857ea37
100644
(file)
--- a/
src/nepi/resources/linux/udptest.py
+++ b/
src/nepi/resources/linux/udptest.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
1643b90
..
258fbbb
100644
(file)
--- a/
src/nepi/resources/linux/udptunnel.py
+++ b/
src/nepi/resources/linux/udptunnel.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
d78d93d
..
e6bf0b6
100644
(file)
--- 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, \
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
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
57aa02f
..
2ac02e8
100644
(file)
--- 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, \
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
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
a53df07
..
1274aba
100644
(file)
--- 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, \
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
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
b45b431
..
2094b8a
100644
(file)
--- 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, \
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
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
99c1f9a
..
4a911e7
100644
(file)
--- 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, \
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
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
8802aa7
..
f97e40c
100644
(file)
--- 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, \
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
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
577d091
..
ac6e078
100644
(file)
--- 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, \
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
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
d027d52
..
d6e1876
100644
(file)
--- 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, \
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
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
c0130be
..
5c3a4bb
100644
(file)
--- 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, \
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
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
9b6b2b8
..
4287a66
100644
(file)
--- 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, \
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
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
ba3f241
..
20458e1
100644
(file)
--- 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, \
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
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
4075f54
..
27176b6
100644
(file)
--- 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, \
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
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
d1313c4
..
012865b
100644
(file)
--- 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, \
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
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
f7db2e9
..
1724ccd
100644
(file)
--- 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, \
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
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
bac2cb0
..
929134c
100644
(file)
--- 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, \
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
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
35df255
..
3d9e3b4
100644
(file)
--- 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, \
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
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
662f9e7
..
2348f7c
100644
(file)
--- 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, \
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
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
03ec389
..
7329805
100644
(file)
--- 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, \
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
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
7d81a74
..
d8a5450
100644
(file)
--- 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, \
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
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
9722bd4
..
10db084
100644
(file)
--- 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, \
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
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
e0dfd0f
..
b243bed
100644
(file)
--- 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, \
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
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
2bbbe3d
..
3975aaa
100644
(file)
--- 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, \
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
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
d839f32
..
88cfcf7
100644
(file)
--- 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, \
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
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
b368b27
..
d15b5e2
100644
(file)
--- 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, \
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
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
9b42c54
..
71fd60d
100644
(file)
--- 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, \
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
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
550d925
..
b0f1e40
100644
(file)
--- 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, \
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
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
c8d88bd
..
00fe9ce
100644
(file)
--- 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, \
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
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
09a81c5
..
583a76e
100644
(file)
--- 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, \
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
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
1a9e2ad
..
7a1d89b
100644
(file)
--- 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, \
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
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
3e67915
..
ba16f65
100644
(file)
--- 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, \
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
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
7b59ba8
..
c8c2ee1
100644
(file)
--- 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, \
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
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
4ba2a9f
..
c28d351
100644
(file)
--- 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, \
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
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
518b4c5
..
88c6793
100644
(file)
--- 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, \
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
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
f8bedb4
..
f23198f
100644
(file)
--- 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, \
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
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
1d380a7
..
24657d4
100644
(file)
--- 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, \
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
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
97ce062
..
accb4d7
100644
(file)
--- 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, \
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
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
26c12a9
..
13c9ad6
100644
(file)
--- 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, \
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
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
202137f
..
1189c36
100644
(file)
--- 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, \
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
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
23e37b1
..
ecdc343
100644
(file)
--- 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, \
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
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
93b19b7
..
60fd274
100644
(file)
--- 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, \
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
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
8c7228d
..
2859066
100644
(file)
--- 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, \
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
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
ffac653
..
e2af0ad
100644
(file)
--- 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, \
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
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
8496fcd
..
cfb526f
100644
(file)
--- 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, \
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
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
af4729c
..
0b8febf
100644
(file)
--- 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, \
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
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
925f3cd
..
0a36ae3
100644
(file)
--- 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, \
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
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
a607117
..
37ee665
100644
(file)
--- 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, \
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
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
5f3c5fd
..
cecbbb8
100644
(file)
--- 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, \
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
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
a9e6162
..
8ec7c22
100644
(file)
--- 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, \
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
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
0a74fff
..
3cb4888
100644
(file)
--- 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, \
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
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
0184c10
..
fa76e14
100644
(file)
--- 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, \
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
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
b38a7e9
..
2a39f88
100644
(file)
--- 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, \
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
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
ba6ed70
..
5b1c4d0
100644
(file)
--- 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, \
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
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
4d14e14
..
4823eab
100644
(file)
--- 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, \
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
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
945952a
..
a1e970b
100644
(file)
--- 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, \
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
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
b736081
..
9715df8
100644
(file)
--- 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, \
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
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
2ebdc02
..
2d998b9
100644
(file)
--- 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, \
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
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
c8d6e64
..
6bd1fab
100644
(file)
--- 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, \
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
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
371a895
..
82d8109
100644
(file)
--- 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, \
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
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
5a433b4
..
d84d9f7
100644
(file)
--- 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, \
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
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
f758192
..
b9782dc
100644
(file)
--- 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, \
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
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
4fb08e7
..
9c102fa
100644
(file)
--- 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, \
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
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
cdb1ebc
..
b171b14
100644
(file)
--- 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, \
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
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
530d9ae
..
41063f7
100644
(file)
--- 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, \
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
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
ec26777
..
9f1854e
100644
(file)
--- 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, \
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
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
ffae8e9
..
f5fb399
100644
(file)
--- 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, \
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
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
f01a090
..
0a51da8
100644
(file)
--- 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, \
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
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
701c8d0
..
468c67d
100644
(file)
--- 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, \
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
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
c1af643
..
4ca26a1
100644
(file)
--- 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, \
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
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
e943fc7
..
3bbdde4
100644
(file)
--- 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, \
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
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
699a785
..
a135cb2
100644
(file)
--- 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, \
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
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
2c3ccf1
..
187c05c
100644
(file)
--- 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, \
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
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
d9ac187
..
eaeacdd
100644
(file)
--- 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, \
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
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
6d2e75d
..
7e9d339
100644
(file)
--- 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, \
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
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
30a5f29
..
5f44f06
100644
(file)
--- 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, \
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
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
05f0228
..
3c6e414
100644
(file)
--- 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, \
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
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
3d5773b
..
d954df5
100644
(file)
--- 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, \
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
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
6ca4a27
..
dfcc410
100644
(file)
--- 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, \
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
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
529e520
..
5012400
100644
(file)
--- 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, \
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
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
2d56a34
..
69ca7f1
100644
(file)
--- 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, \
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
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
2f1652c
..
9443621
100644
(file)
--- 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, \
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
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
d68166e
..
e245db2
100644
(file)
--- 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, \
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
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
bfae106
..
50ed670
100644
(file)
--- 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, \
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
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
37a9c42
..
1aede90
100644
(file)
--- 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, \
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
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
293394a
..
ce1365f
100644
(file)
--- 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, \
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
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
3328562
..
12f604e
100644
(file)
--- 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, \
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
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
842e20e
..
f9ec851
100644
(file)
--- 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, \
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
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
650b8ca
..
2b7da55
100644
(file)
--- 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, \
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
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
65b99b6
..
250a191
100644
(file)
--- 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, \
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
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
18441c2
..
dde62ea
100644
(file)
--- 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, \
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
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
8438d28
..
4b39118
100644
(file)
--- 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, \
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
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
ef21f8f
..
5983e5b
100644
(file)
--- 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, \
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
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
620d904
..
f09f432
100644
(file)
--- 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, \
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
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
0dfadb8
..
b8cd161
100644
(file)
--- 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, \
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
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
4683b78
..
c13edc0
100644
(file)
--- 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, \
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
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
e242eb6
..
7b81308
100644
(file)
--- 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, \
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
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
9293b07
..
f888906
100644
(file)
--- 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, \
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
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
cd73643
..
6de5828
100644
(file)
--- 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, \
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
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
c81c162
..
f97701d
100644
(file)
--- 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, \
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
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
86b109b
..
4121ccf
100644
(file)
--- 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, \
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
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
26bc7b5
..
5b80476
100644
(file)
--- 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, \
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
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
c9a0958
..
c1c35be
100644
(file)
--- 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, \
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
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
a57f363
..
a2f5d09
100644
(file)
--- 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, \
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
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
116ab45
..
f110f1e
100644
(file)
--- 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, \
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
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
92dd859
..
a5c11a2
100644
(file)
--- 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, \
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
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
0e119dd
..
375303a
100644
(file)
--- 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, \
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
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
314d391
..
42192f6
100644
(file)
--- 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, \
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
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
2c6ad1c
..
6bd392d
100644
(file)
--- 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, \
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
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
302e128
..
1007c5f
100644
(file)
--- a/
src/nepi/resources/ns3/ns3application.py
+++ b/
src/nepi/resources/ns3/ns3application.py
@@
-17,8
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-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
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 ----" )
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
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
ef345ff
..
73ec178
100644
(file)
--- a/
src/nepi/resources/ns3/ns3base.py
+++ b/
src/nepi/resources/ns3/ns3base.py
@@
-18,7
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.resource import ResourceManager, clsinit_copy, \
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.resource import ResourceManager, clsinit_copy, \
- ResourceState
, reschedule_delay
+ ResourceState
from nepi.execution.attribute import Flags
from nepi.execution.trace import TraceAttr
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 ----" )
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()
else:
self.do_discover()
self.do_provision()
diff --git
a/src/nepi/resources/ns3/ns3ccndceapplication.py
b/src/nepi/resources/ns3/ns3ccndceapplication.py
index
4d199c9
..
edacf8a
100644
(file)
--- a/
src/nepi/resources/ns3/ns3ccndceapplication.py
+++ b/
src/nepi/resources/ns3/ns3ccndceapplication.py
@@
-18,7
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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
c42e32b
..
4b40ef9
100644
(file)
--- a/
src/nepi/resources/ns3/ns3dceapplication.py
+++ b/
src/nepi/resources/ns3/ns3dceapplication.py
@@
-18,7
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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 ----" )
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()
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
c3b6a58
..
8463ebb
100644
(file)
--- 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, \
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
<BASE_CLASS_IMPORT>
@clsinit_copy
<BASE_CLASS_IMPORT>
@clsinit_copy
diff --git
a/src/nepi/resources/omf/application.py
b/src/nepi/resources/omf/application.py
index
7a87d2a
..
0c4bc46
100644
(file)
--- 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, \
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
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 )
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
return
## For performance test
diff --git
a/src/nepi/resources/omf/channel.py
b/src/nepi/resources/omf/channel.py
index
7cda160
..
e3e42cd
100644
(file)
--- 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, \
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.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
cd09cc4
..
472672c
100644
(file)
--- 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, \
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
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:
"""
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"]:
return False
for attrname in ["mode", "type", "essid"]:
@@
-155,7
+155,7
@@
class OMFWifiInterface(OMFResource):
"""
if self.channel.state < ResourceState.READY:
"""
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")
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 )
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 )
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
return
## For performance test
diff --git
a/src/nepi/resources/omf/node.py
b/src/nepi/resources/omf/node.py
index
ce2f6c9
..
048da19
100644
(file)
--- 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, \
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
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:
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
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:
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:
return
if self._omf_api:
diff --git
a/src/nepi/resources/omf/omf_resource.py
b/src/nepi/resources/omf/omf_resource.py
index
faec465
..
6f60b09
100644
(file)
--- 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, \
from nepi.execution.attribute import Attribute, Flags, Types
from nepi.execution.resource import ResourceManager, clsinit_copy, \
- ResourceState
, reschedule_delay
+ ResourceState
class ResourceGateway:
class ResourceGateway:
diff --git
a/src/nepi/resources/omf/wilabt_node.py
b/src/nepi/resources/omf/wilabt_node.py
index
0918c3f
..
bc24906
100644
(file)
--- 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, \
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
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
d8a4eda
..
dc70df5
100644
(file)
--- 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, \
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
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
fb921e9
..
84e45e1
100644
(file)
--- 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
from nepi.resources.linux.application import LinuxApplication
import os
-reschedule_delay = "0.5s"
-
@clsinit_copy
class OVSSwitch(LinuxApplication):
"""
@clsinit_copy
class OVSSwitch(LinuxApplication):
"""
@@
-133,7
+131,7
@@
class OVSSwitch(LinuxApplication):
"""
if not self.node or self.node.state < ResourceState.READY:
"""
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()
return
self.do_discover()
@@
-301,7
+299,7
@@
class OVSSwitch(LinuxApplication):
for rm in rms :
if rm.state < ResourceState.RELEASED:
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')
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
8275249
..
107c809
100644
(file)
--- 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
import os
-reschedule_delay = "0.5s"
-
@clsinit_copy
class OVSPort(LinuxApplication):
"""
@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 )
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()
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:
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')
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
a8bad10
..
f87831c
100644
(file)
--- 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, \
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
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
4df138b
..
0002c50
100644
(file)
--- a/
src/nepi/resources/planetlab/tap.py
+++ b/
src/nepi/resources/planetlab/tap.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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:
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)
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:
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()
return
super(PlanetlabTap, self).do_release()
diff --git
a/src/nepi/resources/planetlab/vroute.py
b/src/nepi/resources/planetlab/vroute.py
index
ad0b83e
..
6b34f94
100644
(file)
--- a/
src/nepi/resources/planetlab/vroute.py
+++ b/
src/nepi/resources/planetlab/vroute.py
@@
-18,8
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
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
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:
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)
else:
if not self.get("command"):
self.set("command", self._start_command)