Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Optimize VPP restart after startup.conf change
[csit.git]
/
resources
/
libraries
/
python
/
VatExecutor.py
diff --git
a/resources/libraries/python/VatExecutor.py
b/resources/libraries/python/VatExecutor.py
index
841bd0c
..
c50fdba
100644
(file)
--- a/
resources/libraries/python/VatExecutor.py
+++ b/
resources/libraries/python/VatExecutor.py
@@
-152,6
+152,9
@@
class VatExecutor(object):
vat=Constants.VAT_BIN_NAME,
input=vat_name)
vat=Constants.VAT_BIN_NAME,
input=vat_name)
+ with open(vat_name, 'r') as tmp_f:
+ VatHistory.add_to_vat_history(node, tmp_f.read())
+
try:
(ret_code, stdout, stderr) = ssh.exec_command(cmd, timeout)
except SSHTimeout:
try:
(ret_code, stdout, stderr) = ssh.exec_command(cmd, timeout)
except SSHTimeout:
@@
-197,6
+200,10
@@
class VatExecutor(object):
vat=Constants.VAT_BIN_NAME)
cmd_input = "exec exec {0}".format(fname)
vat=Constants.VAT_BIN_NAME)
cmd_input = "exec exec {0}".format(fname)
+ VatHistory.add_to_vat_history(node, cmd_input)
+ with open(fname, 'r') as tmp_f:
+ VatHistory.add_to_vat_history(node, tmp_f.read())
+
try:
(ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd, cmd_input,
timeout)
try:
(ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd, cmd_input,
timeout)
@@
-297,7
+304,7
@@
class VatTerminal(object):
"""
__VAT_PROMPT = ("vat# ", )
"""
__VAT_PROMPT = ("vat# ", )
- __LINUX_PROMPT = (":~$ ", "~]$ ")
+ __LINUX_PROMPT = (":~$ ", "~]$ "
, "~]# "
)
def __init__(self, node, json_param=True):
json_text = ' json' if json_param else ''
def __init__(self, node, json_param=True):
json_text = ' json' if json_param else ''
@@
-318,7
+325,7
@@
class VatTerminal(object):
'sudo -S {0}{1}'.format(Constants.VAT_BIN_NAME, json_text),
self.__VAT_PROMPT)
except Exception:
'sudo -S {0}{1}'.format(Constants.VAT_BIN_NAME, json_text),
self.__VAT_PROMPT)
except Exception:
-
continue
+ continue
else:
break
else:
else:
break
else: