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

removed node based check_cmd, updated to use appropriate function

Browse source
This commit is contained in:
Blake Harnden 2019-10-11 12:57:37 -07:00
parent 4a6d69bb09
commit d326f246a7
11 changed files with 51 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/core/nodes/lxd.py
View file

@ -140,22 +140,11 @@ class LxcNode(CoreNode):
self.client.stop_container()
self.up = False
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
return self.client.check_cmd(args)
def node_net_cmd(self, args, wait=True):
if not self.up:
logging.debug("node down, not running network command: %s", args)
return ""
return self.check_cmd(args)
return self.client.check_cmd(args)
def termcmdstring(self, sh="/bin/sh"):
"""
@ -175,7 +164,7 @@ class LxcNode(CoreNode):
"""
logging.info("creating node dir: %s", path)
args = "mkdir -p {path}".format(path=path)
self.check_cmd(args)
return self.client.check_cmd(args)
def mount(self, source, target):
"""