VAT-to-PAPI: VPPCounters

[csit.git] / resources / libraries / python / VatExecutor.py

diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index 03379ba..c13e990 100644 (file)
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -20,8 +20,8 @@ from paramiko.ssh_exception import SSHException
 from robot.api import logger
 
 from resources.libraries.python.ssh import SSH, SSHTimeout
-from resources.libraries.python.constants import Constants
-from resources.libraries.python.VatHistory import VatHistory
+from resources.libraries.python.Constants import Constants
+from resources.libraries.python.PapiHistory import PapiHistory
 
 __all__ = ['VatExecutor']
 
@@ -109,7 +109,9 @@ class VatExecutor(object):
             remote_file_path = vat_name
             with open(vat_name, 'r') as vat_file:
                 for line in vat_file:
-                    VatHistory.add_to_vat_history(node, line.replace('\n', ''))
+                    PapiHistory.add_to_papi_history(node,
+                                                    line.replace('\n', ''),
+                                                    papi=False)
         else:
             remote_file_path = '{0}/{1}/{2}'.format(Constants.REMOTE_FW_DIR,
                                                     Constants.RESOURCES_TPL_VAT,
@@ -201,7 +203,7 @@ class VatExecutor(object):
         return self._stderr
 
     @staticmethod
-    def cmd_from_template(node, vat_template_file, **vat_args):
+    def cmd_from_template(node, vat_template_file, json_param=True, **vat_args):
         """Execute VAT script on specified node. This method supports
         script templates with parameters.
 
@@ -210,7 +212,7 @@ class VatExecutor(object):
         :param vat_args: Arguments to the template file.
         :returns: List of JSON objects returned by VAT.
         """
-        with VatTerminal(node) as vat:
+        with VatTerminal(node, json_param=json_param) as vat:
             return vat.vat_terminal_exec_cmd_from_template(vat_template_file,
                                                            **vat_args)
 
@@ -283,7 +285,7 @@ class VatTerminal(object):
         :returns: Command output in python representation of JSON format or
             None if not in JSON mode.
         """
-        VatHistory.add_to_vat_history(self._node, cmd)
+        PapiHistory.add_to_papi_history(self._node, cmd, papi=False)
         logger.debug("Executing command in VAT terminal: {0}".format(cmd))
         try:
             out = self._ssh.interactive_terminal_exec_command(self._tty, cmd,