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, ResourceFactory, reschedule_delay
from nepi.resources.linux.application import LinuxApplication
from nepi.util.timefuncs import tnow, tdiffsec
from nepi.resources.ns3.ns3simulation import NS3Simulation
type = Types.Bool,
flags = Flags.Design)
+ enable_dump = Attribute("enableDump",
+ "Enable dumping the remote executed ns-3 commands to a script "
+ "in order to later reproduce and debug the experiment",
+ type = Types.Bool,
+ default = False,
+ flags = Flags.Design)
+
build_mode = Attribute("buildMode",
"Mode used to build ns-3 with waf. One if: debug, release, oprimized ",
default = "optimized",
default = "ns-3-dev",
flags = Flags.Design)
- enable_dce = Attribute("enableDCE",
- "Install DCE source code",
- default = False,
- type = Types.Bool,
- flags = Flags.Design)
-
pybindgen_version = Attribute("pybindgenVersion",
"Version of pybindgen to install from bazar repo",
#default = "864",
cls._register_attribute(sched_type)
cls._register_attribute(check_sum)
cls._register_attribute(ns_log)
+ cls._register_attribute(enable_dump)
cls._register_attribute(verbose)
cls._register_attribute(build_mode)
cls._register_attribute(ns3_version)
cls._register_attribute(pybindgen_version)
cls._register_attribute(populate_routing_tables)
- cls._register_attribute(enable_dce)
def __init__(self, ec, guid):
LinuxApplication.__init__(self, ec, guid)
self._socket_name = "ns3-%s.sock" % os.urandom(4).encode('hex')
self._dce_manager_helper_uuid = None
self._dce_application_helper_uuid = None
+ self._enable_dce = None
@property
def socket_name(self):
os.path.join(self.node.src_dir, "ns3wrapper", "ns3wrapper.py"),
overwrite = False)
+ # upload ns3 wrapper debug python script
+ ns3_wrapper_debug = os.path.join(os.path.dirname(__file__), "..", "..", "ns3",
+ "ns3wrapper_debug.py")
+
+ self.node.upload(ns3_wrapper_debug,
+ os.path.join(self.node.src_dir, "ns3wrapper", "ns3wrapper_debug.py"),
+ overwrite = False)
+
# upload ns3_server python script
ns3_server = os.path.join(os.path.dirname(__file__), "..", "..", "ns3",
"ns3server.py")
self._client.start()
- # Wait until the Simulation is actually started...
+ """
+ # XXX: IS THIS REALLY NEEDED??
+ # Wait until the Simulation is actually started...
+
is_running = False
for i in xrange(1000):
is_running = self.invoke(SIMULATOR_UUID, "isRunning")
msg = " Simulation did not start"
self.error(msg)
raise RuntimeError
+ """
self.set_started()
else:
super(LinuxApplication, self).do_release()
+ @property
+ def enable_dce(self):
+ if self._enable_dce is None:
+ from nepi.resources.ns3.ns3dceapplication import NS3BaseDceApplication
+ rclass = ResourceFactory.get_resource_type(
+ NS3BaseDceApplication.get_rtype())
+
+ self._enable_dce = False
+ for guid in self.ec.resources:
+ rm = self.ec.get_resource(guid)
+ if isinstance(rm, rclass):
+ self._enable_dce = True
+ break
+
+ return self._enable_dce
+
@property
def _start_command(self):
command = []
if ns_log:
command.append("-L '%s'" % ns_log)
+ if self.get("enableDump"):
+ command.append("-D")
+
if self.get("verbose"):
command.append("-v")
}
clone_dce_cmd = " echo 'DCE will not be built' "
- if self.get("enableDCE"):
+ if self.enable_dce:
clone_dce_cmd = (
# DCE installation
# Test if dce is alredy installed
@property
def _install(self):
install_dce_cmd = " echo 'DCE will not be installed' "
- if self.get("enableDCE"):
+ if self.enable_dce:
install_dce_cmd = (
" ( "
" ((test -d %(ns3_build_home)s/bin_dce ) && "