X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fscripts%2Ftopo_reservation.py;h=0016ebc0cc8265dfe96480408bddac1d348cd970;hb=f63e6b83d830734fdb94b8f0384a808f189711f1;hp=021c60a6b6fe7682b87b22c6c376cce121a61160;hpb=ac33ed374cb82c9258e4cf57e150f77750362bbc;p=csit.git

diff --git a/resources/tools/scripts/topo_reservation.py b/resources/tools/scripts/topo_reservation.py
index 021c60a6b6..0016ebc0cc 100755
--- a/resources/tools/scripts/topo_reservation.py
+++ b/resources/tools/scripts/topo_reservation.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -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.