Merge branch 'ci/remove_unused_example_iperf_sdkconfig' into 'master'

fix(ci): remove useless example iperf sdkconfigs

See merge request espressif/esp-idf!25880

examples/wifi/iperf/pytest_iperf.py

@@ -7,48 +7,37 @@ This test case might have problem running on windows:
 
 - use `sudo killall iperf` to force kill iperf, didn't implement windows version
 
-The test env Example_ShieldBox do need the following config::
+The test env Example_ShieldBox_Basic do need the following config::
+
+  Example_ShieldBox_Basic:
+    ap_ssid: "myssid"
+    ap_password: "mypassword"
+    pc_nic: "eth1"
 
-  Example_ShieldBox:
-    ap_list:
-      - ssid: "ssid"
-        password: "password"
-        outlet: 1
-    apc_ip: "192.168.1.88"
-    attenuator_port: "/dev/ttyUSB0"
-    iperf: "/dev/ttyUSB1"
-    apc_ip: "192.168.1.88"
-    pc_nic: "eth0"
 """
 
-import logging
 import os
-import re
 import time
-from typing import Any, Callable, Dict, Generator, Tuple
+from typing import Any, Callable, Tuple
 
 import pexpect
 import pytest
 from common_test_methods import get_env_config_variable, get_host_ip_by_interface
-from idf_iperf_test_util import Attenuator, IperfUtility, PowerControl, TestReport
+from idf_iperf_test_util import IperfUtility
 from idf_iperf_test_util.IperfUtility import SCAN_RETRY_COUNT, SCAN_TIMEOUT, TEST_TIME
 from pytest_embedded import Dut
-from pytest_embedded_idf.dut import IdfDut
 
 # configurations
 RETRY_COUNT_FOR_BEST_PERFORMANCE = 2
-ATTEN_VALUE_LIST = range(0, 60, 2)
 NO_BANDWIDTH_LIMIT = -1  # iperf send bandwith is not limited
 
-# We need to auto compare the difference between adjacent configs (01 -> 00, 02 -> 01, ...) and put them to reports.
-# Using numbers for config will make this easy.
 # Use default value `99` for config with best performance.
 BEST_PERFORMANCE_CONFIG = '99'
 
 
 class IperfTestUtilitySoftap(IperfUtility.IperfTestUtility):
     """ iperf test implementation """
-    def __init__(self, dut:IdfDut, softap_dut:IdfDut, config_name:str, test_result:Any=None) -> None:
+    def __init__(self, dut: Dut, softap_dut: Dut, config_name:str, test_result:Any=None) -> None:
         IperfUtility.IperfTestUtility.__init__(self, dut, config_name, 'softap', '1234567890', None, None, test_result)
         self.softap_dut = softap_dut
         self.softap_ip = '192.168.4.1'
@@ -145,38 +134,6 @@ class IperfTestUtilitySoftap(IperfUtility.IperfTestUtility):
         return server_raw_data, rssi, heap_size
 
 
-@pytest.fixture(name='generate_report_different_configs', scope='session')
-def fixture_generate_report_different_configs(
-    session_tempdir:str
-) -> Generator[Callable[[Dict[str, Any], Dict[str, Any], str], None], None, None]:
-    _test_result_dict = dict()
-    _sdkconfig_files_dict = dict()
-    _ap_info = dict()
-
-    def add_config(ap_info:Dict[str, Any], test_result:Dict[str, Any], config_name:str) -> None:
-        """
-        Collects results for each config and stores it to a dictionary
-            Args:
-                ap_info: AP info
-                test_result: test results for a specific config
-                config_name: config name
-        """
-        # need to store the SSID to generate the report in the teardown period
-        # note that the info passed along with the last call of the fixture is used in the teardown period
-        _ap_info['ssid'] = ap_info['ssid']
-
-        _test_result_dict[config_name] = test_result
-        _sdkconfig_files_dict[config_name] = 'sdkconfig.ci.' + config_name
-
-    yield add_config
-
-    # the final report for all config results is generated during fixture's teardown period
-    report = TestReport.ThroughputForConfigsReport(os.path.join(session_tempdir, 'Performance',
-                                                   'ThroughputForConfigsReport'), _ap_info['ssid'],
-                                                   _test_result_dict, _sdkconfig_files_dict)
-    report.generate_report()
-
-
 @pytest.mark.esp32
 @pytest.mark.esp32s2
 @pytest.mark.esp32c3
@@ -233,186 +190,3 @@ def test_wifi_throughput_basic(
     for throughput_type in test_result:
         check_performance('{}_throughput'.format(throughput_type),
                           test_result[throughput_type].get_best_throughput(), dut.target)
-
-
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32c3
-@pytest.mark.esp32s3
-@pytest.mark.temp_skip_ci(targets=['esp32', 'esp32s2', 'esp32c3', 'esp32s3'], reason='local stress test')
-@pytest.mark.timeout(1200)
-@pytest.mark.Example_ShieldBox_Basic
-@pytest.mark.parametrize('config', [
-    '00',
-    '01',
-    '02',
-    '03',
-    '04',
-    '05',
-    '06',
-    '07',
-    '99'
-], indirect=True)
-def test_wifi_throughput_with_different_configs(
-    dut: Dut,
-    generate_report_different_configs: Callable[[Dict[str, Any], Dict[str, Any], str], None],
-) -> None:
-    """
-    steps: |
-      1. build iperf with specified configs
-      2. test throughput for all routers
-    """
-    # 1. wait for DUT
-    dut.expect('iperf>')
-
-    # 2. preparing
-    env_name = 'Example_ShieldBox_Basic'
-    pc_nic = get_env_config_variable(env_name, 'pc_nic')
-    pc_nic_ip = get_host_ip_by_interface(pc_nic)
-    pc_iperf_log_file = os.path.join(dut.logdir, 'pc_iperf_log.md')
-    ap_info = {
-        'ssid': get_env_config_variable(env_name, 'ap_ssid'),
-        'password': get_env_config_variable(env_name, 'ap_password'),
-    }
-
-    found_config = re.search(r'esp32.*\.(\w+)\.', dut.test_case_name)
-    if found_config is not None:
-        config_name = found_config.group(1)
-    else:
-        raise Exception('config name not found')
-
-    # 3. run test for each required att value
-    test_result = {
-        'tcp_tx': IperfUtility.TestResult('tcp', 'tx', config_name),
-        'tcp_rx': IperfUtility.TestResult('tcp', 'rx', config_name),
-        'udp_tx': IperfUtility.TestResult('udp', 'tx', config_name),
-        'udp_rx': IperfUtility.TestResult('udp', 'rx', config_name),
-    }
-    test_utility = IperfUtility.IperfTestUtility(dut, config_name, ap_info['ssid'], ap_info['password'], pc_nic_ip,
-                                                 pc_iperf_log_file, test_result)
-    for _ in range(RETRY_COUNT_FOR_BEST_PERFORMANCE):
-        test_utility.run_all_cases(0, NO_BANDWIDTH_LIMIT)
-
-    for result_type in test_result:
-        summary = str(test_result[result_type])
-        if summary:
-            logging.info(summary)
-
-    generate_report_different_configs(ap_info, test_result, config_name)
-
-
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32c3
-@pytest.mark.esp32s3
-@pytest.mark.temp_skip(targets=['esp32', 'esp32s2', 'esp32c3', 'esp32s3'], reason='lack of runners')
-@pytest.mark.timeout(3600)
-@pytest.mark.Example_ShieldBox
-@pytest.mark.parametrize('config', [
-    BEST_PERFORMANCE_CONFIG
-], indirect=True)
-def test_wifi_throughput_vs_rssi(
-    dut: Dut,
-    session_tempdir:str,
-) -> None:
-    """
-    steps: |
-      1. build with best performance config
-      2. switch on one router
-      3. set attenuator value from 0-60 for each router
-      4. test TCP tx rx and UDP tx rx throughput
-    """
-    # 1. wait for DUT
-    dut.expect('iperf>')
-
-    # 2. preparing
-    env_name = 'Example_ShieldBox'
-    att_port = get_env_config_variable(env_name, 'attenuator_port')
-    ap_list = get_env_config_variable(env_name, 'ap_list')
-    pc_nic = get_env_config_variable(env_name, 'pc_nic')
-    pc_nic_ip = get_host_ip_by_interface(pc_nic)
-    apc_ip = get_env_config_variable(env_name, 'apc_ip')
-    pc_iperf_log_file = os.path.join(dut.logdir, 'pc_iperf_log.md')
-
-    test_result = {
-        'tcp_tx': IperfUtility.TestResult('tcp', 'tx', BEST_PERFORMANCE_CONFIG),
-        'tcp_rx': IperfUtility.TestResult('tcp', 'rx', BEST_PERFORMANCE_CONFIG),
-        'udp_tx': IperfUtility.TestResult('udp', 'tx', BEST_PERFORMANCE_CONFIG),
-        'udp_rx': IperfUtility.TestResult('udp', 'rx', BEST_PERFORMANCE_CONFIG),
-    }
-
-    # 3. run test for each required att value
-    for ap_info in ap_list:
-        test_utility = IperfUtility.IperfTestUtility(dut, BEST_PERFORMANCE_CONFIG, ap_info['ssid'],
-                                                     ap_info['password'], pc_nic_ip, pc_iperf_log_file, test_result)
-        PowerControl.Control.control_rest(apc_ip, ap_info['outlet'], 'OFF')
-        PowerControl.Control.control(apc_ip, {ap_info['outlet']: 'ON'})
-        Attenuator.set_att(att_port, 0)
-        if not test_utility.wait_ap_power_on():
-            logging.error('[{}] failed to power on, skip testing this AP'.format(ap_info['ssid']))
-            continue
-        for atten_val in ATTEN_VALUE_LIST:
-            assert Attenuator.set_att(att_port, atten_val) is True
-            try:
-                test_utility.run_all_cases(atten_val, NO_BANDWIDTH_LIMIT)
-            except AssertionError:
-                break
-
-    # 4. generate report
-    report = TestReport.ThroughputVsRssiReport(os.path.join(session_tempdir, 'Performance', 'STAThroughputVsRssiReport'),
-                                               test_result)
-    report.generate_report()
-
-
-@pytest.mark.esp32
-@pytest.mark.esp32s2
-@pytest.mark.esp32c3
-@pytest.mark.esp32s3
-@pytest.mark.temp_skip(targets=['esp32', 'esp32s2', 'esp32c3', 'esp32s3'], reason='lack of runners')
-@pytest.mark.parametrize('count, config', [
-    (2, BEST_PERFORMANCE_CONFIG),
-], indirect=True)
-def test_softap_throughput_vs_rssi(
-    dut: Tuple[IdfDut, IdfDut],
-    session_tempdir:str,
-) -> None:
-    """
-    steps: |
-      1. build with best performance config
-      2. switch on one router
-      3. set attenuator value from 0-60 for each router
-      4. test TCP tx rx and UDP tx rx throughput
-    """
-    # 1. wait for DUTs
-    softap_dut = dut[0]
-    sta_dut = dut[1]
-    softap_dut.expect('iperf>')
-    sta_dut.expect('iperf>')
-
-    # 2. preparing
-    env_name = 'Example_ShieldBox2'
-    att_port = get_env_config_variable(env_name, 'attenuator_port')
-
-    test_result = {
-        'tcp_tx': IperfUtility.TestResult('tcp', 'tx', BEST_PERFORMANCE_CONFIG),
-        'tcp_rx': IperfUtility.TestResult('tcp', 'rx', BEST_PERFORMANCE_CONFIG),
-        'udp_tx': IperfUtility.TestResult('udp', 'tx', BEST_PERFORMANCE_CONFIG),
-        'udp_rx': IperfUtility.TestResult('udp', 'rx', BEST_PERFORMANCE_CONFIG),
-    }
-
-    # 3. run test for each required att value
-    test_utility = IperfTestUtilitySoftap(sta_dut, softap_dut, BEST_PERFORMANCE_CONFIG, test_result)
-
-    Attenuator.set_att(att_port, 0)
-
-    for atten_val in ATTEN_VALUE_LIST:
-        assert Attenuator.set_att(att_port, atten_val) is True
-        try:
-            test_utility.run_all_cases(atten_val, NO_BANDWIDTH_LIMIT)
-        except AssertionError:
-            break
-
-    # 4. generate report
-    report = TestReport.ThroughputVsRssiReport(os.path.join(session_tempdir, 'Performance',
-                                                            'SoftAPThroughputVsRssiReport'),test_result)
-    report.generate_report()

examples/wifi/iperf/sdkconfig.ci.00

@@ -1,4 +0,0 @@
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n

examples/wifi/iperf/sdkconfig.ci.01

@@ -1,22 +0,0 @@
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_FREERTOS_UNICORE=n
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=12
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=48
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=48
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=12
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=12
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11488
-CONFIG_LWIP_TCP_WND_DEFAULT=11488
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=12
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=12
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=48
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n

examples/wifi/iperf/sdkconfig.ci.02

@@ -1,22 +0,0 @@
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_FREERTOS_UNICORE=n
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=32
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11488
-CONFIG_LWIP_TCP_WND_DEFAULT=11488
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=12
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=12
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=48
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n

examples/wifi/iperf/sdkconfig.ci.03

@@ -1,22 +0,0 @@
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_FREERTOS_UNICORE=n
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=32
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=32768
-CONFIG_LWIP_TCP_WND_DEFAULT=32768
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n

examples/wifi/iperf/sdkconfig.ci.04

@@ -1,22 +0,0 @@
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_FREERTOS_UNICORE=n
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=32
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65535
-CONFIG_LWIP_TCP_WND_DEFAULT=65535
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n

examples/wifi/iperf/sdkconfig.ci.05

@@ -1,26 +0,0 @@
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_FREERTOS_UNICORE=n
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=32
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
-CONFIG_LWIP_TCP_WND_DEFAULT=65534
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n
-
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_LWIP_IRAM_OPTIMIZATION=y

examples/wifi/iperf/sdkconfig.ci.06

@@ -1,26 +0,0 @@
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=32
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
-
-CONFIG_FREERTOS_UNICORE=y
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
-CONFIG_LWIP_TCP_WND_DEFAULT=65534
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n
-
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_LWIP_IRAM_OPTIMIZATION=y

examples/wifi/iperf/sdkconfig.ci.07

@@ -1,29 +0,0 @@
-CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y
-CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
-
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
-
-CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
-CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=32
-CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=32
-
-CONFIG_FREERTOS_UNICORE=n
-CONFIG_FREERTOS_HZ=1000
-
-CONFIG_ESP_INT_WDT=n
-CONFIG_ESP_TASK_WDT_EN=n
-
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
-CONFIG_LWIP_TCP_WND_DEFAULT=65534
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
-CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n
-
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_LWIP_IRAM_OPTIMIZATION=y