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

updated to vnode on how commands are ran, updated all functions to capture output and raise exceptions when commands fail

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-01 09:17:58 -08:00
parent 719670c895
commit 908fb777de
3 changed files with 104 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/core/misc/utils.py
View file

@ -125,6 +125,19 @@ def mutecall(*args, **kwargs):
return subprocess.call(*args, **kwargs) return subprocess.call(*args, **kwargs)
def check_alloutput(cmd, **kwargs):
"""
Convenience wrapper to run subprocess.check_output and include stderr as well.
:param list[str] cmd: command arguments to run
:param dict kwargs: option for running subprocess.check_output, beyond setting stderr to stdout
:return: combined stdout and stderr
:raises subprocess.CalledProcessError: when a non-zero exit status is encountered
"""
kwargs["stderr"] = subprocess.STDOUT
return subprocess.check_output(cmd, **kwargs)
def mutecheck_call(*args, **kwargs): def mutecheck_call(*args, **kwargs):
""" """
Run a muted check call command. Run a muted check call command.

111
daemon/core/netns/vnode.py
View file

@ -99,24 +99,28 @@ class SimpleLxcNode(PyCoreNode):
env["NODE_NAME"] = str(self.name) env["NODE_NAME"] = str(self.name)
try: try:
p = subprocess.Popen(vnoded, stdout=subprocess.PIPE, env=env) output = utils.check_alloutput(vnoded, env=env)
stdout, _ = p.communicate() # p = subprocess.Popen(vnoded, stdout=subprocess.PIPE, env=env)
if p.returncode: # stdout, _ = p.communicate()
raise IOError("vnoded command failed: %s" % vnoded) # if p.returncode:
self.pid = int(stdout) # raise IOError("vnoded command failed: %s" % vnoded)
except (OSError, ValueError): self.pid = int(output)
logger.exception("vnoded failed to create a namespace; check kernel support and user priveleges") except subprocess.CalledProcessError:
logger.exception("vnoded failed to create a namespace; check kernel support and user privileges")
# create vnode client # create vnode client
self.client = vnodeclient.VnodeClient(self.name, self.ctrlchnlname) self.client = vnodeclient.VnodeClient(self.name, self.ctrlchnlname)
# bring up the loopback interface try:
logger.info("bringing up loopback interface") # bring up the loopback interface
self.client.cmd([constants.IP_BIN, "link", "set", "lo", "up"]) logger.info("bringing up loopback interface")
self.client.check_alloutput([constants.IP_BIN, "link", "set", "lo", "up"])
# set hostname for node # set hostname for node
logger.info("setting hostname: %s" % self.name) logger.info("setting hostname: %s" % self.name)
self.client.cmd(["hostname", self.name]) self.client.check_alloutput(["hostname", self.name])
except subprocess.CalledProcessError:
logger.exception("error setting up loopback and hostname: %s")
# mark node as up # mark node as up
self.up = True self.up = True
@ -196,10 +200,8 @@ class SimpleLxcNode(PyCoreNode):
""" """
logger.info("unmounting: %s", target) logger.info("unmounting: %s", target)
try: try:
status, output = self.client.cmdresult([constants.UMOUNT_BIN, "-n", "-l", target]) self.client.check_alloutput([constants.UMOUNT_BIN, "-n", "-l", target])
if status: except subprocess.CalledProcessError:
raise IOError("error unmounting %s: %s", target, output)
except IOError:
logger.exception("error during unmount") logger.exception("error during unmount")
def newifindex(self): def newifindex(self):
@ -244,21 +246,27 @@ class SimpleLxcNode(PyCoreNode):
veth = VEth(node=self, name=name, localname=localname, net=net, start=self.up) veth = VEth(node=self, name=name, localname=localname, net=net, start=self.up)
if self.up: if self.up:
subprocess.check_call([constants.IP_BIN, "link", "set", veth.name, "netns", str(self.pid)]) try:
self.client.cmd([constants.IP_BIN, "link", "set", veth.name, "name", ifname]) utils.check_alloutput([constants.IP_BIN, "link", "set", veth.name, "netns", str(self.pid)])
self.client.check_alloutput([constants.IP_BIN, "link", "set", veth.name, "name", ifname])
except subprocess.CalledProcessError:
logger.exception("failure setting eth name")
veth.name = ifname veth.name = ifname
if self.up: if self.up:
# TODO: potentially find better way to query interface ID # TODO: potentially find better way to query interface ID
# retrieve interface information # retrieve interface information
result, output = self.client.cmdresult(["ip", "link", "show", veth.name]) try:
logger.info("interface command output: %s", output) output = self.client.check_alloutput(["ip", "link", "show", veth.name])
output = output.split("\n") logger.info("interface command output: %s", output)
veth.flow_id = int(output[0].strip().split(":")[0]) + 1 output = output.split("\n")
logger.info("interface flow index: %s - %s", veth.name, veth.flow_id) veth.flow_id = int(output[0].strip().split(":")[0]) + 1
veth.hwaddr = output[1].strip().split()[1] logger.info("interface flow index: %s - %s", veth.name, veth.flow_id)
logger.info("interface mac: %s - %s", veth.name, veth.hwaddr) veth.hwaddr = output[1].strip().split()[1]
logger.info("interface mac: %s - %s", veth.name, veth.hwaddr)
except subprocess.CalledProcessError:
logger.exception("failure getting flow id and mac address")
try: try:
self.addnetif(veth, ifindex) self.addnetif(veth, ifindex)
@ -282,18 +290,22 @@ class SimpleLxcNode(PyCoreNode):
with self.lock: with self.lock:
if ifindex is None: if ifindex is None:
ifindex = self.newifindex() ifindex = self.newifindex()
if ifname is None: if ifname is None:
ifname = "eth%d" % ifindex ifname = "eth%d" % ifindex
sessionid = self.session.short_session_id() sessionid = self.session.short_session_id()
localname = "tap%s.%s.%s" % (self.objid, ifindex, sessionid) localname = "tap%s.%s.%s" % (self.objid, ifindex, sessionid)
name = ifname name = ifname
tuntap = TunTap(node=self, name=name, localname=localname, net=net, start=self.up) tuntap = TunTap(node=self, name=name, localname=localname, net=net, start=self.up)
try: try:
self.addnetif(tuntap, ifindex) self.addnetif(tuntap, ifindex)
except ValueError as e: except ValueError as e:
tuntap.shutdown() tuntap.shutdown()
del tuntap del tuntap
raise e raise e
return ifindex return ifindex
def sethwaddr(self, ifindex, addr): def sethwaddr(self, ifindex, addr):
@ -307,9 +319,10 @@ class SimpleLxcNode(PyCoreNode):
self._netif[ifindex].sethwaddr(addr) self._netif[ifindex].sethwaddr(addr)
if self.up: if self.up:
cmd = [constants.IP_BIN, "link", "set", "dev", self.ifname(ifindex), "address", str(addr)] cmd = [constants.IP_BIN, "link", "set", "dev", self.ifname(ifindex), "address", str(addr)]
status, output = self.client.cmdresult(cmd) try:
if status: self.client.check_alloutput(cmd)
logger.error("error setting MAC address %s: %s", addr, output) except subprocess.CalledProcessError:
logger.exception("error setting MAC address %s: %s", addr)
def addaddr(self, ifindex, addr): def addaddr(self, ifindex, addr):
""" """
@ -320,13 +333,17 @@ class SimpleLxcNode(PyCoreNode):
:return: nothing :return: nothing
""" """
if self.up: if self.up:
# check if addr is ipv6 try:
if ":" in str(addr): # check if addr is ipv6
cmd = [constants.IP_BIN, "addr", "add", str(addr), "dev", self.ifname(ifindex)] if ":" in str(addr):
self.client.cmd(cmd) cmd = [constants.IP_BIN, "addr", "add", str(addr), "dev", self.ifname(ifindex)]
else: self.client.check_alloutput(cmd)
cmd = [constants.IP_BIN, "addr", "add", str(addr), "broadcast", "+", "dev", self.ifname(ifindex)] else:
self.client.cmd(cmd) cmd = [constants.IP_BIN, "addr", "add", str(addr), "broadcast", "+", "dev", self.ifname(ifindex)]
self.client.check_alloutput(cmd)
except subprocess.CalledProcessError:
logger.exception("failure adding interface address")
self._netif[ifindex].addaddr(addr) self._netif[ifindex].addaddr(addr)
def deladdr(self, ifindex, addr): def deladdr(self, ifindex, addr):
@ -343,7 +360,10 @@ class SimpleLxcNode(PyCoreNode):
logger.exception("trying to delete unknown address: %s" % addr) logger.exception("trying to delete unknown address: %s" % addr)
if self.up: if self.up:
self.client.cmd([constants.IP_BIN, "addr", "del", str(addr), "dev", self.ifname(ifindex)]) try:
self.client.check_alloutput([constants.IP_BIN, "addr", "del", str(addr), "dev", self.ifname(ifindex)])
except subprocess.CalledProcessError:
logger.exception("failure deleting address")
def delalladdr(self, ifindex, address_types=valid_address_types): def delalladdr(self, ifindex, address_types=valid_address_types):
""" """
@ -355,11 +375,13 @@ class SimpleLxcNode(PyCoreNode):
""" """
interface_name = self.ifname(ifindex) interface_name = self.ifname(ifindex)
addresses = self.client.getaddr(interface_name, rescan=True) addresses = self.client.getaddr(interface_name, rescan=True)
for address_type in address_types: for address_type in address_types:
if address_type not in self.valid_address_types: if address_type not in self.valid_address_types:
raise ValueError("addr type must be in: %s" % " ".join(self.valid_address_types)) raise ValueError("addr type must be in: %s" % " ".join(self.valid_address_types))
for address in addresses[address_type]: for address in addresses[address_type]:
self.deladdr(ifindex, address) self.deladdr(ifindex, address)
# update cached information # update cached information
self.client.getaddr(interface_name, rescan=True) self.client.getaddr(interface_name, rescan=True)
@ -371,7 +393,10 @@ class SimpleLxcNode(PyCoreNode):
:return: nothing :return: nothing
""" """
if self.up: if self.up:
self.client.cmd([constants.IP_BIN, "link", "set", self.ifname(ifindex), "up"]) try:
self.client.check_alloutput([constants.IP_BIN, "link", "set", self.ifname(ifindex), "up"])
except subprocess.CalledProcessError:
logger.exception("failure bringing interface up")
def newnetif(self, net=None, address_list=None, hwaddr=None, ifindex=None, ifname=None): def newnetif(self, net=None, address_list=None, hwaddr=None, ifindex=None, ifname=None):
""" """
@ -429,15 +454,15 @@ class SimpleLxcNode(PyCoreNode):
tmplen = 8 tmplen = 8
tmp1 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in xrange(tmplen)]) tmp1 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in xrange(tmplen)])
tmp2 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in xrange(tmplen)]) tmp2 = "tmp." + "".join([random.choice(string.ascii_lowercase) for _ in xrange(tmplen)])
subprocess.check_call([constants.IP_BIN, "link", "add", "name", tmp1, "type", "veth", "peer", "name", tmp2]) utils.check_alloutput([constants.IP_BIN, "link", "add", "name", tmp1, "type", "veth", "peer", "name", tmp2])
subprocess.call([constants.IP_BIN, "link", "set", tmp1, "netns", str(self.pid)]) utils.check_alloutput([constants.IP_BIN, "link", "set", tmp1, "netns", str(self.pid)])
self.client.cmd([constants.IP_BIN, "link", "set", tmp1, "name", ifname]) self.client.check_alloutput([constants.IP_BIN, "link", "set", tmp1, "name", ifname])
interface = PyCoreNetIf(node=self, name=ifname, mtu=_DEFAULT_MTU) interface = PyCoreNetIf(node=self, name=ifname, mtu=_DEFAULT_MTU)
self.addnetif(interface, self.newifindex()) self.addnetif(interface, self.newifindex())
subprocess.check_call([constants.IP_BIN, "link", "set", tmp2, "netns", str(othernode.pid)]) utils.check_alloutput([constants.IP_BIN, "link", "set", tmp2, "netns", str(othernode.pid)])
othernode.client.cmd([constants.IP_BIN, "link", "set", tmp2, "name", otherifname]) othernode.client.check_alloutput([constants.IP_BIN, "link", "set", tmp2, "name", otherifname])
other_interface = PyCoreNetIf(node=othernode, name=otherifname, mtu=_DEFAULT_MTU) other_interface = PyCoreNetIf(node=othernode, name=otherifname, mtu=_DEFAULT_MTU)
othernode.addnetif(other_interface, othernode.newifindex()) othernode.addnetif(other_interface, othernode.newifindex())

31
daemon/core/netns/vnodeclient.py
View file

@ -7,6 +7,7 @@ by invoking the vcmd shell command.
import os import os
import shlex import shlex
import subprocess
import vcmd import vcmd
@ -38,10 +39,10 @@ class VnodeClient(object):
Checks that the vcmd client is properly connected. Checks that the vcmd client is properly connected.
:return: nothing :return: nothing
:raises ValueError: when not connected :raises IOError: when not connected
""" """
if not self.connected(): if not self.connected():
raise ValueError("vcmd not connected") raise IOError("vcmd not connected")
def connected(self): def connected(self):
""" """
@ -82,31 +83,45 @@ class VnodeClient(object):
logger.warn("cmd exited with status %s: %s", status, args) logger.warn("cmd exited with status %s: %s", status, args)
return status return status
def cmdresult(self, args): def cmdresult(self, cmd):
""" """
Execute a command on a node and return a tuple containing the Execute a command on a node and return a tuple containing the
exit status and result string. stderr output exit status and result string. stderr output
is folded into the stdout result string. is folded into the stdout result string.
:param list args: command arguments :param list cmd: command arguments
:return: command status and combined stdout and stderr output :return: command status and combined stdout and stderr output
:rtype: tuple[int, str] :rtype: tuple[int, str]
""" """
self._verify_connection() self._verify_connection()
# split shell string to shell array for convenience # split shell string to shell array for convenience
if type(args) == str: if type(cmd) == str:
args = shlex.split(args) cmd = shlex.split(cmd)
p, stdin, stdout, stderr = self.popen(args) p, stdin, stdout, stderr = self.popen(cmd)
output = stdout.read() + stderr.read()
stdin.close() stdin.close()
output = stdout.read() + stderr.read()
stdout.close() stdout.close()
stderr.close() stderr.close()
status = p.wait() status = p.wait()
return status, output return status, output
def check_alloutput(self, cmd):
"""
Run command and return output, raises exception when non-zero exit status is encountered.
:param cmd:
:return: combined stdout and stderr combined
:rtype: str
:raises subprocess.CalledProcessError: when there is a non-zero exit status
"""
status, output = self.cmdresult(cmd)
if status:
raise subprocess.CalledProcessError(status, cmd, output)
return output
def popen(self, args): def popen(self, args):
""" """
Execute a popen command against the node. Execute a popen command against the node.