From 554377ded8360eeb06d0766bed6304e39b202b46 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Thu, 13 Aug 2020 06:34:25 -0700 Subject: [PATCH] nola2: Tune for smaller stations, ap-auto and dpt use proper STA and DUT. I'm not sure fwcfg feature is in all builds yet, so run with fewer stations for now. Signed-off-by: Ben Greear --- testbeds/nola-basic-02/ap-auto.txt | 14 ++++++-------- testbeds/nola-basic-02/dpt-pkt-sz.txt | 2 +- testbeds/nola-basic-02/run_basic_fast.bash | 2 ++ testbeds/nola-basic-02/test_bed_cfg.bash | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testbeds/nola-basic-02/ap-auto.txt b/testbeds/nola-basic-02/ap-auto.txt index 2aabe2cd9..daf4da897 100644 --- a/testbeds/nola-basic-02/ap-auto.txt +++ b/testbeds/nola-basic-02/ap-auto.txt @@ -10,11 +10,11 @@ show_scan: 1 auto_helper: 1 skip_2: 1 skip_5: 1 -dut5-0: ea8300 OpenWrt-5lo -dut2-0: ea8300 OpenWrt-2 +dut5-0: ecw5410 Default-SSID-5gl +dut2-0: ecw5410 Default-SSID-2g dut5-1: NA dut2-1: NA -dut5-2: ea8300 OpenWrt-2 +dut5-2: NA dut2-2: NA spatial_streams: AUTO bandw_options: AUTO @@ -41,9 +41,9 @@ stab_tcp_ul_min: 500000 stab_tcp_ul_max: 0 dl_speed: 85% ul_speed: 85% -max_stations_2: 128 -max_stations_5: 132 -max_stations_dual: 260 +max_stations_2: 30 +max_stations_5: 30 +max_stations_dual: 60 lt_sta: 2 voip_calls: 0 lt_dur: 3600 @@ -64,8 +64,6 @@ radio5-0: 1.1.5 wiphy1 radio5-1: 1.1.7 wiphy3 radio5-2: 1.1.8 wiphy4 radio5-3: 1.1.9 wiphy5 -radio5-4: 1.1.10 wiphy6 -radio5-5: 1.1.11 wiphy7 basic_cx: 1 tput: 0 dual_band_tput: 0 diff --git a/testbeds/nola-basic-02/dpt-pkt-sz.txt b/testbeds/nola-basic-02/dpt-pkt-sz.txt index b51685d6a..aa10d1107 100644 --- a/testbeds/nola-basic-02/dpt-pkt-sz.txt +++ b/testbeds/nola-basic-02/dpt-pkt-sz.txt @@ -11,7 +11,7 @@ skip_2: 0 skip_5: 0 selected_dut: ea8300 duration: 15000 -traffic_port: 1.1.136 sta01001 +traffic_port: 1.1.136 sta00500 upstream_port: 1.1.2 eth2 path_loss: 10 speed: 85% diff --git a/testbeds/nola-basic-02/run_basic_fast.bash b/testbeds/nola-basic-02/run_basic_fast.bash index 1aa0909ac..ebd4542c8 100755 --- a/testbeds/nola-basic-02/run_basic_fast.bash +++ b/testbeds/nola-basic-02/run_basic_fast.bash @@ -12,6 +12,8 @@ # DUT_PASSWD1 DUT_PASSWD2 DUT_PASSWD3 # DUT_BSSID1 DUT_BSSID2 DUT_BSSID3 +#set -x + DO_SHORT_AP_BASIC_CX=${DO_SHORT_AP_BASIC_CX:-1} DO_WCT_BI=${DO_WCT_BI:-1} diff --git a/testbeds/nola-basic-02/test_bed_cfg.bash b/testbeds/nola-basic-02/test_bed_cfg.bash index 9b7f4ed07..54f7eba0f 100644 --- a/testbeds/nola-basic-02/test_bed_cfg.bash +++ b/testbeds/nola-basic-02/test_bed_cfg.bash @@ -15,7 +15,7 @@ LFPASSWD=${LFPASSWD:-lanforge} # Root password on LANforge machine AP_AUTO_CFG_FILE=${AP_AUTO_CFG_FILE:-$PWD/ap-auto.txt} WCT_CFG_FILE=${WCT_CFG_FILE:-$PWD/wct.txt} DPT_CFG_FILE=${DPT_CFG_FILE:-$PWD/dpt-pkt-sz.txt} -SCENARIO_CFG_FILE=${SCENARIO_CFG_FILE:-$PWD/scenario.txt} +SCENARIO_CFG_FILE=${SCENARIO_CFG_FILE:-$PWD/scenario_small.txt} # Default to enable cloud-sdk for this testbed, cloud-sdk is at IP addr below #USE_CLOUD_SDK=${USE_CLOUD_SDK:-192.168.100.164}