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

6
daemon/core/nodes/docker.py
View file

@ -45,14 +45,14 @@ class DockerClient(object):
def check_cmd(self, cmd):
logging.info("docker cmd output: %s", cmd)
return utils.check_cmd(f"docker exec {self.name} {cmd}")
return utils.cmd(f"docker exec {self.name} {cmd}")
def create_ns_cmd(self, cmd):
return f"nsenter -t {self.pid} -u -i -p -n {cmd}"
def ns_cmd(self, cmd, wait):
args = f"nsenter -t {self.pid} -u -i -p -n {cmd}"
return utils.check_cmd(args, wait=wait)
return utils.cmd(args, wait=wait)
def get_pid(self):
args = f"docker inspect -f '{{{{.State.Pid}}}}' {self.name}"
@ -153,7 +153,7 @@ class DockerNode(CoreNode):
def nsenter_cmd(self, args, wait=True):
if self.server is None:
args = self.client.create_ns_cmd(args)
return utils.check_cmd(args, wait=wait)
return utils.cmd(args, wait=wait)
else:
args = self.client.create_ns_cmd(args)
return self.server.remote_cmd(args, wait=wait)