aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
Diffstat (limited to 'resources/tools')
-rwxr-xr-xresources/tools/scripts/topo_reservation.py19
1 files changed, 18 insertions, 1 deletions
diff --git a/resources/tools/scripts/topo_reservation.py b/resources/tools/scripts/topo_reservation.py
index c1b5c4658e..0016ebc0cc 100755
--- a/resources/tools/scripts/topo_reservation.py
+++ b/resources/tools/scripts/topo_reservation.py
@@ -24,13 +24,30 @@ import argparse
import sys
import yaml
-from resources.libraries.python.ssh import exec_cmd
+from resources.libraries.python.ssh import exec_cmd as _exec_cmd
RESERVATION_DIR = u"/tmp/reservation_dir"
RESERVATION_NODE = u"TG"
+def exec_cmd(node, cmd):
+ """A wrapper around ssh.exec_cmd with disabled JSON export.
+
+ Using this, maintainers can use "exec_cmd" without worrying
+ about interaction with json export.
+
+ TODO: Instead this, divide ssh module into reusable and robot-bound parts.
+
+ :param node: Node object as parsed from topology file to execute cmd on.
+ :param cmd: Command to execute.
+ :type node: dict
+ :type cmd: str
+ :returns: RC, Stdout, Stderr.
+ :rtype: Tuple[int, str, str]
+ """
+ return _exec_cmd(node, cmd, export=False)
+
def diag_cmd(node, cmd):
"""Execute cmd, print cmd and stdout, ignore stderr and rc; return None.