From 673916a0142b46b6502b3dd1f300044e7aafefb5 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Wed, 16 Feb 2022 22:38:26 -0700 Subject: [PATCH] cc_module_9800_3504.py : added show_ap_wlan_summary wifi_ctl_9800_3504.py : added the show ap wlan summary Signed-off-by: Chuck SmileyRekiere --- cc_module_9800_3504.py | 19 ++++++++++++------- wifi_ctl_9800_3504.py | 9 ++++++++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/cc_module_9800_3504.py b/cc_module_9800_3504.py index 0b20d00c..2d0de636 100755 --- a/cc_module_9800_3504.py +++ b/cc_module_9800_3504.py @@ -172,7 +172,7 @@ class create_controller_series_object: self.command.extend(self.command_extend) # possible need to look for exact command - elif self.action in ["summary", "show_radio", "no_logging_console", "line_console_0", "show_wlan_summary", + elif self.action in ["summary", "show_radio", "no_logging_console", "line_console_0", "show_ap_wlan_summary", "show_wlan_summary", "advanced", "disable", "disable_network_5ghz", "disable_network_24ghz", "manual", "auto", "enable_network_5ghz", "enable_network_24ghz", "enable"]: @@ -233,6 +233,12 @@ class create_controller_series_object: summary = self.send_command() return summary + def show_ap_wlan_summary(self): + logger.info("show ap wlan summary") + self.action = "show_ap_wlan_summary" + summary = self.send_command() + return summary + def show_wlan_summary(self): logger.info("show_wlan_summary") self.action = "show_wlan_summary" @@ -554,7 +560,6 @@ def sample_test_tx_power_sequence(cs): cs.tag_policy = 'RM204-TB1' cs.policy_profile = 'default-policy-profile' - # no_logging_console cs.no_logging_console() # line_console_0 @@ -670,7 +675,6 @@ def test_config_tx_power_5g_open(cs): cs.channel = '100' cs.bandwidth = '40' - # no_logging_console cs.no_logging_console() # line_console_0 @@ -691,7 +695,7 @@ def test_config_tx_power_5g_open(cs): # manual cs.ap_dot11_5ghz_radio_role_manual_client_serving() cs.ap_dot11_24ghz_radio_role_manual_client_serving() - + # Configuration for 5g # txPower @@ -715,7 +719,6 @@ def test_config_tx_power_5g_open(cs): # create_wlan open - # enable_wlan cs.config_enable_wlan_send_no_shutdown() # enable_network_5ghz @@ -873,7 +876,9 @@ INCLUDE_IN_README timeout=args.timeout) # TODO add ability to select tests - # cs.show_controllers_dot11Radio_0() + # cs.show_ap_summary() + summary = cs.show_ap_wlan_summary() + logger.info(summary) # sample to dump status # sample_test_dump_status(cs=cs) @@ -881,7 +886,7 @@ INCLUDE_IN_README # test sequences used by tx_power # sample_test_tx_power_sequence(cs=cs) - test_config_tx_power_5g_open(cs=cs) + # test_config_tx_power_5g_open(cs=cs) # test_config_tx_power_wpa2(cs=cs) diff --git a/wifi_ctl_9800_3504.py b/wifi_ctl_9800_3504.py index 9b0dc1e3..b21ecd57 100755 --- a/wifi_ctl_9800_3504.py +++ b/wifi_ctl_9800_3504.py @@ -144,7 +144,7 @@ def main(): parser.add_argument("--action", type=str, help="perform action", choices=["config", "debug_disable_all", "no_logging_console", "line_console_0", "country", "ap_country", "enable", "disable", "summary", "advanced", - "cmd", "txPower", "bandwidth", "manual", "auto", "no_wlan", "show_wlan_summary", "show_radio", + "cmd", "txPower", "bandwidth", "manual", "auto", "no_wlan", "show_ap_wlan_summary", "show_wlan_summary", "show_radio", "ap_channel", "auto_rf", "channel", "show", "create_wlan", "create_wlan_wpa2", "create_wlan_wpa3", "enable_wlan", "disable_wlan", "wlan_qos", "disable_network_5ghz", "disable_network_24ghz", "enable_network_5ghz", "enable_network_24ghz", "wireless_tag_policy", "no_wlan_wireless_tag_policy", "delete_wlan"]) @@ -1008,6 +1008,13 @@ def main(): if (args.action == "show_radio"): command = "show controllers dot11Radio 0 wlan" + if (args.action == "show_ap_wlan_summary"): + if args.series == "9800": + command = "show ap wlan summary" + else: + # untested on 3504 + command = "show ap wlan summary" + if (args.action == "summary"): if args.series == "9800": if band == "a":