X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVatExecutor.py;h=a3f12bf46f7a59eac56502d41cc5ffa8bad5e5f8;hb=08e35e37f7ad3394cea86c22ab7ffd990651c112;hp=bbce83d1add0896e0170146243c67599da19d9cc;hpb=cf561a6e3d4c4fbd78ab6c9d0a9aa817bb3300fc;p=csit.git

diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index bbce83d1ad..a3f12bf46f 100644
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -19,6 +19,7 @@ from robot.api import logger
 
 from resources.libraries.python.ssh import SSH
 from resources.libraries.python.constants import Constants
+from resources.libraries.python.VatHistory import VatHistory
 
 
 __all__ = ['VatExecutor']
@@ -83,6 +84,79 @@ class VatExecutor(object):
         # TODO: download vpp_api_test output file
         # self._delete_files(node, remote_file_path, remote_file_out)
 
+    def scp_and_execute_script(self, vat_name, node, timeout=10, json_out=True):
+        """Copy vat_name script to node, execute it and return result.
+
+        :param vat_name: Name of the vat script file.
+        Full path and name of the script is required.
+        :param node: Node to execute the VAT script on.
+        :param timeout: Seconds to allow the script to run.
+        :param json_out: Require JSON output.
+        :type vat_name: str
+        :type node: dict
+        :type timeout: int
+        :type json_out: bool
+        :returns: Status code, stdout and stderr of executed script
+        :rtype: tuple
+        """
+
+        ssh = SSH()
+        ssh.connect(node)
+
+        ssh.scp(vat_name, vat_name)
+
+        cmd = "sudo -S {vat} {json} < {input}".format(
+            json="json" if json_out is True else "",
+            vat=Constants.VAT_BIN_NAME,
+            input=vat_name)
+        (ret_code, stdout, stderr) = ssh.exec_command(cmd, timeout)
+        self._ret_code = ret_code
+        self._stdout = stdout
+        self._stderr = stderr
+
+        logger.trace("Command '{0}' returned {1}'".format(cmd, self._ret_code))
+        logger.trace("stdout: '{0}'".format(self._stdout))
+        logger.trace("stderr: '{0}'".format(self._stderr))
+
+        self._delete_files(node, vat_name)
+
+    def scp_and_execute_cli_script(self, fname, node, timeout=10,
+                                   json_out=True):
+        """Copy vat_name script to node, execute it and return result.
+
+        :param fname: Name of the VPP script file.
+        Full path and name of the script is required.
+        :param node: Node to execute the VPP script on.
+        :param timeout: Seconds to allow the script to run.
+        :param json_out: Require JSON output.
+        :type vat_name: str
+        :type node: dict
+        :type timeout: int
+        :type json_out: bool
+        :returns: Status code, stdout and stderr of executed script
+        :rtype: tuple
+        """
+
+        ssh = SSH()
+        ssh.connect(node)
+
+        ssh.scp(fname, fname)
+
+        cmd = "{vat} {json}".format(json="json" if json_out is True else "",
+                                    vat=Constants.VAT_BIN_NAME)
+        cmd_input = "exec exec {0}".format(fname)
+        (ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd, cmd_input,
+                                                           timeout)
+        self._ret_code = ret_code
+        self._stdout = stdout
+        self._stderr = stderr
+
+        logger.trace("Command '{0}' returned {1}'".format(cmd, self._ret_code))
+        logger.trace("stdout: '{0}'".format(self._stdout))
+        logger.trace("stderr: '{0}'".format(self._stderr))
+
+        self._delete_files(node, fname)
+
     def execute_script_json_out(self, vat_name, node, timeout=10):
         """Pass all arguments to 'execute_script' method, then cleanup returned
         json output."""
@@ -156,20 +230,22 @@ class VatTerminal(object):
 
     """
 
-    __VAT_PROMPT = "vat# "
-    __LINUX_PROMPT = ":~$ "
+    __VAT_PROMPT = ("vat# ", )
+    __LINUX_PROMPT = (":~$ ", "~]$ ")
 
     def __init__(self, node, json_param=True):
         json_text = ' json' if json_param else ''
         self.json = json_param
+        self._node = node
         self._ssh = SSH()
-        self._ssh.connect(node)
+        self._ssh.connect(self._node)
         self._tty = self._ssh.interactive_terminal_open()
         self._ssh.interactive_terminal_exec_command(
             self._tty,
             'sudo -S {}{}'.format(Constants.VAT_BIN_NAME, json_text),
             self.__VAT_PROMPT)
         self._exec_failure = False
+        self.vat_stdout = None
 
     def __enter__(self):
         return self
@@ -185,10 +261,12 @@ class VatTerminal(object):
         :return: Command output in python representation of JSON format or
         None if not in JSON mode.
         """
+        VatHistory.add_to_vat_history(self._node, cmd)
         logger.debug("Executing command in VAT terminal: {}".format(cmd))
         try:
             out = self._ssh.interactive_terminal_exec_command(self._tty, cmd,
                                                               self.__VAT_PROMPT)
+            self.vat_stdout = out
         except:
             self._exec_failure = True
             raise
@@ -217,7 +295,7 @@ class VatTerminal(object):
 
     def vat_terminal_close(self):
         """Close VAT terminal."""
-        #interactive terminal is dead, we only need to close session
+        # interactive terminal is dead, we only need to close session
         if not self._exec_failure:
             self._ssh.interactive_terminal_exec_command(self._tty,
                                                         'quit',