From c18d33f362c83c14f9b03352019523f1d58bd4a6 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 15 Jul 2021 06:52:43 -0600 Subject: [PATCH] Revert "Add optional debug output to Chamberview test scripts, wifi capacity, dataplane" This reverts commit a7ff3e9227f26652bcc702212b6e010d68c05007. Signed-off-by: Chuck SmileyRekiere --- py-json/cv_test_manager.py | 8 ++++---- py-scripts/lf_dataplane_test.py | 10 +++------- py-scripts/lf_wifi_capacity_test.py | 11 +++-------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/py-json/cv_test_manager.py b/py-json/cv_test_manager.py index 0354839e..cb764e35 100644 --- a/py-json/cv_test_manager.py +++ b/py-json/cv_test_manager.py @@ -5,9 +5,11 @@ Note: This script is working as library for chamberview tests. import time +from LANforge.lfcli_base import LFCliBase from realm import Realm import json from pprint import pprint +import argparse from cv_test_reports import lanforge_reports as lf_rpt from csv_to_influx import * import os.path @@ -66,14 +68,12 @@ class cv_test(Realm): def __init__(self, lfclient_host="localhost", lfclient_port=8080, - lf_report_dir="", - debug=False + lf_report_dir="" ): super().__init__(lfclient_host=lfclient_host, lfclient_port=lfclient_port) self.lf_report_dir = lf_report_dir self.report_name = None - self.debug = debug # Add a config line to a text blob. Will create new text blob # if none exists already. @@ -128,7 +128,7 @@ class cv_test(Realm): "cmd": command } debug_par = "" - rsp = self.json_post("/gui-json/cmd%s" % debug_par, data, debug_=self.debug, response_json_list_=response_json) + rsp = self.json_post("/gui-json/cmd%s" % debug_par, data, debug_=False, response_json_list_=response_json) try: if response_json[0]["LAST"]["warnings"].startswith("Unknown"): print("Unknown command?\n"); diff --git a/py-scripts/lf_dataplane_test.py b/py-scripts/lf_dataplane_test.py index ff4ca0a7..e76d6bc0 100755 --- a/py-scripts/lf_dataplane_test.py +++ b/py-scripts/lf_dataplane_test.py @@ -139,8 +139,7 @@ class DataplaneTest(cv_test): sets=[], graph_groups=None, report_dir="", - test_rig="", - debug=False + test_rig="" ): super().__init__(lfclient_host=lf_host, lfclient_port=lf_port) @@ -169,7 +168,6 @@ class DataplaneTest(cv_test): self.ssh_port = ssh_port self.local_lf_report_dir = local_lf_report_dir self.test_rig = test_rig - self.debug = debug def setup(self): # Nothing to do at this time. @@ -216,7 +214,7 @@ class DataplaneTest(cv_test): self.config_name, self.sets, self.pull_report, self.lf_host, self.lf_user, self.lf_password, cv_cmds, ssh_port=self.ssh_port, local_lf_report_dir=self.local_lf_report_dir, - graph_groups_file=self.graph_groups, debug=self.debug) + graph_groups_file=self.graph_groups) self.rm_text_blob(self.config_name, blob_test) # To delete old config with same name @@ -308,7 +306,6 @@ def main(): parser.add_argument("--graph_groups", help="File to save graph_groups to", default=None) parser.add_argument("--report_dir", default="") parser.add_argument("--local_lf_report_dir", help="--local_lf_report_dir default '' put where dataplane script run from",default="") - parser.add_argument("--debug", default=False) args = parser.parse_args() @@ -397,8 +394,7 @@ def main(): raw_lines_file = args.raw_lines_file, sets = args.set, graph_groups = args.graph_groups, - test_rig=args.test_rig, - debug=args.debug + test_rig=args.test_rig ) CV_Test.setup() CV_Test.run() diff --git a/py-scripts/lf_wifi_capacity_test.py b/py-scripts/lf_wifi_capacity_test.py index 951713ee..3e207317 100755 --- a/py-scripts/lf_wifi_capacity_test.py +++ b/py-scripts/lf_wifi_capacity_test.py @@ -357,8 +357,7 @@ class WiFiCapacityTest(cv_test): report_dir="", graph_groups=None, test_rig="", - local_lf_report_dir="", - debug=False, + local_lf_report_dir="" ): super().__init__(lfclient_host=lfclient_host, lfclient_port=lf_port) @@ -397,7 +396,6 @@ class WiFiCapacityTest(cv_test): self.graph_groups = graph_groups self.test_rig = test_rig self.local_lf_report_dir = local_lf_report_dir - self.debug = debug def setup(self): if self.create_stations and self.stations != "": @@ -475,8 +473,7 @@ class WiFiCapacityTest(cv_test): self.create_and_run_test(self.load_old_cfg, self.test_name, self.instance_name, self.config_name, self.sets, self.pull_report, self.lfclient_host, self.lf_user, self.lf_password, - cv_cmds, graph_groups_file=self.graph_groups, local_lf_report_dir=self.local_lf_report_dir, - debug=self.debug) + cv_cmds, graph_groups_file=self.graph_groups, local_lf_report_dir=self.local_lf_report_dir) self.rm_text_blob(self.config_name, blob_test) # To delete old config with same name @@ -531,7 +528,6 @@ def main(): parser.add_argument("--scenario", default="") parser.add_argument("--graph_groups", help="File to save graph groups to", default=None) parser.add_argument("--local_lf_report_dir", help="--local_lf_report_dir default '' put where dataplane script run from",default="") - parser.add_argument("--debug", default=False) args = parser.parse_args() @@ -566,8 +562,7 @@ def main(): sets=args.set, graph_groups=args.graph_groups, test_rig=args.test_rig, - local_lf_report_dir=args.local_lf_report_dir, - debug=args.debug + local_lf_report_dir=args.local_lf_report_dir ) WFC_Test.setup() WFC_Test.run()