diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/python/IPsecUtil.py | 12 | ||||
| -rw-r--r-- | resources/libraries/python/VatExecutor.py | 15 |
2 files changed, 17 insertions, 10 deletions
diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py index c52bdc696c..16acb51234 100644 --- a/resources/libraries/python/IPsecUtil.py +++ b/resources/libraries/python/IPsecUtil.py @@ -900,10 +900,12 @@ class IPsecUtil(object): raddr=if1_ip + i * addr_incr)) vat.execute_script( tmp_fn1, nodes['DUT1'], timeout=1800, json_out=False, - copy_on_execute=True) + copy_on_execute=True, + history=False if n_tunnels > 100 else True) vat.execute_script( tmp_fn2, nodes['DUT2'], timeout=1800, json_out=False, - copy_on_execute=True) + copy_on_execute=True, + history=False if n_tunnels > 100 else True) os.remove(tmp_fn1) os.remove(tmp_fn2) @@ -938,10 +940,12 @@ class IPsecUtil(object): mask=128 if if2_ip.version == 6 else 32)) vat.execute_script( tmp_fn1, nodes['DUT1'], timeout=1800, json_out=False, - copy_on_execute=True) + copy_on_execute=True, + history=False if n_tunnels > 100 else True) vat.execute_script( tmp_fn2, nodes['DUT2'], timeout=1800, json_out=False, - copy_on_execute=True) + copy_on_execute=True, + history=False if n_tunnels > 100 else True) os.remove(tmp_fn1) os.remove(tmp_fn2) return diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py index c13e990b63..8197b5eae9 100644 --- a/resources/libraries/python/VatExecutor.py +++ b/resources/libraries/python/VatExecutor.py @@ -74,7 +74,7 @@ class VatExecutor(object): self._script_name = None def execute_script(self, vat_name, node, timeout=120, json_out=True, - copy_on_execute=False): + copy_on_execute=False, history=True): """Execute VAT script on remote node, and store the result. There is an option to copy script from local host to remote host before execution. Path is defined automatically. @@ -87,11 +87,13 @@ class VatExecutor(object): :param json_out: Require JSON output. :param copy_on_execute: If true, copy the file from local host to remote before executing. + :param history: If true, add command to history. :type vat_name: str :type node: dict :type timeout: int :type json_out: bool :type copy_on_execute: bool + :type history: bool :raises SSHException: If cannot open connection for VAT. :raises SSHTimeout: If VAT execution is timed out. :raises RuntimeError: If VAT script execution fails. @@ -107,11 +109,12 @@ class VatExecutor(object): if copy_on_execute: ssh.scp(vat_name, vat_name) remote_file_path = vat_name - with open(vat_name, 'r') as vat_file: - for line in vat_file: - PapiHistory.add_to_papi_history(node, - line.replace('\n', ''), - papi=False) + if history: + with open(vat_name, 'r') as vat_file: + for line in vat_file: + 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, |