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

removed node based check_cmd, updated to use appropriate function

Browse source
This commit is contained in:
Blake Harnden 2019-10-11 12:57:37 -07:00
parent 4a6d69bb09
commit d326f246a7
11 changed files with 51 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/core/emane/emanemanager.py
View file

@ -152,8 +152,13 @@ class EmaneManager(ModelManager):
"""
try:
# check for emane
emane_version = utils.check_cmd(["emane", "--version"])
args = ["emane", "--version"]
emane_version = utils.check_cmd(args)
logging.info("using EMANE: %s", emane_version)
args = " ".join(args)
for server in self.session.servers:
conn = self.session.servers[server]
distributed.remote_cmd(conn, args)
# load default emane models
self.load_models(EMANE_MODELS)

10
daemon/core/emulator/session.py
View file

@ -140,6 +140,11 @@ class Session(object):
self.options.set_config(key, value)
self.metadata = SessionMetaData()
# distributed servers
self.servers = {}
self.tunnels = {}
self.address = None
# initialize session feature helpers
self.broker = CoreBroker(session=self)
self.location = CoreLocation()
@ -148,11 +153,6 @@ class Session(object):
self.emane = EmaneManager(session=self)
self.sdt = Sdt(session=self)
# distributed servers
self.servers = {}
self.tunnels = {}
self.address = None
# initialize default node services
self.services.default_services = {
"mdr": ("zebra", "OSPFv3MDR", "IPForward"),

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

@ -84,18 +84,24 @@ class NodeBase(object):
"""
raise NotImplementedError
def net_cmd(self, args, env=None):
def net_cmd(self, args, env=None, cwd=None, wait=True):
"""
Runs a command that is used to configure and setup the network on the host
system.
:param list[str]|str args: command to run
:param dict env: environment to run command with
:param str cwd: directory to run command in
:param bool wait: True to wait for status, False otherwise
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
raise NotImplementedError
if self.server is None:
return utils.check_cmd(args, env=env, cwd=cwd)
else:
args = " ".join(args)
return distributed.remote_cmd(self.server, args, env, cwd, wait)
def setposition(self, x=None, y=None, z=None):
"""
@ -381,40 +387,13 @@ class CoreNodeBase(NodeBase):
return common
def net_cmd(self, args, env=None):
"""
Runs a command that is used to configure and setup the network on the host
system.
:param list[str]|str args: command to run
:param dict env: environment to run command with
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
if self.server is None:
return utils.check_cmd(args, env=env)
else:
args = " ".join(args)
return distributed.remote_cmd(self.server, args, env=env)
def node_net_cmd(self, args):
def node_net_cmd(self, args, wait=True):
"""
Runs a command that is used to configure and setup the network within a
node.
:param list[str]|str args: command to run
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
raise NotImplementedError
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:param bool wait: True to wait for status, False otherwise
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
@ -607,18 +586,6 @@ class CoreNode(CoreNodeBase):
args = " ".join(args)
return distributed.remote_cmd(self.server, args, wait=wait)
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:param bool wait: True to wait for status, False otherwise
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
return self.client.check_cmd(args)
def termcmdstring(self, sh="/bin/sh"):
"""
Create a terminal command string.

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

@ -142,17 +142,6 @@ class DockerNode(CoreNode):
self.client.stop_container()
self.up = False
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
return self.client.check_cmd(args)
def node_net_cmd(self, args, wait=True):
if not self.up:
logging.debug("node down, not running network command: %s", args)
@ -178,7 +167,7 @@ class DockerNode(CoreNode):
"""
logging.debug("creating node dir: %s", path)
args = "mkdir -p {path}".format(path=path)
self.check_cmd(args)
self.client.check_cmd(args)
def mount(self, source, target):
"""

17
daemon/core/nodes/interface.py
View file

@ -48,12 +48,23 @@ class CoreInterface(object):
self.server = server
self.net_client = LinuxNetClient(self.net_cmd)
def net_cmd(self, args):
def net_cmd(self, args, env=None, cwd=None, wait=True):
"""
Runs a command on the host system or distributed servers.
:param list[str]|str args: command to run
:param dict env: environment to run command with
:param str cwd: directory to run command in
:param bool wait: True to wait for status, False otherwise
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
if self.server is None:
return utils.check_cmd(args)
return utils.check_cmd(args, env=env, cwd=cwd)
else:
args = " ".join(args)
return distributed.remote_cmd(self.server, args)
return distributed.remote_cmd(self.server, args, env, cwd, wait)
def startup(self):
"""

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

@ -140,22 +140,11 @@ class LxcNode(CoreNode):
self.client.stop_container()
self.up = False
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
return self.client.check_cmd(args)
def node_net_cmd(self, args, wait=True):
if not self.up:
logging.debug("node down, not running network command: %s", args)
return ""
return self.check_cmd(args)
return self.client.check_cmd(args)
def termcmdstring(self, sh="/bin/sh"):
"""
@ -175,7 +164,7 @@ class LxcNode(CoreNode):
"""
logging.info("creating node dir: %s", path)
args = "mkdir -p {path}".format(path=path)
self.check_cmd(args)
return self.client.check_cmd(args)
def mount(self, source, target):
"""

3
daemon/core/nodes/netclient.py
View file

@ -5,7 +5,6 @@ Clients for dealing with bridge/interface commands.
import os
from core.constants import BRCTL_BIN, ETHTOOL_BIN, IP_BIN, OVS_BIN, TC_BIN
from core.utils import check_cmd
class LinuxNetClient(object):
@ -275,7 +274,7 @@ class LinuxNetClient(object):
:param str name: bridge name
:return: nothing
"""
check_cmd([BRCTL_BIN, "setageing", name, "0"])
self.run([BRCTL_BIN, "setageing", name, "0"])
class OvsNetClient(LinuxNetClient):

8
daemon/core/nodes/network.py
View file

@ -308,24 +308,26 @@ class CoreNetwork(CoreNetworkBase):
self.startup()
ebq.startupdateloop(self)
def net_cmd(self, args, env=None):
def net_cmd(self, args, env=None, cwd=None, wait=True):
"""
Runs a command that is used to configure and setup the network on the host
system and all configured distributed servers.
:param list[str]|str args: command to run
:param dict env: environment to run command with
:param str cwd: directory to run command in
:param bool wait: True to wait for status, False otherwise
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
logging.info("network node(%s) cmd", self.name)
output = utils.check_cmd(args, env=env)
output = utils.check_cmd(args, env=env, cwd=cwd)
args = " ".join(args)
for server in self.session.servers:
conn = self.session.servers[server]
distributed.remote_cmd(conn, args, env=env)
distributed.remote_cmd(conn, args, env, cwd, wait)
return output

33
daemon/core/nodes/physical.py
View file

@ -51,21 +51,6 @@ class PhysicalNode(CoreNodeBase):
"""
return sh
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:return: combined stdout and stderr
:rtype: str
:raises CoreCommandError: when a non-zero exit status occurs
"""
os.chdir(self.nodedir)
return utils.check_cmd(args)
def shcmd(self, cmdstr, sh="/bin/sh"):
return self.node_net_cmd([sh, "-c", cmdstr])
def sethwaddr(self, ifindex, addr):
"""
Set hardware address for an interface.
@ -205,13 +190,13 @@ class PhysicalNode(CoreNodeBase):
source = os.path.abspath(source)
logging.info("mounting %s at %s", source, target)
os.makedirs(target)
self.check_cmd([constants.MOUNT_BIN, "--bind", source, target])
self.net_cmd([constants.MOUNT_BIN, "--bind", source, target], cwd=self.nodedir)
self._mounts.append((source, target))
def umount(self, target):
logging.info("unmounting '%s'" % target)
try:
self.check_cmd([constants.UMOUNT_BIN, "-l", target])
self.net_cmd([constants.UMOUNT_BIN, "-l", target], cwd=self.nodedir)
except CoreCommandError:
logging.exception("unmounting failed for %s", target)
@ -256,7 +241,8 @@ class Rj45Node(CoreNodeBase, CoreInterface):
:param str name: node name
:param mtu: rj45 mtu
:param bool start: start flag
:param str server: remote server node will run on, default is None for localhost
:param fabric.connection.Connection server: remote server node will run on,
default is None for localhost
"""
CoreNodeBase.__init__(self, session, _id, name, start, server)
CoreInterface.__init__(self, node=self, name=name, mtu=mtu)
@ -498,17 +484,6 @@ class Rj45Node(CoreNodeBase, CoreInterface):
CoreInterface.setposition(self, x, y, z)
return result
def check_cmd(self, args):
"""
Runs shell command on node.
:param list[str]|str args: command to run
:return: exist status and combined stdout and stderr
:rtype: tuple[int, str]
:raises CoreCommandError: when a non-zero exit status occurs
"""
raise NotImplementedError
def termcmdstring(self, sh):
"""
Create a terminal command string.

3
daemon/core/services/coreservices.py
View file

@ -631,8 +631,9 @@ class CoreServices(object):
"""
status = 0
for args in service.shutdown:
args = utils.split_args(args)
try:
node.check_cmd(args)
node.node_net_cmd(args)
except CoreCommandError:
logging.exception("error running stop command %s", args)
status = -1

2
daemon/tests/test_nodes.py
View file

@ -30,7 +30,7 @@ class TestNodes:
assert os.path.exists(node.nodedir)
assert node.alive()
assert node.up
assert node.check_cmd(["ip", "addr", "show", "lo"])
assert node.node_net_cmd(["ip", "addr", "show", "lo"])
def test_node_update(self, session):
# given