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

added net_cmd to NodeBase for encapsulating network configuration commands

Browse source
This commit is contained in:
bharnden 2019-10-01 21:06:11 -07:00
parent 4079df9739
commit 0fe8bea25b
3 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
daemon/core/nodes/base.py
View file

@ -62,9 +62,9 @@ class NodeBase(object):
self.position = Position() self.position = Position()
if session.options.get_config("ovs") == "True": if session.options.get_config("ovs") == "True":
self.net_client = OvsNetClient(utils.check_cmd) self.net_client = OvsNetClient(self.net_cmd)
else: else:
self.net_client = LinuxNetClient(utils.check_cmd) self.net_client = LinuxNetClient(self.net_cmd)
def startup(self): def startup(self):
""" """
@ -82,6 +82,18 @@ class NodeBase(object):
""" """
raise NotImplementedError raise NotImplementedError
def net_cmd(self, args):
"""
Runs a command that is used to configure and setup the network on the host
system.
:param list[str]|str args: command to run
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
utils.check_cmd(args)
def setposition(self, x=None, y=None, z=None): def setposition(self, x=None, y=None, z=None):
""" """
Set the (x,y,z) position of the object. Set the (x,y,z) position of the object.
@ -364,9 +376,10 @@ class CoreNodeBase(NodeBase):
return common return common
def network_cmd(self, args): def node_net_cmd(self, args):
""" """
Runs a command for a node that is used to configure and setup network interfaces. Runs a command that is used to configure and setup the network within a
node.
:param list[str]|str args: command to run :param list[str]|str args: command to run
:return: combined stdout and stderr :return: combined stdout and stderr
@ -451,9 +464,9 @@ class CoreNode(CoreNodeBase):
self.bootsh = bootsh self.bootsh = bootsh
if session.options.get_config("ovs") == "True": if session.options.get_config("ovs") == "True":
self.node_net_client = OvsNetClient(self.network_cmd) self.node_net_client = OvsNetClient(self.node_net_cmd)
else: else:
self.node_net_client = LinuxNetClient(self.network_cmd) self.node_net_client = LinuxNetClient(self.node_net_cmd)
if start: if start:
self.startup() self.startup()
@ -589,9 +602,10 @@ class CoreNode(CoreNodeBase):
""" """
return self.client.cmd_output(args) return self.client.cmd_output(args)
def network_cmd(self, args): def node_net_cmd(self, args):
""" """
Runs a command for a node that is used to configure and setup network interfaces. Runs a command that is used to configure and setup the network within a
node.
:param list[str]|str args: command to run :param list[str]|str args: command to run
:return: combined stdout and stderr :return: combined stdout and stderr

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

@ -190,7 +190,7 @@ class DockerNode(CoreNode):
raise CoreCommandError(status, args, output) raise CoreCommandError(status, args, output)
return output return output
def network_cmd(self, args): def node_net_cmd(self, args):
if not self.up: if not self.up:
logging.debug("node down, not running network command: %s", args) logging.debug("node down, not running network command: %s", args)
return 0 return 0

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

@ -193,7 +193,7 @@ class LxcNode(CoreNode):
raise CoreCommandError(status, args, output) raise CoreCommandError(status, args, output)
return output return output
def network_cmd(self, args): def node_net_cmd(self, args):
if not self.up: if not self.up:
logging.debug("node down, not running network command: %s", args) logging.debug("node down, not running network command: %s", args)
return 0 return 0