refactored scripts to use --no_cleanup

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>

py-json/LANforge/lfcli_base.py

@@ -761,7 +761,7 @@ class LFCliBase:
         optional.add_argument('--debug_log',
                               default=None,
                               help="Specify a file to send debug output to")
-        optional.add_argument('--noclean', help='Do not cleanup before exit',
+        optional.add_argument('--no_cleanup', help='Do not cleanup before exit',
                               action='store_true')
         if more_optional is not None:
             for argument in more_optional:

py-scripts/create_bond.py

@@ -109,7 +109,7 @@ Command example:
 ./create_bond.py
     --bond_name bond0
     --network_dev_list eth0,eth1
-    --noclean
+    --no_cleanup
     --debug
             ''')
 
@@ -134,7 +134,7 @@ Command example:
                              )
     create_bond.build()
 
-    if not args.noclean:
+    if not args.no_cleanup:
         sleep(5)
 
         create_bond.cleanup()

py-scripts/create_bridge.py

@@ -134,7 +134,7 @@ Command example:
     create_bridge.build()
     logger.info('Created bridge: %s' % bridge_list[0])
 
-    if not args.noclean:
+    if not args.no_cleanup:
         sleep(5)
 
         create_bridge.cleanup()

py-scripts/create_l3.py

@@ -84,7 +84,7 @@ def main():
             Generate traffic between ports
             ''',
         description='''\
-        ./create_l3.py --ssid lanforge --password password --security wpa2 --radio 1.1.wiphy0 --endp_a wiphy0 --endp_b wiphy1 --noclean
+        ./create_l3.py --ssid lanforge --password password --security wpa2 --radio 1.1.wiphy0 --endp_a wiphy0 --endp_b wiphy1 --no_cleanup
         ''')
     parser.add_argument(
         '--min_rate_a',
@@ -141,10 +141,10 @@ def main():
 
     ip_var_test.build()
 
-    # TODO:  Delete the thing just created, unless --noclean option was added.
+    # TODO:  Delete the thing just created, unless --no_cleanup option was added.
     # Similar to how the create_bond.py does it.
 
-    if not args.noclean:
+    if not args.no_cleanup:
         ip_var_test.pre_cleanup()
 
     if ip_var_test.passes():

py-scripts/create_l3_stations.py

@@ -280,7 +280,7 @@ def main():
         ip_var_test.pre_cleanup()
     ip_var_test.build()
 
-    # TODO:  Do cleanup by default, allow --noclean option to skip cleanup.
+    # TODO:  Do cleanup by default, allow --no_cleanup option to skip cleanup.
 
     if ip_var_test.passes():
         logger.info("Created %s stations and connections" % (num_sta))

py-scripts/create_l4.py

@@ -239,7 +239,7 @@ python3 ./layer4.py
     ip_var_test.cleanup()
     ip_var_test.build()
 
-    # TODO:  Clean up by default, and add --noclean option to NOT do cleanup.
+    # TODO:  Clean up by default, and add --no_cleanup option to NOT do cleanup.
 
     if ip_var_test.passes():
         ip_var_test.exit_success()

py-scripts/create_macvlan.py

@@ -250,7 +250,7 @@ Generic command layout:
 
     ip_test.build()
 
-    # TODO:  Cleanup by default, add --noclean option to not do cleanup.
+    # TODO:  Cleanup by default, add --no_cleanup option to not do cleanup.
 
     if ip_test.passes():
         print('Created %s MacVlan connections' % args.num_ports)

py-scripts/create_qvlan.py

@@ -222,7 +222,7 @@ def main():
                                debug=args.debug)
     create_qvlan.build()
 
-    # TODO:  Add code to clean up the stations built, unless --noclean is specified.
+    # TODO:  Add code to clean up the stations built, unless --no_cleanup is specified.
 
     if create_qvlan.passes():
         logging.info('Created %s QVLAN stations' % args.num_ports)

py-scripts/create_station.py

@@ -203,7 +203,7 @@ def main():
 
     create_station.build()
 
-    # TODO:  Add code to clean up the station, unless --noclean was specified.
+    # TODO:  Add code to clean up the station, unless --no_cleanup was specified.
 
     if create_station.passes():
         print('Created %s stations' % num_sta)

py-scripts/create_vap.py

@@ -223,7 +223,7 @@ Command example:
             create_vap._fail("VAP %s was not created." % (vap))
         create_vaps.append(create_vap)
 
-    # TODO:  Add logic to clean up vap, unless --noclean option is specified.
+    # TODO:  Add logic to clean up vap, unless --no_cleanup option is specified.
     # TODO:  Set radio back to previous channel.
 
     any_failed = False

py-scripts/example_security_connection.py

@@ -149,7 +149,7 @@ def main():
     ip_test.timeout = 60
     ip_test.build()
 
-    if not args.noclean:
+    if not args.no_cleanup:
         sleep(5)
         ip_test.cleanup(station_list)
 

py-scripts/sta_connect.py

@@ -491,7 +491,6 @@ class StaConnect(Realm):
 def main():
     parser = Realm.create_basic_argparse(
         prog="sta_connect.py",
-        formatter_class=argparse.RawTextHelpFormatter,
         description="""LANforge Unit Test:  Connect Station to AP
 Example:
 ./sta_connect.py --mgr 192.168.100.209 --dut_ssid OpenWrt-2 --dut_bssid 24:F5:A2:08:21:6C