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

testgroup2: Fix linting errors

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-12-08 13:29:48 -08:00
parent 5f9fd108a8
commit edadf4f545
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
py-scripts/testgroup2.py
View File

@@ -14,7 +14,6 @@ if sys.version_info[0] != 3:
print("This script requires Python 3") print("This script requires Python 3")
exit(1) exit(1)
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base")
@@ -42,13 +41,17 @@ class TestGroup2(Realm):
list_groups=None, list_groups=None,
tg_action=None, tg_action=None,
cx_action=None, cx_action=None,
add_cx_list=[], add_cx_list=None,
rm_cx_list=[], rm_cx_list=None,
show_group=None, show_group=None,
_debug_on=False, _debug_on=False,
_exit_on_error=False, _exit_on_error=False,
_exit_on_fail=False): _exit_on_fail=False):
super().__init__(host, port) super().__init__(host, port)
if rm_cx_list is None:
rm_cx_list = []
if add_cx_list is None:
add_cx_list = []
self.upstream = upstream self.upstream = upstream
self.host = host self.host = host
self.port = port self.port = port
@@ -91,8 +94,7 @@ class TestGroup2(Realm):
self.list_groups = list_groups self.list_groups = list_groups
self.show_group = show_group self.show_group = show_group
self.tg_profile = self.new_test_group_profile() self.tg_profile = self.new_test_group_profile()
if group_name is None and list_groups is None and (tg_action is not None or cx_action is not None or if not group_name and not list_groups and (tg_action or cx_action or add_cx_list or rm_cx_list or show_group):
add_cx_list is not None or rm_cx_list is not None or show_group is not None):
raise ValueError("Group name must be set if manipulating test groups") raise ValueError("Group name must be set if manipulating test groups")
else: else:
self.tg_profile.group_name = group_name self.tg_profile.group_name = group_name
@@ -102,12 +104,11 @@ class TestGroup2(Realm):
else: else:
self.add_cx_list = add_cx_list self.add_cx_list = add_cx_list
if rm_cx_list is not None and len(rm_cx_list) == 1 and ',' in rm_cx_list[0]: if rm_cx_list and len(rm_cx_list) == 1 and ',' in rm_cx_list[0]:
self.rm_cx_list = rm_cx_list[0].split(',') self.rm_cx_list = rm_cx_list[0].split(',')
else: else:
self.rm_cx_list = rm_cx_list self.rm_cx_list = rm_cx_list
def pre_cleanup(self): def pre_cleanup(self):
self.cx_profile.cleanup_prefix() self.cx_profile.cleanup_prefix()
for sta in self.sta_list: for sta in self.sta_list:
@@ -130,7 +131,7 @@ class TestGroup2(Realm):
side_a=self.station_profile.station_names, side_a=self.station_profile.station_names,
side_b=self.upstream, side_b=self.upstream,
sleep_time=0) sleep_time=0)
self.add_cx_list=self.cx_profile.get_cx_names() self.add_cx_list = self.cx_profile.get_cx_names()
self._pass("PASS: Station build finished") self._pass("PASS: Station build finished")
def do_cx_action(self): def do_cx_action(self):
@@ -173,6 +174,7 @@ class TestGroup2(Realm):
print(cx) print(cx)
else: else:
print("No cxs found in %s" % self.tg_profile.group_name) print("No cxs found in %s" % self.tg_profile.group_name)
def update_cxs(self): def update_cxs(self):
if len(self.add_cx_list) > 0: if len(self.add_cx_list) > 0:
print("Adding cxs %s to %s" % (', '.join(self.add_cx_list), self.tg_profile.group_name)) print("Adding cxs %s to %s" % (', '.join(self.add_cx_list), self.tg_profile.group_name))
@@ -186,6 +188,7 @@ class TestGroup2(Realm):
if cx in self.tg_profile.cx_list: if cx in self.tg_profile.cx_list:
self.tg_profile.cx_list.remove(cx) self.tg_profile.cx_list.remove(cx)
def main(): def main():
parser = LFCliBase.create_basic_argparse( parser = LFCliBase.create_basic_argparse(
prog='testgroup2.py', prog='testgroup2.py',
@@ -236,7 +239,7 @@ python3 ./testgroup2.py
for group in parser._action_groups: for group in parser._action_groups:
if group.title == "required arguments": if group.title == "required arguments":
required_args = group required_args = group
break; break
if required_args is not None: if required_args is not None:
required_args.add_argument('--a_min', help='--a_min bps rate minimum for side_a', default=256000) required_args.add_argument('--a_min', help='--a_min bps rate minimum for side_a', default=256000)
required_args.add_argument('--b_min', help='--b_min bps rate minimum for side_b', default=256000) required_args.add_argument('--b_min', help='--b_min bps rate minimum for side_b', default=256000)
@@ -246,7 +249,7 @@ python3 ./testgroup2.py
for group in parser._action_groups: for group in parser._action_groups:
if group.title == "optional arguments": if group.title == "optional arguments":
optional_args = group optional_args = group
break; break
if optional_args is not None: if optional_args is not None:
optional_args.add_argument('--mode', help='Used to force mode of stations') optional_args.add_argument('--mode', help='Used to force mode of stations')
optional_args.add_argument('--ap', help='Used to force a connection to a particular AP') optional_args.add_argument('--ap', help='Used to force a connection to a particular AP')
@@ -254,7 +257,8 @@ python3 ./testgroup2.py
tg_group = parser.add_mutually_exclusive_group() tg_group = parser.add_mutually_exclusive_group()
tg_group.add_argument('--add_group', help='add new test group', action='store_true', default=False) tg_group.add_argument('--add_group', help='add new test group', action='store_true', default=False)
tg_group.add_argument('--del_group', help='delete test group', action='store_true', default=False) tg_group.add_argument('--del_group', help='delete test group', action='store_true', default=False)
parser.add_argument('--show_group', help='show connections in current test group', action='store_true', default=False) parser.add_argument('--show_group', help='show connections in current test group', action='store_true',
default=False)
cx_group = parser.add_mutually_exclusive_group() cx_group = parser.add_mutually_exclusive_group()
cx_group.add_argument('--start_group', help='start all cxs in chosen test group', default=None) cx_group.add_argument('--start_group', help='start all cxs in chosen test group', default=None)
@@ -272,7 +276,6 @@ python3 ./testgroup2.py
station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta - 1, padding_number_=10000, station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta - 1, padding_number_=10000,
radio=args.radio) radio=args.radio)
tg_action = None tg_action = None
cx_action = None cx_action = None