scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 20:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

JSON: LFCliBase json_post improves terminology and completeness for suppressing related commands

Browse Source
This commit is contained in:
Jed Reynolds
2020-06-29 14:18:48 -07:00
parent 38b424e8b3
commit 7b488a8553
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
py-json/LANforge/lfcli_base.py
View File

@@ -30,21 +30,43 @@ class LFCliBase:
# like when developing; you might toggle this with use_preexec = _debug # like when developing; you might toggle this with use_preexec = _debug
# Otherwise, preexec methods use more processing time because they add an extra CLI call # Otherwise, preexec methods use more processing time because they add an extra CLI call
# into the queue, and inspect it -- typically nc_show_port # into the queue, and inspect it -- typically nc_show_port
self.use_preexec = False self.suppress_related_commands = None
def clear_test_results(self): def clear_test_results(self):
self.test_results.clear() self.test_results.clear()
def json_post(self, _req_url, _data, debug_=False, use_preexec_=True): def json_post(self, _req_url, _data, debug_=False, suppress_related_commands_=None):
"""
send json to the LANforge client
:param _req_url:
:param _data:
:param debug_:
:param suppress_related_commands_: when False, override self.preexec; when True use
:return:
"""
json_response = None json_response = None
try: try:
lf_r = LFRequest.LFRequest(self.lfclient_url, _req_url, debug_=self.debug, die_on_error_=self.exit_on_error) lf_r = LFRequest.LFRequest(self.lfclient_url, _req_url, debug_=self.debug, die_on_error_=self.exit_on_error)
if self.use_preexec or use_preexec_: if suppress_related_commands_ is None:
if 'suppress_preexec_cli' in _data:
del _data['suppress_preexec_cli']
if 'suppress_preexec_method' in _data:
del _data['suppress_preexec_method']
if 'suppress_postexec_cli' in _data:
del _data['suppress_postexec_cli']
if 'suppress_postexec_method' in _data:
del _data['suppress_postexec_method']
elif suppress_related_commands_ == False:
_data['suppress_preexec_cli'] = False _data['suppress_preexec_cli'] = False
_data['suppress_preexec_method'] = False _data['suppress_preexec_method'] = False
else: _data['suppostss_postexec_cli'] = False
_data['suppress_preexec_cli'] = True _data['suppostss_postexec_method'] = False
_data['suppress_preexec_method'] = True elif self.suppress_related_commands or suppress_related_commands_:
_data['suppress_preexec_cli'] = False
_data['suppress_preexec_method'] = False
_data['suppostss_postexec_cli'] = True
_data['suppostss_postexec_method'] = True
lf_r.addPostData(_data) lf_r.addPostData(_data)
if debug_ or self.debug: if debug_ or self.debug:
LANforge.LFUtils.debug_printer.pprint(_data) LANforge.LFUtils.debug_printer.pprint(_data)