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

changed net_cmd to host_cmd and node_net_cmd to cmd, for simpler more logical naming

Browse source
This commit is contained in:
bharnden 2019-10-18 23:28:09 -07:00
parent d4af459653
commit 6006710c32
16 changed files with 74 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ class LxcNode(CoreNode):
if self.up:
raise ValueError("starting a node that is already up")
self.makenodedir()
self.client = LxdClient(self.name, self.image, self.net_cmd)
self.client = LxdClient(self.name, self.image, self.host_cmd)
self.pid = self.client.create_container()
self.up = True
@ -149,7 +149,7 @@ class LxcNode(CoreNode):
"""
logging.info("creating node dir: %s", path)
args = f"mkdir -p {path}"
return self.node_net_cmd(args)
return self.cmd(args)
def mount(self, source, target):
"""
@ -180,13 +180,13 @@ class LxcNode(CoreNode):
temp.close()
if directory:
self.node_net_cmd(f"mkdir -m {0o755:o} -p {directory}")
self.cmd(f"mkdir -m {0o755:o} -p {directory}")
if self.server is not None:
self.server.remote_put(temp.name, temp.name)
self.client.copy_file(temp.name, filename)
self.node_net_cmd(f"chmod {mode:o} {filename}")
self.cmd(f"chmod {mode:o} {filename}")
if self.server is not None:
self.net_cmd(f"rm -f {temp.name}")
self.host_cmd(f"rm -f {temp.name}")
os.unlink(temp.name)
logging.debug("node(%s) added file: %s; mode: 0%o", self.name, filename, mode)
@ -204,7 +204,7 @@ class LxcNode(CoreNode):
"node file copy file(%s) source(%s) mode(%s)", filename, srcfilename, mode
)
directory = os.path.dirname(filename)
self.node_net_cmd(f"mkdir -p {directory}")
self.cmd(f"mkdir -p {directory}")
if self.server is None:
source = srcfilename
@ -214,7 +214,7 @@ class LxcNode(CoreNode):
self.server.remote_put(source, temp.name)
self.client.copy_file(source, filename)
self.node_net_cmd(f"chmod {mode:o} {filename}")
self.cmd(f"chmod {mode:o} {filename}")
def addnetif(self, netif, ifindex):
super(LxcNode, self).addnetif(netif, ifindex)