From 228e0528a13ff0fc4fef99b909e266fb11ac997b Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Mon, 16 Nov 2020 08:36:46 -0700 Subject: [PATCH 01/18] lf_cisco_snp.py : ability to set the min pdu size --- py-scripts/lf_cisco_snp.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/py-scripts/lf_cisco_snp.py b/py-scripts/lf_cisco_snp.py index da107a81..6c89de3d 100755 --- a/py-scripts/lf_cisco_snp.py +++ b/py-scripts/lf_cisco_snp.py @@ -619,12 +619,15 @@ class cisco_(): class L3VariableTime(LFCliBase): def __init__(self, host, port, endp_types, args, tos, side_b, radio_name_list, number_of_stations_per_radio_list, - ssid_list, ssid_password_list, ssid_security_list, wifimode_list,station_lists, name_prefix, debug_on, outfile,test_keys,test_config, + ssid_list, ssid_password_list, ssid_security_list, wifimode_list,station_lists, name_prefix, debug_on, outfile, + test_keys,test_config, reset_port_enable_list, reset_port_time_min_list, reset_port_time_max_list, side_a_min_rate=560000, side_a_max_rate=0, + side_a_min_pdu=1518,side_a_max_pdu=0, side_b_min_rate=560000, side_b_max_rate=0, + side_b_min_pdu=1518,side_b_max_pdu=0, number_template="00", test_duration="256s", polling_interval="60s", _exit_on_error=False, @@ -652,7 +655,7 @@ class L3VariableTime(LFCliBase): self.polling_interval_seconds = self.local_realm.duration_time_to_seconds(polling_interval) self.cx_profile = self.local_realm.new_l3_cx_profile() self.multicast_profile = self.local_realm.new_multicast_profile() - self.multicast_profile.name_prefix = "MLT-"; + self.multicast_profile.name_prefix = "MLT-" self.station_profiles = [] self.args = args self.outfile = outfile @@ -702,8 +705,12 @@ class L3VariableTime(LFCliBase): self.cx_profile.name_prefix = self.name_prefix self.cx_profile.side_a_min_bps = side_a_min_rate self.cx_profile.side_a_max_bps = side_a_max_rate + self.cx_profile.side_a_min_pdu = side_a_min_pdu + self.cx_profile.side_a_max_pdu = side_a_max_pdu self.cx_profile.side_b_min_bps = side_b_min_rate self.cx_profile.side_b_max_bps = side_b_max_rate + self.cx_profile.side_b_min_pdu = side_b_min_pdu + self.cx_profile.side_b_max_pdu = side_b_max_pdu def __get_rx_values(self): endp_list = self.json_get("endp?fields=name,rx+bytes,rx+drop+%25", debug_=False) @@ -711,9 +718,9 @@ class L3VariableTime(LFCliBase): endp_rx_map = {} our_endps = {} for e in self.multicast_profile.get_mc_names(): - our_endps[e] = e; + our_endps[e] = e for e in self.cx_profile.created_endp.keys(): - our_endps[e] = e; + our_endps[e] = e for endp_name in endp_list['endpoint']: if endp_name != 'uri' and endp_name != 'handler': for item, value in endp_name.items(): @@ -1056,7 +1063,7 @@ class L3VariableTime(LFCliBase): for station_profile in self.station_profiles: temp_stations_list.extend(station_profile.station_names.copy()) # need algorithm for setting time default - if self.local_realm.wait_for_ip(temp_stations_list, timeout_sec=600, debug=self.debug): + if self.local_realm.wait_for_ip(temp_stations_list, timeout_sec=120, debug=self.debug): logg.info("ip's acquired") else: logg.info("print failed to get IP's") @@ -1451,8 +1458,10 @@ TODO: Radio descriptions in realm , the 1. refers to the chassi hopefully corres parser.add_argument('-r','--radio', action='append', nargs=1, help='--radio \ \"radio== ssid== ssid_pw== security== wifimode==\" '\ , required=False) - parser.add_argument('-amr','--side_a_min_rate', help='--side_a_min_rate, station transfer rate default 256000', default=256000) + parser.add_argument('-amr','--side_a_min_rate', help='--side_a_min_rate, station min tx rate default 256000', default=256000) + #parser.add_argument('-bmr','--side_a_min_pdu', help='--side_a_min_pdu , station ipdu size default 1518', default=1518) parser.add_argument('-bmr','--side_b_min_rate', help='--side_b_min_rate , upstream min tx rate default 256000', default=256000) + #parser.add_argument('-bmr','--side_b_min_pdu', help='--side_b_min_pdu , upstream pdu size default 1518', default=1518) # Parameters that allow for testing parser.add_argument('-noc','--no_controller', help='--no_controller no configuration of the controller', action='store_true') @@ -1700,8 +1709,8 @@ TODO: Radio descriptions in realm , the 1. refers to the chassi hopefully corres cisco_ap_modes = "local".split() cisco_data_encryptions = "disable".split() endp_types = "lf_udp lf_tcp" - cisco_packet_sizes = "1518".split() - cisco_client_densities = "1 10 50".split() + cisco_packet_sizes = "88 512 1370 1518".split() + cisco_client_densities = "1".split() cisco_data_encryptions = "disable".split() radio_AX200_abgn_ax_dict = radio_AX200_abgn_ax_dict_test @@ -1892,7 +1901,9 @@ TODO: Radio descriptions in realm , the 1. refers to the chassi hopefully corres reset_port_time_min_list=reset_port_time_min_list, reset_port_time_max_list=reset_port_time_max_list, side_a_min_rate=args.side_a_min_rate, + side_a_min_pdu =args.cisco_packet_size, side_b_min_rate=args.side_b_min_rate, + side_b_min_pdu =args.cisco_packet_size, debug_on=debug_on, outfile=csv_outfile, test_keys=test_keys, From a3b90e0d8d4cc86944f2eb3debd7a25f151f89b3 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Mon, 16 Nov 2020 13:28:07 +0530 Subject: [PATCH 02/18] Added websocket generic listener for port 8081, added a test script for it and updated test_ipv4_connection.py to add websocket events --- py-json/ws_generic_monitor.py | 25 ++++++++++++++++++++++++ py-scripts/test_ipv4_connection.py | 6 +++++- py-scripts/ws_generic_monitor_test.py | 28 +++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 py-json/ws_generic_monitor.py create mode 100644 py-scripts/ws_generic_monitor_test.py diff --git a/py-json/ws_generic_monitor.py b/py-json/ws_generic_monitor.py new file mode 100644 index 00000000..174e9403 --- /dev/null +++ b/py-json/ws_generic_monitor.py @@ -0,0 +1,25 @@ +""" +pip install websocket_client + +https://pypi.org/project/websocket_client/ + +WS_Listener has three arguments in general : lfclient_host, _scriptname, _callback +1. Enter the LF Client Host address on which you want to monitor events (by Default is localhost) +2. Enter the _scriptname that should be present in the event triggered by your script, + refer add_event() in lfcli_base.add_event() + _scriptname can be any string that you want to monitor in your websocket message +3. Enter the Callback function that you wanna see your messages in everytime your event will trigger up. + refer py-scripts/ws_generic_monitor_test.py to see an example + +""" + +class WS_Listener(): + def __init__(self, lfclient_host="localhost", _scriptname=None, _callback=None): + import websocket + self.scriptname = _scriptname + websocket.enableTrace(True) + self.ws = websocket.WebSocketApp("ws://"+lfclient_host+":8081", on_message=_callback) + self.ws.run_forever() + + + diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py index f5a43b49..c16513c0 100755 --- a/py-scripts/test_ipv4_connection.py +++ b/py-scripts/test_ipv4_connection.py @@ -142,6 +142,8 @@ python3 ./test_ipv4_connection.py --upstream_port eth1 \\ num_stations_converted = int(args.num_stations) num_sta = num_stations_converted + ws_event = LFCliBase("192.168.200.15", 8080) + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000) ip_test = IPv4Test(lfjson_host, lfjson_port, ssid=args.ssid, password=args.passwd, security=args.security, sta_list=station_list, radio=args.radio) @@ -150,17 +152,19 @@ python3 ./test_ipv4_connection.py --upstream_port eth1 \\ ip_test.build() if not ip_test.passes(): print(ip_test.get_fail_message()) + ws_event.add_event(name="test_ipv4_connection.py", message=ip_test.get_fail_message()) exit(1) ip_test.start(station_list, False, False) ip_test.stop() if not ip_test.passes(): print(ip_test.get_fail_message()) + ws_event.add_event(name="test_ipv4_connection.py", message=ip_test.get_fail_message()) exit(1) time.sleep(30) ip_test.cleanup(station_list) if ip_test.passes(): print("Full test passed, all stations associated and got IP") - + ws_event.add_event(name="test_ipv4_connection.py", message="Full test passed, all stations associated and got IP") if __name__ == "__main__": main() diff --git a/py-scripts/ws_generic_monitor_test.py b/py-scripts/ws_generic_monitor_test.py new file mode 100644 index 00000000..b8c379d0 --- /dev/null +++ b/py-scripts/ws_generic_monitor_test.py @@ -0,0 +1,28 @@ +""" +This example is to demonstrate ws_generic_monitor to monitor events triggered by scripts, +This script when running, will monitor the events triggered by test_ipv4_connection.py + +""" + + +import sys +import json +if 'py-json' not in sys.path: + sys.path.append('../py-json') +from ws_generic_monitor import WS_Listener + +reference = "test_ipv4_connection.py" +def main(): + WS_Listener(lfclient_host="192.168.200.15", _scriptname=reference, _callback=TestRun) + + +def TestRun(ws, message): + if (str(message).__contains__(reference)): + #print(message) + temp = json.loads(message) + event_message = str(temp['name']) + "/" + str(temp['details']) + "/" + str(temp['timestamp']) + print(event_message) + +if __name__ == "__main__": + main() + From 3fe1d901f070da5b43bc931e614e5917c760ae37 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Tue, 17 Nov 2020 12:02:06 +0530 Subject: [PATCH 03/18] minor fixed ws_generic_monitor_test --- py-scripts/ws_generic_monitor_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py-scripts/ws_generic_monitor_test.py b/py-scripts/ws_generic_monitor_test.py index b8c379d0..157380b2 100644 --- a/py-scripts/ws_generic_monitor_test.py +++ b/py-scripts/ws_generic_monitor_test.py @@ -13,7 +13,7 @@ from ws_generic_monitor import WS_Listener reference = "test_ipv4_connection.py" def main(): - WS_Listener(lfclient_host="192.168.200.15", _scriptname=reference, _callback=TestRun) + WS_Listener(lfclient_host="localhost", _scriptname=reference, _callback=TestRun) def TestRun(ws, message): From 777f35f3d15024d47e2ea7941c34504b47ebe733 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Tue, 17 Nov 2020 07:28:17 -0700 Subject: [PATCH 04/18] lf_cisco_snp.py : updated dictionary for limits to radios if test bed has less resources then the test calls for. --- py-scripts/lf_cisco_snp.py | 43 +++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/py-scripts/lf_cisco_snp.py b/py-scripts/lf_cisco_snp.py index 6c89de3d..61df413f 100755 --- a/py-scripts/lf_cisco_snp.py +++ b/py-scripts/lf_cisco_snp.py @@ -1527,6 +1527,36 @@ TODO: Radio descriptions in realm , the 1. refers to the chassi hopefully corres logging.basicConfig(format=FORMAT, handlers=[console_handler]) + #################################################### + # + # Static Configuration Cisco Realm one lanforge + # + #################################################### + radio_AX200_abgn_ax_list_001_one = [['radio==1.wiphy0 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto']] + + radio_AX200_abgn_ax_list_010_one = [['radio==1.wiphy0 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy1 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy2 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy3 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy4 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy5 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy6 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto'], + ['radio==1.wiphy7 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto']] + + + + radio_AX200_abgn_ax_dict = {'1' : radio_AX200_abgn_ax_list_001_one, + '8' : radio_AX200_abgn_ax_list_010_one} + + + radio_ath10K_9984_an_AC_list_001_one = [['radio==1.wiphy8 stations==1 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto']] + radio_ath10K_9984_an_AC_list_010_one = [['radio==1.wiphy8 stations==10 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto']] + radio_ath10K_9984_an_AC_list_020_one = [['radio==1.wiphy8 stations==20 ssid==test-can ssid_pw==[BLANK] security==open wifimode==auto']] + + radio_ath10K_9984_an_AC_dict_one = {'1' : radio_ath10K_9984_an_AC_list_001_one, + '10' : radio_ath10K_9984_an_AC_list_010_one, + '20' : radio_ath10K_9984_an_AC_list_020_one} + #################################################### # @@ -1685,18 +1715,25 @@ TODO: Radio descriptions in realm , the 1. refers to the chassi hopefully corres if args.cisco_all: cisco_aps = "APA453.0E7B.CF9C".split() - cisco_bands = "a b".split() - cisco_wifimodes = "an anAX anAC abgn bg".split() +# cisco_bands = "a b".split() + cisco_bands = "a ".split() +# cisco_wifimodes = "an anAX anAC abgn bg".split() + cisco_wifimodes = "an".split() cisco_tx_power = "3" cisco_chan_5ghz = "36".split() cisco_chan_24ghz = "1".split() cisco_chan_widths = "20".split() - cisco_ap_modes = "local flex".split() +# cisco_ap_modes = "local flex".split() + cisco_ap_modes = "local".split() cisco_data_encryptions = "disable".split() endp_types = "lf_udp lf_tcp" cisco_packet_sizes = "1518".split() cisco_client_densities = "1".split() cisco_data_encryptions = "disable".split() + + radio_AX200_abgn_ax_dict = radio_AX200_abgn_ax_dict_one + radio_ath10K_9984_an_AC_dict = radio_ath10K_9984_an_AC_dict_one + elif args.cisco_test: cisco_aps = "APA453.0E7B.CF9C".split() cisco_bands = "a".split() From 3ad02b122c221e7e2f2adb2249c15cb4ab2d834b Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Tue, 17 Nov 2020 15:15:27 -0700 Subject: [PATCH 05/18] lf_cisco_snp.py : fix variable name --- py-scripts/lf_cisco_snp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py-scripts/lf_cisco_snp.py b/py-scripts/lf_cisco_snp.py index 61df413f..96cf9a7e 100755 --- a/py-scripts/lf_cisco_snp.py +++ b/py-scripts/lf_cisco_snp.py @@ -1545,7 +1545,7 @@ TODO: Radio descriptions in realm , the 1. refers to the chassi hopefully corres - radio_AX200_abgn_ax_dict = {'1' : radio_AX200_abgn_ax_list_001_one, + radio_AX200_abgn_ax_dict_one = {'1' : radio_AX200_abgn_ax_list_001_one, '8' : radio_AX200_abgn_ax_list_010_one} From a7417d8ca1c19278971e8ac76e0db494b700217b Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Wed, 18 Nov 2020 18:04:24 +0530 Subject: [PATCH 06/18] added argparse for test_id to filter ws event --- py-json/LANforge/lfcli_base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index f6e88b41..0f9b9fe2 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -251,8 +251,9 @@ class LFCliBase: parser.add_argument('--ssid', help='SSID for stations to associate to', default=None) parser.add_argument('--passwd', '--passphrase', '--password', '--pwd', help='WiFi passphrase', default=None) parser.add_argument('--num_stations', help='Number of stations to create', default=0) - parser.add_argument('--debug', help='Enable debugging', default=False, action="store_true") - + parser.add_argument('--test_id', help='Test ID (intended to use for ws events)', default="webconsole") + parser.add_argument('--debug', help='Enable debugging', default=False, action="store_true") + return parser From 05ddf8b0158e7b7f95aead27a7a1cd1994dcbc42 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Wed, 18 Nov 2020 18:20:39 +0530 Subject: [PATCH 07/18] Bug fixed from previous commit --- py-json/LANforge/lfcli_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index 0f9b9fe2..c980ba75 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -252,7 +252,7 @@ class LFCliBase: parser.add_argument('--passwd', '--passphrase', '--password', '--pwd', help='WiFi passphrase', default=None) parser.add_argument('--num_stations', help='Number of stations to create', default=0) parser.add_argument('--test_id', help='Test ID (intended to use for ws events)', default="webconsole") - parser.add_argument('--debug', help='Enable debugging', default=False, action="store_true") + parser.add_argument('--debug', help='Enable debugging', default=False, action="store_true") return parser From c53c997801ae79499c88e6e0405c907ced797c47 Mon Sep 17 00:00:00 2001 From: Jed Reynolds Date: Wed, 18 Nov 2020 11:22:21 -0800 Subject: [PATCH 08/18] updateTest.bash: improvements re: sending mail, summarizing test --- updateTest.bash | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/updateTest.bash b/updateTest.bash index 7b3304f0..7bf5c735 100755 --- a/updateTest.bash +++ b/updateTest.bash @@ -1,4 +1,8 @@ #!/bin/bash +# check for log file +LOCKFILE="/tmp/update-test.lock" +[ -f $LOCKFILE ] && echo "lockfile $LOCKFILE found, bye" && exit 0 + export DISPLAY=:1 [ ! -z "$DEBUG" ] && set -x IP="192.168.95.239" @@ -15,6 +19,20 @@ ST="/tmp/summary.txt" DM_FLAG="${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" output=/tmp/gui_update_test +trap do_sigint ABRT +trap do_sigint INT +trap do_sigint KILL +trap do_sigint PIPE +trap do_sigint QUIT +trap do_sigint SEGV +trap do_sigint TERM + +function do_sigint() { + [ -f $LOCKFILE ] && echo "removing lockfile" && rm -f $LOCKFILE + for f in $GUILog $GUIUpdate $CTLGUI $CTLH /tmp/\+.*; do + rm -f "$f" + done +} function start_gui() { daemon_mode="" [ -f $GUIDIR/DAEMON_MODE ] && daemon_mode="-daemon" @@ -26,7 +44,7 @@ function start_gui() { echo "" > $output [ -s $GUIUpdate ] && cat $GUIUpdate >> $output cat $GUILog >> $output - mail -s 'GUI connect failure' "test.notice@candelatech.com" < $output + mail -s 'GUI connect failure' "test.notice@candelatech.com" -q $output exit 1 fi } @@ -51,6 +69,8 @@ function wait_8080() { [ ! -z "$DEBUG" ] && set -x } +touch $LOCKFILE + if [ -f ${GUIDIR}/down-check ]; then numFound=`find ${GUIDIR} -name down-check -mmin +59 | grep -c down-check` @@ -79,6 +99,7 @@ sudo rm -f $GUILog $GUIUpdate $CTLGUI $CTLH $ST touch "${HL}/LANforgeGUI_${verNum}/NO_AUTOSTART" pgrep java &>/dev/null && killall -9 java touch $GUIUpdate +touch $ST if [ ! -z "SKIP_INSTALL" ] && [ x$SKIP_INSTALL = x1 ]; then echo "skipping installation" sleep 4 @@ -87,9 +108,6 @@ else sleep 4 python3 ${scripts}/auto-install-gui.py --versionNumber $verNum &> $GUIUpdate [ -s $GUIUpdate ] && grep -q "Current GUI version up to date" $GUIUpdate && exit - echo "===============================================" > $ST - head $GUILog >> $ST - echo "===============================================" >> $ST [ -s $GUIUpdate ] && head $GUIUpdate >> $ST if grep -q -i "fail" $GUIUpdate; then cat $ST | mail -s 'GUI Update Test Failure' -a $GUILog -a $GUIUpdate "test.notice@candelatech.com" @@ -101,6 +119,9 @@ rm -f "${HL}/LANforgeGUI_${verNum}/NO_AUTOSTART" start_gui python3 ${scripts}/connectTest.py &> $CTLGUI +echo "== GUI =============================================" >> $ST +head $CTLGUI >> $ST +echo "===============================================" >> $ST pgrep java &>/dev/null && killall -9 java sleep 1 @@ -109,9 +130,7 @@ touch "${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" start_gui python3 ${scripts}/connectTest.py &> $CTLH -echo "===============================================" >> $ST -head $CTLGUI >> $ST -echo "===============================================" >> $ST +echo "== HEADLESS =============================================" >> $ST head $CTLH >> $ST echo "===============================================" >> $ST rm -f "${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" @@ -121,7 +140,7 @@ connect_fail=0 wait_8080 || connect_fail=1 cat $ST > $output -echo "===============================================" >> $output +echo "=== FULL LOGS ============================================" >> $output [ -s $GUILog ] && cat $GUILog >> $output echo "===============================================" >> $output [ -s $GUIUpdate ] && cat $GUIUpdate >> $output @@ -132,7 +151,7 @@ echo "===============================================" >> $output echo "===============================================" >> $output echo -e "--\n.\n" >> $output -mail -s 'GUI Update Test' "test.notice@candelatech.com" < $output +mail -s 'GUI Update Test' "test.notice@candelatech.com" -q $output #cat $ST | mail -s 'GUI Update Test' -a $GUILog -a $GUIUpdate -a $CTLGUI -a $CTLH "test.notice@candelatech.com" #eof From ec394e23a14019e64574cccc91c73deb3a44044d Mon Sep 17 00:00:00 2001 From: Jed Reynolds Date: Wed, 18 Nov 2020 12:11:51 -0800 Subject: [PATCH 09/18] updateTest: adds message on connection --- updateTest.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/updateTest.bash b/updateTest.bash index 7bf5c735..786b07eb 100755 --- a/updateTest.bash +++ b/updateTest.bash @@ -20,7 +20,7 @@ DM_FLAG="${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" output=/tmp/gui_update_test trap do_sigint ABRT -trap do_sigint INT +trap do_sigint INT trap do_sigint KILL trap do_sigint PIPE trap do_sigint QUIT @@ -65,13 +65,15 @@ function wait_8080() { if [[ $connected = 0 ]]; then echo "Unable to connect, bye" return 1 + else + echo "Connection established" fi [ ! -z "$DEBUG" ] && set -x } touch $LOCKFILE -if [ -f ${GUIDIR}/down-check ]; then +if [ -f ${GUIDIR}/down-check ]; then numFound=`find ${GUIDIR} -name down-check -mmin +59 | grep -c down-check` if (( numFound >= 1 )); then From 1dcc0f43ef1668dd317573d042f7bd9c0217dee1 Mon Sep 17 00:00:00 2001 From: Jed Reynolds Date: Wed, 18 Nov 2020 13:34:27 -0800 Subject: [PATCH 10/18] updateTest: fixes email send hangs, adds more appropriate messages, fixes comparison in start_gui() --- updateTest.bash | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/updateTest.bash b/updateTest.bash index 786b07eb..b2fce207 100755 --- a/updateTest.bash +++ b/updateTest.bash @@ -33,6 +33,7 @@ function do_sigint() { rm -f "$f" done } + function start_gui() { daemon_mode="" [ -f $GUIDIR/DAEMON_MODE ] && daemon_mode="-daemon" @@ -40,19 +41,25 @@ function start_gui() { connect_fail=0 wait_8080 || connect_fail=1 - if [[ $connect_fail = 1 ]]; then + if (( $connect_fail == 1 )); then + set -x echo "" > $output [ -s $GUIUpdate ] && cat $GUIUpdate >> $output - cat $GUILog >> $output - mail -s 'GUI connect failure' "test.notice@candelatech.com" -q $output + # cat $GUILog >> $output + echo "------------------------------------------" >> $output + mail -q $output -s 'GUI connect failure' "test.notice@candelatech.com" < $GUILog + rm -f $LOCKFILE exit 1 + else + echo "start_gui: connection found" fi + return 0 } function wait_8080() { set +x local connected=0 - local limit_sec=30 + local limit_sec=90 echo "Testing for 8080 connection " while (( connected == 0 )); do (( limit_sec <= 0)) && break @@ -69,6 +76,7 @@ function wait_8080() { echo "Connection established" fi [ ! -z "$DEBUG" ] && set -x + return 0 } touch $LOCKFILE @@ -103,7 +111,7 @@ pgrep java &>/dev/null && killall -9 java touch $GUIUpdate touch $ST if [ ! -z "SKIP_INSTALL" ] && [ x$SKIP_INSTALL = x1 ]; then - echo "skipping installation" + echo "skipping installation" | tee -a $GUIUpdate sleep 4 else echo "doing installation" @@ -112,7 +120,8 @@ else [ -s $GUIUpdate ] && grep -q "Current GUI version up to date" $GUIUpdate && exit [ -s $GUIUpdate ] && head $GUIUpdate >> $ST if grep -q -i "fail" $GUIUpdate; then - cat $ST | mail -s 'GUI Update Test Failure' -a $GUILog -a $GUIUpdate "test.notice@candelatech.com" + mail -s 'GUI Update Test Failure' -q $GUILog -a $GUIUpdate "test.notice@candelatech.com" < $ST + rm -f $LOCKFILE exit 1 fi fi @@ -120,6 +129,7 @@ sleep 1 rm -f "${HL}/LANforgeGUI_${verNum}/NO_AUTOSTART" start_gui +echo "Doing connectTest.py > $CTLGUI" python3 ${scripts}/connectTest.py &> $CTLGUI echo "== GUI =============================================" >> $ST head $CTLGUI >> $ST @@ -153,7 +163,8 @@ echo "===============================================" >> $output echo "===============================================" >> $output echo -e "--\n.\n" >> $output -mail -s 'GUI Update Test' "test.notice@candelatech.com" -q $output - +mail -s 'GUI Update Test' "test.notice@candelatech.com" < $output #cat $ST | mail -s 'GUI Update Test' -a $GUILog -a $GUIUpdate -a $CTLGUI -a $CTLH "test.notice@candelatech.com" + +rm -f $LOCKFILE #eof From 0c3b223dd41966349bd7e1124bee62d7d610ed61 Mon Sep 17 00:00:00 2001 From: Jed Reynolds Date: Wed, 18 Nov 2020 22:28:40 -0800 Subject: [PATCH 11/18] updateTest: cleans up lockfiles, tempfiles on exit, tests for GUI crash on startup --- updateTest.bash | 52 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/updateTest.bash b/updateTest.bash index b2fce207..f1c03f4b 100755 --- a/updateTest.bash +++ b/updateTest.bash @@ -3,7 +3,7 @@ LOCKFILE="/tmp/update-test.lock" [ -f $LOCKFILE ] && echo "lockfile $LOCKFILE found, bye" && exit 0 -export DISPLAY=:1 +export DISPLAY=":1" [ ! -z "$DEBUG" ] && set -x IP="192.168.95.239" HL="/home/lanforge" @@ -18,7 +18,10 @@ GUIDIR="${HL}/LANforgeGUI_${verNum}" ST="/tmp/summary.txt" DM_FLAG="${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" output=/tmp/gui_update_test +NO_AUTO="${HL}/LANforgeGUI_${verNum}/NO_AUTOSTART" +D_MODE="${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" +trap do_sigint HUP trap do_sigint ABRT trap do_sigint INT trap do_sigint KILL @@ -29,14 +32,14 @@ trap do_sigint TERM function do_sigint() { [ -f $LOCKFILE ] && echo "removing lockfile" && rm -f $LOCKFILE - for f in $GUILog $GUIUpdate $CTLGUI $CTLH /tmp/\+.*; do + for f in $GUILog $GUIUpdate $CTLGUI $CTLH $LOCKFILE $NO_AUTO /tmp/\+.*; do rm -f "$f" done } function start_gui() { daemon_mode="" - [ -f $GUIDIR/DAEMON_MODE ] && daemon_mode="-daemon" + [ -f "$D_MODE" ] && daemon_mode="-daemon" ( cd $GUIDIR; nohup env RESTARTS=999999 ./lfclient.bash $daemon_mode -s localhost &> $GUILog & ) connect_fail=0 wait_8080 || connect_fail=1 @@ -48,7 +51,8 @@ function start_gui() { # cat $GUILog >> $output echo "------------------------------------------" >> $output mail -q $output -s 'GUI connect failure' "test.notice@candelatech.com" < $GUILog - rm -f $LOCKFILE + [ ! -z "$DEBUG" ] && cat $GUILog + do_sigint exit 1 else echo "start_gui: connection found" @@ -61,12 +65,25 @@ function wait_8080() { local connected=0 local limit_sec=90 echo "Testing for 8080 connection " + lastpid='' + zpid='' while (( connected == 0 )); do (( limit_sec <= 0)) && break curl -so /dev/null http://localhost:8080/ && connected=1 (( connected >= 1 )) && break; limit_sec=$(( limit_sec - 1 )) - echo -n "." + lastpid=$zpid + zpid=`pgrep java` + if [ -z "$zpid" ]; then + if [[ x"$zpid" = x ]] && [[ "$lastpid" != "" ]]; then + echo "GUI crashed while starting, bye." + return 1 + fi + [ ! -z "$DEBUG" ] && echo -n "-$zpid/$lastpid " + else + [ ! -z "$DEBUG" ] && echo -n "+$zpid/$lastpid " + fi + sleep 1 done if [[ $connected = 0 ]]; then @@ -91,6 +108,7 @@ if [ -f ${GUIDIR}/down-check ]; then else touch "${GUIDIR}/down-check" echo "Could not connect to ${IP}" + do_sigint exit 1 fi else @@ -98,6 +116,7 @@ if [ -f ${GUIDIR}/down-check ]; then if (( 0 != $? )); then touch "${GUIDIR}/down-check" echo "Could not connect to ${IP}" + do_sigint exit 1 fi fi @@ -106,28 +125,31 @@ fi sudo rm -f /tmp/*.txt sudo rm -f $GUILog $GUIUpdate $CTLGUI $CTLH $ST -touch "${HL}/LANforgeGUI_${verNum}/NO_AUTOSTART" +touch "$NO_AUTO" pgrep java &>/dev/null && killall -9 java touch $GUIUpdate touch $ST if [ ! -z "SKIP_INSTALL" ] && [ x$SKIP_INSTALL = x1 ]; then echo "skipping installation" | tee -a $GUIUpdate - sleep 4 else echo "doing installation" - sleep 4 + set -x python3 ${scripts}/auto-install-gui.py --versionNumber $verNum &> $GUIUpdate - [ -s $GUIUpdate ] && grep -q "Current GUI version up to date" $GUIUpdate && exit + if [ -s $GUIUpdate ]; then + grep -q "Current GUI version up to date, not testing" $GUIUpdate + do_sigint + exit 0 + fi [ -s $GUIUpdate ] && head $GUIUpdate >> $ST if grep -q -i "fail" $GUIUpdate; then mail -s 'GUI Update Test Failure' -q $GUILog -a $GUIUpdate "test.notice@candelatech.com" < $ST - rm -f $LOCKFILE + do_sigint exit 1 fi + set +x fi sleep 1 -rm -f "${HL}/LANforgeGUI_${verNum}/NO_AUTOSTART" - +rm -f "$NO_AUTO" start_gui echo "Doing connectTest.py > $CTLGUI" python3 ${scripts}/connectTest.py &> $CTLGUI @@ -138,14 +160,14 @@ pgrep java &>/dev/null && killall -9 java sleep 1 #-daemon -touch "${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" +touch "$D_MODE" start_gui python3 ${scripts}/connectTest.py &> $CTLH echo "== HEADLESS =============================================" >> $ST head $CTLH >> $ST echo "===============================================" >> $ST -rm -f "${HL}/LANforgeGUI_${verNum}/DAEMON_MODE" +rm -f "$D_MODE" pgrep java &>/dev/null && killall -9 java start_gui connect_fail=0 @@ -166,5 +188,5 @@ echo -e "--\n.\n" >> $output mail -s 'GUI Update Test' "test.notice@candelatech.com" < $output #cat $ST | mail -s 'GUI Update Test' -a $GUILog -a $GUIUpdate -a $CTLGUI -a $CTLH "test.notice@candelatech.com" -rm -f $LOCKFILE +do_sigint #eof From 4a9f4bdfdbe3084e3defe3a59e06ddfc2352ce29 Mon Sep 17 00:00:00 2001 From: Dipti Date: Thu, 19 Nov 2020 11:59:16 -0800 Subject: [PATCH 12/18] test_x script, edits to tests/help --- py-scripts/example_wep_connection.py | 15 ++--- py-scripts/example_wpa2_connection.py | 2 +- py-scripts/scenario.py | 8 +-- py-scripts/test_all_scripts.sh | 79 +++++++++++++++++++++++++++ py-scripts/test_fileio.py | 1 - py-scripts/test_ipv4_connection.py | 2 +- 6 files changed, 93 insertions(+), 14 deletions(-) create mode 100755 py-scripts/test_all_scripts.sh diff --git a/py-scripts/example_wep_connection.py b/py-scripts/example_wep_connection.py index feb612eb..6485e852 100755 --- a/py-scripts/example_wep_connection.py +++ b/py-scripts/example_wep_connection.py @@ -18,12 +18,13 @@ import pprint class IPv4Test(LFCliBase): - def __init__(self, host, port, ssid, security, password, sta_list=None, number_template="00000", _debug_on=False, + def __init__(self, host, port, ssid, security, password, sta_list=None, number_template="00000", radio = "wiphy0",_debug_on=False, _exit_on_error=False, _exit_on_fail=False): super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) self.host = host self.port = port + self.radio = radio self.ssid = ssid self.security = security self.password = password @@ -49,7 +50,7 @@ class IPv4Test(LFCliBase): self.station_profile.set_command_flag("add_sta", "create_admin_down", 1) self.station_profile.set_command_param("set_port", "report_timer", 1500) self.station_profile.set_command_flag("set_port", "rpt_timer", 1) - self.station_profile.create(radio="wiphy0", sta_names_=self.sta_list, debug=self.debug) + self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug) self._pass("PASS: Station build finished") def cleanup(self, sta_list): @@ -70,17 +71,17 @@ def main(): ''', description='''\ - example_wpa_connection.py + example_wep_connection.py -------------------- Generic command example: - python3 ./example_wpa_connection.py \\ + python3 ./example_wep_connection.py \\ --host localhost (optional) \\ --port 8080 (optional) \\ --num_stations 3 \\ --security {open|wep|wpa|wpa2|wpa3} \\ - --ssid netgear-wep \\ - --passwd admin123-wep \\ + --ssid jedway-wep-48 \\ + --passwd jedway-wep-48 \\ --debug Note: multiple --radio switches may be entered up to the number of radios available: @@ -99,7 +100,7 @@ def main(): end_id_=num_sta-1, padding_number_=10000) ip_test = IPv4Test(lfjson_host, lfjson_port, ssid=args.ssid, password=args.passwd, - security=args.security, sta_list=station_list) + security=args.security, radio=args.radio, sta_list=station_list) ip_test.cleanup(station_list) ip_test.timeout = 60 ip_test.build() diff --git a/py-scripts/example_wpa2_connection.py b/py-scripts/example_wpa2_connection.py index c3ecb470..0a2ab871 100755 --- a/py-scripts/example_wpa2_connection.py +++ b/py-scripts/example_wpa2_connection.py @@ -75,7 +75,7 @@ def main(): -------------------- Generic command example: - python3 ./example_wpa_connection.py \\ + python3 ./example_wpa2_connection.py \\ --host localhost (optional) \\ --port 8080 (optional) \\ --num_stations 3 \\ diff --git a/py-scripts/scenario.py b/py-scripts/scenario.py index 0cea20a3..eb35fcdc 100755 --- a/py-scripts/scenario.py +++ b/py-scripts/scenario.py @@ -22,13 +22,13 @@ parser = LFCliBase.create_bare_argparse( description='''scenario.py -------------------- Generic command example: -python3 scenario.py --load db1 --action overwrite --clean_dut --clean_chambers +scenario.py --load db1 --action overwrite --clean_dut --clean_chambers -python3 scenario.py --start test_group1 +scenario.py --start test_group1 -python3 scenario.py --quiesce test_group1 +scenario.py --quiesce test_group1 -python3 scenario.py --stop test_group1 +scenario.py --stop test_group1 ''') group = parser.add_mutually_exclusive_group() diff --git a/py-scripts/test_all_scripts.sh b/py-scripts/test_all_scripts.sh new file mode 100755 index 00000000..65d32ae8 --- /dev/null +++ b/py-scripts/test_all_scripts.sh @@ -0,0 +1,79 @@ +#!/bin/bash +#Security connection examples######################################### +echo "Beginning example_wpa_connection.py test..." +chmod +x example_wpa2_connection.py +./example_wpa2_connection.py --num_stations 3 --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio wiphy0 +chmod +x scenario.py +./scenario.py --load BLANK +chmod +x example_wep_connection.py +./example_wep_connection.py --ssid jedway-wep-48 --passwd jedway-wep-48 --radio wiphy1 +./scenario.py --load BLANK +chmod +x example_wpa3_connection.py +./example_wpa3_connection.py +./scenario.py --load BLANK +chmod +x example_wpa_connection.py +./example_wpa_connection.py --radio wiphy1 +./scenario.py --load BLANK +#test generic and test fileio###################################################### +#chmod +x test_fileio.py +#./test_fileio.py +chmod +x test_generic.py +#lfping +./test_generic.py --num_stations 3 --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio wiphy0 +#lfcurl +./test_generic.py --num_stations 3 --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio wiphy0 +#generic +./test_generic.py --num_stations 3 --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio wiphy0 +#speedtest +./test_generic.py --num_stations 3 --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio wiphy0 +#iperf3 +./test_generic.py --num_stations 3 --ssid jedway-r8000-36 --passwd jedway-r8000-36 --radio wiphy0 +#Ipv4 connection tests########################################## +chmod +x test_ipv4_connection.py +./test_ipv4_connection.py +chmod +x test_ipv4_l4_ftp_upload.py +./test_ipv4_l4_ftp_upload.py +chmod +x test_ipv4_l4_ftp_urls_per_ten.py +./test_ipv4_l4_ftp_urls_per_ten.py +chmod +x test_ipv4_l4_ftp_wifi.py +./test_ipv4_l4_ftp_wifi.py +chmod +x test_ipv4_l4_urls_per_ten.py +./test_ipv4_l4_urls_per_ten.py +chmod +x test_ipv4_l4_wifi.py +./test_ipv4_l4_wifi.py +chmod +x test_ipv4_l4 +./test_ipv4_l4.py +chmod +x test_ipv4_ps.py +./test_ipv4_l4_ps.py +chmod +x test_ipv4_ttls.py +./test_ipv4_l4_ttls.py +chmod +x test_ipv4_variable_time.py +./test_ipv4_variable_time.py +#Layer 3 tests################################################ +chmod +x test_l3_longevity.py +./test_l3_longevity.py +chmod +x test_l3_powersave_traffic +./test_l3_powersave_traffic.py +chmod +x test_l3_scenario_traffic.py +./test_l3_scenario_traffic.py +chmod +x test_l3_unicast_traffic_gen.py +./test_l3_unicast_traffic_gen.py +chmod +x test_l3_WAN_LAN.py +./test_l3_WAN_LAN.py +#WANlink###################################################### +chmod +x test_wanlink.py +./test_wanlink.py +#IPv6 connection tests######################################## +chmod +x test_ipv6_connection.py +./test_ipv6_variable_connection.py +chmod +x test_ipv6_variable_time.py +./test_ipv6_variable_time.py +#STA Connect examples######################################### +chmod +x sta_connect_example.py +./sta_connect_example.py +chmod +x sta_connect_multi_example.py +./sta_connect_multi_example.py +chmod +x sta_connect.py +./sta_connect.py +chmod +x sta_connect2.py +./sta_connect2.py diff --git a/py-scripts/test_fileio.py b/py-scripts/test_fileio.py index cad26e4d..a116edd7 100755 --- a/py-scripts/test_fileio.py +++ b/py-scripts/test_fileio.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import sys -# import re if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py index c16513c0..2fe3c108 100755 --- a/py-scripts/test_ipv4_connection.py +++ b/py-scripts/test_ipv4_connection.py @@ -123,7 +123,7 @@ def main(): test_ipv4_connection.py -------------------- Generic command example: -python3 ./test_ipv4_connection.py --upstream_port eth1 \\ +./test_ipv4_connection.py --upstream_port eth1 \\ --radio wiphy0 \\ --num_stations 3 \\ --security {open|wep|wpa|wpa2|wpa3} \\ From 2484cc0c771da1c31e37ad8239a4d22d0d735d64 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 19 Nov 2020 16:19:32 -0700 Subject: [PATCH 13/18] lf_cisco_power.py : bug fix with wireless_tag_policy --- lf_cisco_power.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lf_cisco_power.py b/lf_cisco_power.py index cc7fd3ae..698405c0 100755 --- a/lf_cisco_power.py +++ b/lf_cisco_power.py @@ -853,7 +853,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: wireless_tag_policy") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", args.series, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) From 0d10dcc862228c288e0b4789114772acf9155685 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 19 Nov 2020 17:32:09 -0700 Subject: [PATCH 14/18] cisco_wifi_ctl.py, lf_cisco_power.py : the capturing of output flag did not work as intended. --- cisco_wifi_ctl.py | 6 +--- lf_cisco_power.py | 72 +++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/cisco_wifi_ctl.py b/cisco_wifi_ctl.py index 797c9197..27b0b88c 100755 --- a/cisco_wifi_ctl.py +++ b/cisco_wifi_ctl.py @@ -100,7 +100,6 @@ def main(): parser.add_argument("-t", "--tty", type=str, help="tty serial device") parser.add_argument("-l", "--log", type=str, help="logfile for messages, stdout means output to console",default="stdout") parser.add_argument("--append", action='store_true', help="--append append to logfile file") - parser.add_argument("--suppress", type=str, help="--suppress output when logging to a file",default="False") #parser.add_argument("-r", "--radio", type=str, help="select radio") parser.add_argument("-w", "--wlan", type=str, help="wlan name") parser.add_argument("-i", "--wlanID", type=str, help="wlan ID") @@ -127,7 +126,6 @@ def main(): passwd = args.passwd logfile = args.log append = args.append - suppress = args.suppress if (args.band != None): band = args.band if (band == "abgn"): @@ -152,9 +150,7 @@ def main(): file_handler.setLevel(logging.DEBUG) file_handler.setFormatter(formatter) logg.addHandler(file_handler) - if suppress == "False": - print("suppress {}".format(suppress)) - logg.addHandler(logging.StreamHandler(sys.stdout)) + logg.addHandler(logging.StreamHandler(sys.stdout)) else: # stdout logging logging.basicConfig(format=FORMAT, handlers=[console_handler]) diff --git a/lf_cisco_power.py b/lf_cisco_power.py index 698405c0..3815285b 100755 --- a/lf_cisco_power.py +++ b/lf_cisco_power.py @@ -310,10 +310,8 @@ def main(): if (args.verbose): # capture the controller output , thus won't got to stdout some output always present cap_ctl_out = True - suppress_output = "False" else: cap_ctl_out = False - suppress_output = "True" print("cap_ctl_out {}".format(cap_ctl_out)) # note: there would always be an args.outfile due to the default @@ -702,7 +700,7 @@ def main(): try: logg.info("3504/9800 cisco_wifi_ctl.py: disable AP {}".format(args.ap)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "disable","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -717,7 +715,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_wlan","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "disable_wlan","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -728,7 +726,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "disable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -740,7 +738,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "disable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -752,7 +750,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: manual") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "manual","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "manual","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -764,7 +762,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a disable network","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a disable network","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -776,7 +774,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') @@ -792,7 +790,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: txPower {}".format(tx)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "txPower", "--value", tx, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "txPower", "--value", tx, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -808,7 +806,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: channel {}".format(ch)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "channel", "--value", ch, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "channel", "--value", ch, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -822,7 +820,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: bandwidth {}".format(bw)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "bandwidth", "--value", bw, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "bandwidth", "--value", bw, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -841,7 +839,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: create_wlan wlan {} wlanID {} port {}".format(args.wlan, args.wlanID, args.port)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "create_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "create_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -853,7 +851,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: wireless_tag_policy") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", args.series, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", args.series, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -864,7 +862,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_wlan", "--wlan", args.wlan, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "enable_wlan", "--wlan", args.wlan, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -878,7 +876,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "enable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -890,7 +888,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_24ghz") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "enable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -902,7 +900,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -914,7 +912,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -926,7 +924,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: enable") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "enable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1007,7 +1005,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: show_wlan_summary") wlan_summary = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "show_wlan_summary","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=True, check=True) + "--action", "show_wlan_summary","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=True, check=True) pss = wlan_summary.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1579,7 +1577,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: disable AP {}".format(args.ap)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "disable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1593,7 +1591,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: no_wlan_wireless_tag_policy") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "no_wlan_wireless_tag_policy", "--wlan", args.wlan, "--series", "--wlanID", args.wlanID, args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "no_wlan_wireless_tag_policy", "--wlan", args.wlan, "--series", "--wlanID", args.wlanID, args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1605,7 +1603,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: delete_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "delete_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output], capture_output=cap_ctl_out, check=True) + "--action", "delete_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1617,7 +1615,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "disable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1629,7 +1627,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "disable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1642,7 +1640,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a disable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a disable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1654,7 +1652,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1667,7 +1665,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: txPower tx 1") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "txPower", "--value", "1", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "txPower", "--value", "1", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1681,7 +1679,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: channel 36") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "channel", "--value", "36", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "channel", "--value", "36", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1694,7 +1692,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: bandwidth 20") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "bandwidth", "--value", "20", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "bandwidth", "--value", "20", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1707,7 +1705,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "enable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1719,7 +1717,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "enable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1731,7 +1729,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: auto") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "auto","--series",args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "auto","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1744,7 +1742,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1756,7 +1754,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1768,7 +1766,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: enable") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append", "--suppress", suppress_output],capture_output=cap_ctl_out, check=True) + "--action", "enable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) From 9d601656cd1bcaec5aeca3308b7b85551f962672 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 19 Nov 2020 17:38:50 -0700 Subject: [PATCH 15/18] cisco_wifi_ctl.py , lf_cisco_power.py have stdout use basicConfig, it will duplicate log messages will need to address later. --- cisco_wifi_ctl.py | 2 +- lf_cisco_power.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cisco_wifi_ctl.py b/cisco_wifi_ctl.py index 27b0b88c..9969e318 100755 --- a/cisco_wifi_ctl.py +++ b/cisco_wifi_ctl.py @@ -150,7 +150,7 @@ def main(): file_handler.setLevel(logging.DEBUG) file_handler.setFormatter(formatter) logg.addHandler(file_handler) - logg.addHandler(logging.StreamHandler(sys.stdout)) + logging.basicConfig(format=FORMAT, handlers=[console_handler]) else: # stdout logging logging.basicConfig(format=FORMAT, handlers=[console_handler]) diff --git a/lf_cisco_power.py b/lf_cisco_power.py index 3815285b..b8371699 100755 --- a/lf_cisco_power.py +++ b/lf_cisco_power.py @@ -361,8 +361,8 @@ def main(): file_handler.setLevel(logging.DEBUG) file_handler.setFormatter(formatter) logg.addHandler(file_handler) - logg.addHandler(logging.StreamHandler(sys.stdout)) # allows to logging to file and stderr - #logging.basicConfig(format=FORMAT, handlers=[console_handler]) + #logg.addHandler(logging.StreamHandler(sys.stdout)) # allows to logging to file and stderr + logging.basicConfig(format=FORMAT, handlers=[console_handler]) else: #pass From aa553915c103de41bf931f776a6caaafae61372f Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 19 Nov 2020 18:10:19 -0700 Subject: [PATCH 16/18] cisco_wifi_ctl.py , lf_cisco_power.py : bug fixes --- cisco_wifi_ctl.py | 7 +--- lf_cisco_power.py | 87 +++++++++++++++++++++++------------------------ 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/cisco_wifi_ctl.py b/cisco_wifi_ctl.py index 9969e318..883162ab 100755 --- a/cisco_wifi_ctl.py +++ b/cisco_wifi_ctl.py @@ -99,7 +99,6 @@ def main(): parser.add_argument("-s", "--scheme", type=str, choices=["serial", "ssh", "telnet"], help="Connect via serial, ssh or telnet") parser.add_argument("-t", "--tty", type=str, help="tty serial device") parser.add_argument("-l", "--log", type=str, help="logfile for messages, stdout means output to console",default="stdout") - parser.add_argument("--append", action='store_true', help="--append append to logfile file") #parser.add_argument("-r", "--radio", type=str, help="select radio") parser.add_argument("-w", "--wlan", type=str, help="wlan name") parser.add_argument("-i", "--wlanID", type=str, help="wlan ID") @@ -125,7 +124,6 @@ def main(): user = args.user passwd = args.passwd logfile = args.log - append = args.append if (args.band != None): band = args.band if (band == "abgn"): @@ -143,10 +141,7 @@ def main(): file_handler = None if (logfile is not None): if (logfile != "stdout"): - if append: - file_handler = logging.FileHandler(logfile, "a") - else: - file_handler = logging.FileHandler(logfile, "w") + file_handler = logging.FileHandler(logfile, "w") file_handler.setLevel(logging.DEBUG) file_handler.setFormatter(formatter) logg.addHandler(file_handler) diff --git a/lf_cisco_power.py b/lf_cisco_power.py index b8371699..da84c325 100755 --- a/lf_cisco_power.py +++ b/lf_cisco_power.py @@ -308,8 +308,7 @@ def main(): if (args.pf_a4_dropoff != None): pf_a4_dropoff = args.pf_p4_dropoff if (args.verbose): - # capture the controller output , thus won't got to stdout some output always present - cap_ctl_out = True + cap_ctl_out = True else: cap_ctl_out = False @@ -615,7 +614,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: summary") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "summary","--series",args.series,"--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "summary","--series",args.series,"--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore'); logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -700,7 +699,7 @@ def main(): try: logg.info("3504/9800 cisco_wifi_ctl.py: disable AP {}".format(args.ap)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "disable","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -715,7 +714,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_wlan","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "disable_wlan","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -726,7 +725,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "disable_network_5ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -738,7 +737,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "disable_network_24ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -750,7 +749,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: manual") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "manual","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "manual","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -762,7 +761,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a disable network","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a disable network","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -774,7 +773,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') @@ -790,7 +789,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: txPower {}".format(tx)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "txPower", "--value", tx, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "txPower", "--value", tx, "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -806,7 +805,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: channel {}".format(ch)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "channel", "--value", ch, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "channel", "--value", ch, "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -820,7 +819,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: bandwidth {}".format(bw)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "bandwidth", "--value", bw, "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "bandwidth", "--value", bw, "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -839,7 +838,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: create_wlan wlan {} wlanID {} port {}".format(args.wlan, args.wlanID, args.port)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "create_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "create_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -851,7 +850,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: wireless_tag_policy") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", args.series, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", args.series, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -862,7 +861,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_wlan", "--wlan", args.wlan, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "enable_wlan", "--wlan", args.wlan, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -876,7 +875,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "enable_network_5ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -888,7 +887,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_24ghz") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "enable_network_24ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -900,7 +899,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -912,7 +911,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -924,7 +923,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: enable") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "enable", "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -945,7 +944,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "advanced","--series" , args.series,"--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1005,7 +1004,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: show_wlan_summary") wlan_summary = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "show_wlan_summary","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=True, check=True) + "--action", "show_wlan_summary","--series" , args.series,"--port", args.port ], capture_output=True, check=True) pss = wlan_summary.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1014,7 +1013,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "advanced","--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1113,7 +1112,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "advanced","--series" , args.series,"--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1549,7 +1548,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "advanced","--series" , args.series,"--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1558,7 +1557,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: summary") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "summary","--series" , args.series,"--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "summary","--series" , args.series,"--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1577,7 +1576,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: disable AP {}".format(args.ap)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "disable", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1591,7 +1590,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: no_wlan_wireless_tag_policy") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "no_wlan_wireless_tag_policy", "--wlan", args.wlan, "--series", "--wlanID", args.wlanID, args.series,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "no_wlan_wireless_tag_policy", "--wlan", args.wlan, "--series", "--wlanID", args.wlanID, args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1603,7 +1602,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: delete_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "delete_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port,"--log", outfile_log, "--append" ], capture_output=cap_ctl_out, check=True) + "--action", "delete_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port ], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1615,7 +1614,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "disable_network_5ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1627,7 +1626,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "disable_network_24ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1640,7 +1639,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a disable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a disable network","--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1652,7 +1651,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1665,7 +1664,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: txPower tx 1") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "txPower", "--value", "1", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "txPower", "--value", "1", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1679,7 +1678,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: channel 36") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "channel", "--value", "36", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "channel", "--value", "36", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1692,7 +1691,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: bandwidth 20") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "bandwidth", "--value", "20", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "bandwidth", "--value", "20", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1705,7 +1704,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_5ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "enable_network_5ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1717,7 +1716,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_24ghz","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "enable_network_24ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1729,7 +1728,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: auto") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "auto","--series",args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "auto","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1742,7 +1741,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1754,7 +1753,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1766,7 +1765,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: enable") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append" ],capture_output=cap_ctl_out, check=True) + "--action", "enable", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1787,7 +1786,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced", "--series" , args.series,"--port", args.port,"--log", outfile_log, "--append"], capture_output=True, check=True) + "--action", "advanced", "--series" , args.series,"--port", args.port ], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore'); logg.info(pss) except subprocess.CalledProcessError as process_error: From b6085a02fc7bac9df195de9b8acaabfbc4b6435c Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 19 Nov 2020 18:29:55 -0700 Subject: [PATCH 17/18] cisco_wifi_ctl.py : bug fix for std out --- cisco_wifi_ctl.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cisco_wifi_ctl.py b/cisco_wifi_ctl.py index 883162ab..3b561c23 100755 --- a/cisco_wifi_ctl.py +++ b/cisco_wifi_ctl.py @@ -139,16 +139,15 @@ def main(): logg = logging.getLogger(__name__) logg.setLevel(logging.DEBUG) file_handler = None - if (logfile is not None): - if (logfile != "stdout"): - file_handler = logging.FileHandler(logfile, "w") - file_handler.setLevel(logging.DEBUG) - file_handler.setFormatter(formatter) - logg.addHandler(file_handler) - logging.basicConfig(format=FORMAT, handlers=[console_handler]) - else: - # stdout logging - logging.basicConfig(format=FORMAT, handlers=[console_handler]) + if (logfile != "stdout"): + file_handler = logging.FileHandler(logfile, "w") + file_handler.setLevel(logging.DEBUG) + file_handler.setFormatter(formatter) + logg.addHandler(file_handler) + logging.basicConfig(format=FORMAT, handlers=[console_handler]) + else: + # stdout logging + logging.basicConfig(format=FORMAT, handlers=[console_handler]) logg.info("cisco series {}".format(args.series)) logg.info("scheme {}".format(args.scheme)) From cb2f77654d9045d5eb20ae4fd16984097c1bbccd Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 19 Nov 2020 20:03:59 -0700 Subject: [PATCH 18/18] cisco_wifi_ctl.py, lf_cisco_power.py : need to get to working state. --- cisco_wifi_ctl.py | 41 +++++++++--------- lf_cisco_power.py | 106 ++++++++++++++++++++++------------------------ 2 files changed, 71 insertions(+), 76 deletions(-) diff --git a/cisco_wifi_ctl.py b/cisco_wifi_ctl.py index 3b561c23..78e81c1c 100755 --- a/cisco_wifi_ctl.py +++ b/cisco_wifi_ctl.py @@ -139,18 +139,19 @@ def main(): logg = logging.getLogger(__name__) logg.setLevel(logging.DEBUG) file_handler = None - if (logfile != "stdout"): - file_handler = logging.FileHandler(logfile, "w") - file_handler.setLevel(logging.DEBUG) - file_handler.setFormatter(formatter) - logg.addHandler(file_handler) - logging.basicConfig(format=FORMAT, handlers=[console_handler]) - else: - # stdout logging - logging.basicConfig(format=FORMAT, handlers=[console_handler]) + if (logfile is not None): + if (logfile != "stdout"): + file_handler = logging.FileHandler(logfile, "w") + file_handler.setLevel(logging.DEBUG) + file_handler.setFormatter(formatter) + logg.addHandler(file_handler) + logging.basicConfig(format=FORMAT, handlers=[file_handler]) + else: + # stdout logging + logging.basicConfig(format=FORMAT, handlers=[console_handler]) - logg.info("cisco series {}".format(args.series)) - logg.info("scheme {}".format(args.scheme)) + print("cisco series {}".format(args.series)) + print("scheme {}".format(args.scheme)) try: if (scheme == "serial"): @@ -160,7 +161,7 @@ def main(): with serial.Serial('/dev/ttyUSB0', 115200, timeout=5) as ser: egg = SerialSpawn(ser); egg.logfile = FileAdapter(logg) - logg.info("logg {}".format(logg)) + print("logg {}".format(logg)) egg.sendline(NL) time.sleep(0.1) egg.expect('login:', timeout=3) @@ -177,7 +178,7 @@ def main(): egg = pexpect.spawn(cmd) #egg.logfile_read = sys.stdout.buffer egg.logfile = FileAdapter(logg) - logg.info("logg {}".format(logg)) + print("logg {}".format(logg)) time.sleep(0.1) logged_in_9800 = False loop_count = 0 @@ -893,7 +894,7 @@ def main(): egg.expect(">", timeout=3) logg.info("Ap[%s] Action[%s] Value[%s] "%(args.ap, args.action, args.value)) - #print("Ap[%s] Action[%s] Value[%s]"%(args.ap, args.action, args.value)) + print("Ap[%s] Action[%s] Value[%s]"%(args.ap, args.action, args.value)) if ((args.action == "show") and (args.value is None)): raise Exception("show requires value, like 'country' or 'ap summary'") @@ -1083,14 +1084,12 @@ def main(): command = "show ap channel %s"%(args.ap) if (args.action == "no_wlan_wireless_tag_policy"): - logg.info("send wireless tag policy no wlan") egg.sendline("config t") sleep(0.1) i = egg.expect_exact(["(config)#",pexpect.TIMEOUT],timeout=2) - policy = "no wlan {} policy default-policy-profile".format(args.wlan) if i == 0: - for command in ["wireless tag policy default-policy-tag", policy]: #"no wlan open-wlan policy default-policy-profile" + for command in ["wireless tag policy default-policy-tag","no wlan open-wlan policy default-policy-profile"]: egg.sendline(command) sleep(1) j = egg.expect_exact(["(config-policy-tag)#",pexpect.TIMEOUT],timeout=2) @@ -1107,9 +1106,9 @@ def main(): egg.sendline("config t") sleep(0.1) i = egg.expect_exact(["(config)#",pexpect.TIMEOUT],timeout=2) - policy = "wlan {} policy default-policy-profile".format(args.wlan) if i == 0: - for command in ["wireless tag policy default-policy-tag", policy]: #"wlan open-wlan policy default-policy-profile" + for command in ["wireless tag policy default-policy-tag","wlan open-wlan policy default-policy-profile"]: + egg.sendline(command) sleep(1) j = egg.expect_exact(["(config-policy-tag)#",pexpect.TIMEOUT],timeout=2) if j == 0: @@ -1275,7 +1274,7 @@ def main(): while logged_out_9800 == False and loop_count <= 6: loop_count += 1 i = egg.expect_exact(["WLC>","WLC#", "WLC(config)#","(config-wlan)#","(config-policy-tag)#","(config-line)#",pexpect.TIMEOUT],timeout=5) - logg.info(egg.before.decode('utf-8', 'ignore')) + print (egg.before.decode('utf-8', 'ignore')) if i == 0: logg.info("WLC> prompt received can send logout") egg.sendline("logout") @@ -1355,7 +1354,7 @@ def main(): try: i = egg.expect_exact([CCPROMPT,LEGACY_PROMPT,AREYOUSURE,'--More-- or','config paging disable',pexpect.TIMEOUT],timeout=2) logg.info("before {} after {}".format(egg.before.decode('utf-8', 'ignore'),egg.after.decode('utf-8', 'ignore'))) - logg.info(egg.before.decode('utf-8', 'ignore')) + print(egg.before.decode('utf-8', 'ignore')) if i == 0: logg.info("{} prompt received after command sent".format(CCPROMPT)) # granted the break will exit the loop diff --git a/lf_cisco_power.py b/lf_cisco_power.py index da84c325..0dd8fde6 100755 --- a/lf_cisco_power.py +++ b/lf_cisco_power.py @@ -308,10 +308,10 @@ def main(): if (args.pf_a4_dropoff != None): pf_a4_dropoff = args.pf_p4_dropoff if (args.verbose): - cap_ctl_out = True + # capture the controller output , thus won't got to stdout some output always present + cap_ctl_out = False else: - cap_ctl_out = False - + cap_ctl_out = True print("cap_ctl_out {}".format(cap_ctl_out)) # note: there would always be an args.outfile due to the default current_time = time.strftime("%m_%d_%Y_%H_%M_%S", time.localtime()) @@ -324,10 +324,6 @@ def main(): if args.log: outfile_log = "{}_{}_output_log.log".format(args.outfile,current_time) print("output file log: {}".format(outfile_log)) - else: - outfile_log = "stdout" - print("output file log: {}".format(outfile_log)) - email_dicts = [] if args.email: emails = args.email @@ -360,8 +356,8 @@ def main(): file_handler.setLevel(logging.DEBUG) file_handler.setFormatter(formatter) logg.addHandler(file_handler) - #logg.addHandler(logging.StreamHandler(sys.stdout)) # allows to logging to file and stderr - logging.basicConfig(format=FORMAT, handlers=[console_handler]) + logg.addHandler(logging.StreamHandler(sys.stdout)) # allows to logging to file and stderr + #logging.basicConfig(format=FORMAT, handlers=[console_handler]) else: #pass @@ -593,7 +589,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: no_logging_console") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "no_logging_console","--series",args.series,"--port", args.port], capture_output=True, check=True) + "--action", "no_logging_console","--series",args.series,"--port",args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore'); logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -603,7 +599,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: line_console_0") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "line_console_0","--series",args.series,"--port", args.port], capture_output=True, check=True) + "--action", "line_console_0","--series",args.series,"--port",args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore'); logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -614,13 +610,13 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: summary") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "summary","--series",args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "summary","--series",args.series,"--port",args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore'); logg.info(pss) except subprocess.CalledProcessError as process_error: logg.info("Controller unable to commicate to AP or unable to communicate to controller error code {} output {}".format(process_error.returncode, process_error.output)) exit_test(workbook) - + # Find our current regulatory domain so we can report it properly searchap = False for line in pss.splitlines(): @@ -699,7 +695,7 @@ def main(): try: logg.info("3504/9800 cisco_wifi_ctl.py: disable AP {}".format(args.ap)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "disable","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -714,7 +710,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_wlan","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "disable_wlan","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -725,7 +721,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_5ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "disable_network_5ghz","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -737,7 +733,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_24ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "disable_network_24ghz","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -749,7 +745,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: manual") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "manual","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "manual","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -761,7 +757,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a disable network","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a disable network","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -773,7 +769,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') @@ -789,7 +785,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: txPower {}".format(tx)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "txPower", "--value", tx, "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "txPower", "--value", tx, "--series" , args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -805,7 +801,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: channel {}".format(ch)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "channel", "--value", ch, "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "channel", "--value", ch, "--series" , args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -819,7 +815,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: bandwidth {}".format(bw)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "bandwidth", "--value", bw, "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "bandwidth", "--value", bw, "--series" , args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -838,7 +834,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: create_wlan wlan {} wlanID {} port {}".format(args.wlan, args.wlanID, args.port)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "create_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "create_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -850,7 +846,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: wireless_tag_policy") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "wireless_tag_policy", "--wlan", args.wlan, "--series", args.series, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "wireless_tag_policy","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -861,7 +857,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_wlan", "--wlan", args.wlan, "--wlanID", args.wlanID, "--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "enable_wlan","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -875,7 +871,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_5ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "enable_network_5ghz","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -887,7 +883,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_24ghz") ctl_output =subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_24ghz","--series",args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "enable_network_24ghz","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -899,7 +895,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -911,7 +907,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -923,7 +919,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: enable") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable", "--series" , args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "enable", "--series" , args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -944,7 +940,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--series" , args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "advanced","--series" , args.series,"--port", args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1004,7 +1000,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: show_wlan_summary") wlan_summary = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "show_wlan_summary","--series" , args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "show_wlan_summary","--series" , args.series,"--port", args.port], capture_output=True, check=True) pss = wlan_summary.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1013,7 +1009,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--port", args.port ], capture_output=True, check=True) + "--action", "advanced","--port", args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1112,7 +1108,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--series" , args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "advanced","--series" , args.series,"--port", args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1548,7 +1544,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced","--series" , args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "advanced","--series" , args.series,"--port", args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1557,7 +1553,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: summary") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "summary","--series" , args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "summary","--series" , args.series,"--port", args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore') logg.info(pss) except subprocess.CalledProcessError as process_error: @@ -1576,7 +1572,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: disable AP {}".format(args.ap)) ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "disable", "--series" , args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1590,7 +1586,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: no_wlan_wireless_tag_policy") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "no_wlan_wireless_tag_policy", "--wlan", args.wlan, "--series", "--wlanID", args.wlanID, args.series,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "no_wlan_wireless_tag_policy","--series",args.series,"--port", args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1602,7 +1598,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: delete_wlan") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "delete_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port", args.port ], capture_output=cap_ctl_out, check=True) + "--action", "delete_wlan","--series",args.series, "--wlan", args.wlan, "--wlanID", args.wlanID,"--port",args.port], capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1614,7 +1610,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_5ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "disable_network_5ghz","--series",args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1626,7 +1622,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: disable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "disable_network_24ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "disable_network_24ghz","--series",args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1639,7 +1635,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a disable network","--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a disable network","--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1651,7 +1647,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b disable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b disable network","--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1664,7 +1660,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: txPower tx 1") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "txPower", "--value", "1", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "txPower", "--value", "1", "--series" , args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1677,8 +1673,8 @@ def main(): if (ch != "NA"): try: logg.info("9800/3504 cisco_wifi_ctl.py: channel 36") - ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "channel", "--value", "36", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + ctl_out = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, + "--action", "channel", "--value", "36", "--series" , args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1691,7 +1687,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: bandwidth 20") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "bandwidth", "--value", "20", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "bandwidth", "--value", "20", "--series" , args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1704,7 +1700,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_5ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_5ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "enable_network_5ghz","--series",args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1716,7 +1712,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: enable_network_24ghz") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable_network_24ghz","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "enable_network_24ghz","--series",args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1728,7 +1724,7 @@ def main(): try: logg.info("9800 cisco_wifi_ctl.py: auto") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "auto","--series",args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "auto","--series",args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1741,7 +1737,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11a enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11a enable network","--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1753,7 +1749,7 @@ def main(): try: logg.info("3504 cisco_wifi_ctl.py: config 802.11b enable network") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "cmd", "--value", "config 802.11b enable network","--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1765,7 +1761,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: enable") ctl_output = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "enable", "--series" , args.series,"--port", args.port ],capture_output=cap_ctl_out, check=True) + "--action", "enable", "--series" , args.series,"--port", args.port],capture_output=cap_ctl_out, check=True) if cap_ctl_out: pss = ctl_output.stdout.decode('utf-8', 'ignore') logg.info(pss) @@ -1786,7 +1782,7 @@ def main(): try: logg.info("9800/3504 cisco_wifi_ctl.py: advanced") advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, - "--action", "advanced", "--series" , args.series,"--port", args.port ], capture_output=True, check=True) + "--action", "advanced", "--series" , args.series,"--port", args.port], capture_output=True, check=True) pss = advanced.stdout.decode('utf-8', 'ignore'); logg.info(pss) except subprocess.CalledProcessError as process_error: