From d09901429901507084d9904ab99f49ca4e738cb2 Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Tue, 29 Dec 2020 14:41:24 -0800 Subject: [PATCH 1/2] minor fix --- py-scripts/test_ipv4_variable_time.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py-scripts/test_ipv4_variable_time.py b/py-scripts/test_ipv4_variable_time.py index 2e8d3676..17819947 100755 --- a/py-scripts/test_ipv4_variable_time.py +++ b/py-scripts/test_ipv4_variable_time.py @@ -228,7 +228,7 @@ def main(): ip_var_test.start(False, False) if args.report_file is None: - if args.output_format.isin(['csv','json','html','hdf','stata','pickle','pdf','parquet']): + if args.output_format in ['csv','json','html','hdf','stata','pickle','pdf','parquet']: report_f='/home/lanforge/report-data/'+str(datetime.datetime.now()).replace(':','-')+'test_ipv4_variable_time.' + args.output_format output=args.output_format else: From c42961f6af4bb7bfd2debde6093187090256ba29 Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Wed, 30 Dec 2020 11:02:20 -0800 Subject: [PATCH 2/2] formatting error --- py-scripts/test_ipv4_connection.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py index 713c238e..89a5e5c6 100755 --- a/py-scripts/test_ipv4_connection.py +++ b/py-scripts/test_ipv4_connection.py @@ -137,7 +137,7 @@ def main(): prog='test_ipv4_connection.py', formatter_class=argparse.RawTextHelpFormatter, epilog='''\ - Create stations that attempt to authenticate, associate, and receive IP addresses on the + Create stations that attempt to authenticate, associate, and receive IP addresses on the chosen SSID ''', @@ -145,17 +145,17 @@ def main(): test_ipv4_connection.py -------------------- Command example: -./test_ipv4_connection.py - --upstream_port eth1 - --radio wiphy0 - --num_stations 3 - --security open - --ssid netgear - --passwd BLANK +./test_ipv4_connection.py + --upstream_port eth1 + --radio wiphy0 + --num_stations 3 + --security open + --ssid netgear + --passwd BLANK --debug ''') required = parser.add_argument_group('required arguments') - required.add_argument('--security', help='WiFi Security protocol: < open | wep | wpa | wpa2 | wpa3 >', required=True) + #required.add_argument('--security', help='WiFi Security protocol: < open | wep | wpa | wpa2 | wpa3 >', required=True) args = parser.parse_args() #if args.debug: @@ -203,7 +203,7 @@ Command example: if ip_test.passes(): ip_test.add_event(name="test_ipv4_connection.py", message="Full test passed, all stations associated and got IP") ip_test.exit_success() - + if __name__ == "__main__": main()