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

fixed cmd to leverage wait similar to standard nodes and avoid throwing its own exceptions

Browse source
This commit is contained in:
Blake Harnden 2019-06-28 14:24:36 -07:00
parent 6ab8368f1c
commit 0e7464d419
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,14 +41,25 @@ class DockerClient(object):
cmd=cmd cmd=cmd
)) ))
def ns_cmd(self, cmd): def _ns_args(self, cmd):
if isinstance(cmd, list): return "nsenter -t {pid} -m -u -i -p -n {cmd}".format(
cmd = " ".join(cmd)
logging.info("ns cmd: %s", cmd)
return utils.cmd_output("nsenter -t {pid} -m -u -i -p -n {cmd}".format(
pid=self.pid, pid=self.pid,
cmd=cmd cmd=cmd
)) )
def ns_cmd_output(self, cmd):
if isinstance(cmd, list):
cmd = " ".join(cmd)
args = self._ns_args(cmd)
logging.info("ns cmd: %s", args)
return utils.cmd_output(args)
def ns_cmd(self, cmd, wait=True):
if isinstance(cmd, list):
cmd = " ".join(cmd)
args = self._ns_args(cmd)
logging.info("ns cmd: %s", args)
return utils.cmd(args, wait)
def get_pid(self): def get_pid(self):
args = "docker inspect -f '{{{{.State.Pid}}}}' {name}".format(name=self.name) args = "docker inspect -f '{{{{.State.Pid}}}}' {name}".format(name=self.name)
@ -83,7 +94,7 @@ class DockerClient(object):
interface = {"ether": [], "inet": [], "inet6": [], "inet6link": []} interface = {"ether": [], "inet": [], "inet6": [], "inet6link": []}
args = ["ip", "addr", "show", "dev", ifname] args = ["ip", "addr", "show", "dev", ifname]
status, output = self.ns_cmd(args) status, output = self.ns_cmd_output(args)
for line in output: for line in output:
line = line.strip().split() line = line.strip().split()
if line[0] == "link/ether": if line[0] == "link/ether":
@ -180,10 +191,7 @@ class DockerNode(CoreNode):
:return: exit status for command :return: exit status for command
:rtype: int :rtype: int
""" """
status, output = self.client.ns_cmd(args) return self.client.ns_cmd(args, wait)
if status:
raise CoreCommandError(status, args, output)
return status
def cmd_output(self, args): def cmd_output(self, args):
""" """
@ -193,7 +201,7 @@ class DockerNode(CoreNode):
:return: exit status and combined stdout and stderr :return: exit status and combined stdout and stderr
:rtype: tuple[int, str] :rtype: tuple[int, str]
""" """
return self.client.ns_cmd(args) return self.client.ns_cmd_output(args)
def check_cmd(self, args): def check_cmd(self, args):
""" """
@ -204,7 +212,7 @@ class DockerNode(CoreNode):
:rtype: str :rtype: str
:raises CoreCommandError: when a non-zero exit status occurs :raises CoreCommandError: when a non-zero exit status occurs
""" """
status, output = self.client.ns_cmd(args) status, output = self.client.ns_cmd_output(args)
if status: if status:
raise CoreCommandError(status, args, output) raise CoreCommandError(status, args, output)
return output return output