wlanpro: Use longer report-timers for WCT

And update lf_auto_wifi_cap to support that as well.  This keeps us
from over-driving the LANforge so bad in the WCT test case, and gives
more reliable stats.
This commit is contained in:
Ben Greear
2018-08-07 14:56:32 -07:00
parent 08c9b54e76
commit c812f3b146
2 changed files with 15 additions and 2 deletions

View File

@@ -45,6 +45,8 @@ our $upstream = "eth1";
our $increment = 5;
our $duration = 30;
our $test_name = "lanforge-wifi-capacity-test";
our $rpt_timer = 1000;
our $settle_timer = 10000; # 10 seconds
our $fail_msg = "";
our $manual_check = 0;
@@ -85,6 +87,7 @@ our $usage = "$0
[--percent_tcp {percent_tcp for mixed traffic type}]
[--increment {station-bringup-increment (5)}]
[--duration {bringup-step-duration (30)}]
[--report_timer {milisecond report timer for created the endpoints (1000)}]
[--endp_type { udp, tcp, mix }
[--use_pdu_mix { true | (false) }]
[--pdu_percent { bps | (pps) }]
@@ -97,7 +100,7 @@ our $usage = "$0
Example:
./lf_auto_wifi_cap.pl --mgr ben-ota-1 --resource 2 --radio wiphy0 --speed_dl 500000000 --ssid Lede-ventana --num_sta 64 --upstream eth1 --first_ip DHCP --percent_tcp 50 --increment 1,5,10,20,30,40,50,64 --duration 15 --endp_type mix --test_name ventana-mix-dl --test_text 'Ventana LEDE, WLE900VX<br>over-the-air to LANforge station system 5 feet away<br>LAN to WiFi traffic path' --multicon 1
./lf_auto_wifi_cap.pl --mgr ben-ota-1 --resource 2 --radio wiphy0 --speed_dl 500000000 --ssid Lede-ventana --num_sta 64 --upstream eth1 --first_ip DHCP --percent_tcp 50 --increment 1,5,10,20,30,40,50,64 --duration 15 --report_timer 3000 --endp_type mix --test_name ventana-mix-dl --test_text 'Ventana LEDE, WLE900VX<br>over-the-air to LANforge station system 5 feet away<br>LAN to WiFi traffic path' --multicon 1
";
@@ -126,6 +129,8 @@ GetOptions
'percent_tcp=i' => \$::percent_tcp,
'increment=s' => \$::increment,
'duration=i' => \$::duration,
'report_timer=i' => \$::rpt_timer,
'settle_timer=i' => \$::settle_timer,
'endp_type=s' => \$::endp_type,
'test_name=s' => \$::test_name,
'multicon=i' => \$::multicon,
@@ -235,6 +240,8 @@ else {
print CAP "__CFG STA_INCREMENT $::increment\n";
print CAP "__CFG DURATION " . ($::duration * 1000) . "\n";
print CAP "__CFG RPT_TIMER " . ($::rpt_timer) . "\n";
print CAP "__CFG BEFORE_CLEAR " . ($::settle_timer) . "\n";
my $proto = 0;
if ($endp_type eq "tcp") {

View File

@@ -16,6 +16,10 @@
# Mixed mode: 10 3x3, 15 2x2, 15 1x1 (Same data pattern)
# WiFi Capacit test notes:
# Mix of TCP and UDP, using MTU sized frames
# All 64 stations are on one 4x4 radio
# Mixed With interference: Same as mixed mode
# Assume other test EQ is doing interference?
@@ -55,6 +59,8 @@ my $multicon = 1;
my $rest_time = 20;
my $quiet = "yes";
my $report_timer = 1000; # 1 second report timer
my $rpt_timer_wct = 3000; # 3-second rpt timer for wifi-capacity test
my $settle_timer_wct = 10000; # 10-sec wait for connections to get running before clearing and starting the test proper
my $one_way_test_time = 30;
my $bi_test_time = 30;
@@ -358,7 +364,7 @@ if ($testcase == -1 || $testcase == 6) {
#wait_for_stations(); WCT takes care of bringing stations up/down
my $sta_list = join(",", @stations4a);
# Call to automated wifi capacity test plugin
do_cmd("./lf_auto_wifi_cap.pl --mgr $manager --resource $resource --radio $radio_4a --speed_dl $speed_dl_tot --ssid $ssid --num_sta $wct_sta_max --upstream $upstream_port --upstream_resource $upstream_resource --percent_tcp 50 --increment 1,5,10,20,30,45,64 --duration 15 --endp_type mix --test_name wlanpro-$ssid --test_text 'Wlan-Pro test case #6 to ssid $ssid' --multicon 1 --use_existing_sta --use_existing_cfg --use_station $sta_list --gui_host $gui_host --gui_port $gui_port");
do_cmd("./lf_auto_wifi_cap.pl --mgr $manager --resource $resource --radio $radio_4a --speed_dl $speed_dl_tot --ssid $ssid --num_sta $wct_sta_max --upstream $upstream_port --upstream_resource $upstream_resource --percent_tcp 50 --increment 1,5,10,20,30,45,64 --duration 15 --endp_type mix --test_name wlanpro-$ssid --test_text 'Wlan-Pro test case #6 to ssid $ssid' --multicon 1 --use_existing_sta --use_existing_cfg --use_station $sta_list --gui_host $gui_host --gui_port $gui_port --report_timer $rpt_timer_wct --settle_timer $settle_timer_wct");
}
if ($testcase == 100) {