afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

renamed utils.check_cmd to utils.cmd, updated host_cmd to allow for shell commands for output redirection

Browse source
This commit is contained in:
Blake Harnden 2019-10-21 10:32:42 -07:00
parent 16b7e70c33
commit 78f981463d
15 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/emane/emanemanager.py
View file

@ -140,7 +140,7 @@ class EmaneManager(ModelManager):
try:
# check for emane
args = "emane --version"
emane_version = utils.check_cmd(args)
emane_version = utils.cmd(args)
logging.info("using EMANE: %s", emane_version)
self.session.distributed.execute(lambda x: x.remote_cmd(args))
@ -594,7 +594,7 @@ class EmaneManager(ModelManager):
log_file = os.path.join(path, "emane.log")
platform_xml = os.path.join(path, "platform.xml")
emanecmd += f" -f {log_file} {platform_xml}"
utils.check_cmd(emanecmd, cwd=path)
utils.cmd(emanecmd, cwd=path)
self.session.distributed.execute(lambda x: x.remote_cmd(emanecmd, cwd=path))
logging.info("host emane daemon running: %s", emanecmd)
@ -618,8 +618,8 @@ class EmaneManager(ModelManager):
if stop_emane_on_host:
try:
utils.check_cmd(kill_emaned)
utils.check_cmd(kill_transortd)
utils.cmd(kill_emaned)
utils.cmd(kill_transortd)
self.session.distributed.execute(lambda x: x.remote_cmd(kill_emaned))
self.session.distributed.execute(lambda x: x.remote_cmd(kill_transortd))
except CoreCommandError:

2
daemon/core/emane/tdma.py
View file

@ -63,4 +63,4 @@ class EmaneTdmaModel(emanemodel.EmaneModel):
"setting up tdma schedule: schedule(%s) device(%s)", schedule, event_device
)
args = f"emaneevent-tdmaschedule -i {event_device} {schedule}"
utils.check_cmd(args)
utils.cmd(args)