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

Merge branch '5.1_shell_cleanup' of git-ssh.web.boeing.com:Boeing-CORE/CORE into 5.1_shell_cleanup

Browse source
This commit is contained in:
Blake J. Harnden 2018-02-27 14:56:18 -08:00
commit 01060c50ff
3 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,8 +173,10 @@ class SimpleLxcNode(PyCoreNode):
source = os.path.abspath(source)
logger.info("mounting %s at %s" % (source, target))
try:
shcmd = 'mkdir -p "%s" && %s -n --bind "%s" "%s"' % (target, constants.MOUNT_BIN, source, target)
self.client.shcmd(shcmd)
cmd = 'mkdir -p "%s" && %s -n --bind "%s" "%s"' % (target, constants.MOUNT_BIN, source, target)
status, output = self.client.shcmd_result(cmd)
if status:
raise IOError("error during mount: %s" % output)
self._mounts.append((source, target))
except IOError:
logger.exception("mounting failed for %s at %s", source, target)
@ -447,8 +449,16 @@ class SimpleLxcNode(PyCoreNode):
:param str filename: file name to add
:return: nothing
"""
shcmd = 'mkdir -p $(dirname "%s") && mv "%s" "%s" && sync' % (filename, srcname, filename)
self.client.shcmd(shcmd)
logger.info("adding file from %s to %s", srcname, filename)
directory = os.path.dirname(filename)
try:
cmd = 'mkdir -p "%s" && mv "%s" "%s" && sync' % (directory, srcname, filename)
status, output = self.client.shcmd_result(cmd)
if status:
logger.error("error adding file: %s", output)
except IOError:
logger.exception("error during addfile")
def getaddr(self, ifname, rescan=False):
"""