Added 30 sec wait time after config push (#868)

* Added 30 sec wait time after config push

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Modified logic for config push validation

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Added json load for API response

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Changed auth-server ip

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Changed allow-dfs value to False

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Added 56Kbps upload rate for download test cases

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Added 56Kbps download rate for upload test cases

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Added twog band config in sixg test cases

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* testbed name fix for OAP101 performance tests

Signed-off-by: anil-tegala <anil.tegala@candelatech.com>

---------

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
Signed-off-by: anil-tegala <anil.tegala@candelatech.com>
Co-authored-by: anil-tegala <anil.tegala@candelatech.com>
This commit is contained in:
Jitendrakumar Kushavah
2024-01-18 11:42:01 +05:30
committed by GitHub
parent ce8f774894
commit 8874417374
12 changed files with 129 additions and 70 deletions

View File

@@ -18,7 +18,7 @@ setup_params_general = {
{"ssid_name": "ssid_captive_portal_wpa2_2g_br", "appliedRadios": ["2G"], "security_key": "something",
"captive": {
"auth-mode": "radius",
"auth-server": "10.28.3.43",
"auth-server": "10.28.3.21",
"auth-port": 1812,
"auth-secret": "testing123",
"walled-garden-fqdn": [
@@ -68,7 +68,7 @@ class TestBridgeModeadvancedcaptiveportal(object):
"security_key": "something",
"captive": {
"auth-mode": "radius",
"auth-server": "10.28.3.43",
"auth-server": "10.28.3.21",
"auth-port": 1812,
"auth-secret": "testing123",
"walled-garden-fqdn": [

View File

@@ -55,7 +55,7 @@ class TestWifiCapacityNATMode2G(object):
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000",
upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"2G": max_stations})
assert True
@@ -206,7 +206,7 @@ class TestWifiCapacityNATMode5G(object):
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000",
upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"5G": max_stations})
@@ -358,7 +358,7 @@ class TestWifiCapacityNATModeDual(object):
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000",
upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"2G": max_stations, "5G": max_stations})
assert True

View File

@@ -306,6 +306,7 @@ setup_params_general_6G = {
"mode": "BRIDGE",
"ssid_modes": {
"wpa3_personal": [
{"ssid_name": "ssid_wpa3_2g", "appliedRadios": ["2G"], "security_key": "something"},
{"ssid_name": "ssid_wpa3_6g", "appliedRadios": ["6G"], "security_key": "something"}
]
},
@@ -326,8 +327,7 @@ setup_params_general_6G = {
)
@pytest.mark.usefixtures("setup_configuration")
@pytest.mark.wpa3_personal
@pytest.mark.sixg
@pytest.mark.sixg_band
@pytest.mark.twog
@pytest.mark.performance
class TestWifiCapacityBRIDGEMode6G(object):
""" Client Scale Test BRIDGE mode
@@ -336,6 +336,7 @@ class TestWifiCapacityBRIDGEMode6G(object):
@pytest.mark.wpa3_personal
@pytest.mark.tcp_download
@pytest.mark.sixg
@allure.title("Test for TCP Download 6 GHz")
def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration, max_stations):
@@ -355,6 +356,7 @@ class TestWifiCapacityBRIDGEMode6G(object):
# @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3659", name="WIFI-3659")
@pytest.mark.wpa3_personal
@pytest.mark.udp_download
@pytest.mark.sixg
@allure.title("Test for UDP Download 6 GHz")
def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration, max_stations):
@@ -374,6 +376,7 @@ class TestWifiCapacityBRIDGEMode6G(object):
# @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3669", name="WIFI-3669")
@pytest.mark.wpa3_personal
@pytest.mark.tcp_bidirectional
@pytest.mark.sixg
@allure.title("Test for TCP Bidirectional 6 GHz")
def test_client_wpa3_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration,
@@ -394,6 +397,7 @@ class TestWifiCapacityBRIDGEMode6G(object):
# @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3663", name="WIFI-3663")
@pytest.mark.wpa3_personal
@pytest.mark.udp_bidirectional
@pytest.mark.sixg
@allure.title("Test for UDP Bidirectional 6 GHz")
def test_client_wpa3_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration,
@@ -413,6 +417,7 @@ class TestWifiCapacityBRIDGEMode6G(object):
@pytest.mark.wpa3_personal
@pytest.mark.tcp_upload
@pytest.mark.sixg
@allure.title("Test for TCP Upload 6 GHz")
def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration, max_stations):
@@ -431,6 +436,7 @@ class TestWifiCapacityBRIDGEMode6G(object):
@pytest.mark.wpa3_personal
@pytest.mark.udp_upload
@pytest.mark.sixg
@allure.title("Test for UDP Upload 6 GHz")
def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration, max_stations):

View File

@@ -95,6 +95,7 @@ class TestDataplaneThroughputBRIDGE(object):
)
@pytest.mark.wpa3_personal
@pytest.mark.twog
@pytest.mark.sixg
@pytest.mark.performance
@allure.title("Test for TCP UDP Download 6 GHz")

View File

@@ -95,6 +95,7 @@ class TestDataplaneThroughputNAT(object):
)
@pytest.mark.wpa3_personal
@pytest.mark.twog
@pytest.mark.sixg
@pytest.mark.performance
@allure.title("Test for TCP UDP Download 6 GHz")

View File

@@ -14,7 +14,10 @@ pytestmark = [pytest.mark.peak_throughput_tests, pytest.mark.bridge, pytest.mark
setup_params_general = {
"mode": "BRIDGE",
"ssid_modes": {
"wpa3_personal": [{"ssid_name": "ssid_wpa3_6g_channel_auto", "appliedRadios": ["6G"], "security_key": "something"}
"wpa3_personal": [
{"ssid_name": "ssid_wpa3_2g", "appliedRadios": ["2G"], "security_key": "something"},
{"ssid_name": "ssid_wpa3_6g_channel_auto", "appliedRadios": ["6G"], "security_key": "something"}
]},
"rf": {
"6G": {
@@ -37,13 +40,13 @@ setup_params_general = {
scope="class"
)
@pytest.mark.wpa3_personal
@pytest.mark.sixg
@pytest.mark.sixg_band
@pytest.mark.twog
@pytest.mark.performance
@pytest.mark.usefixtures("setup_configuration")
class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12394", name="WIFI-12394")
@pytest.mark.sixg
@pytest.mark.tcp_download
@allure.title("Single client TCP Download wifi capacity 160Mhz Bw")
def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
@@ -63,6 +66,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12395", name="WIFI-12395")
@pytest.mark.udp_download
@pytest.mark.sixg
@allure.title("Single client UDP Download wifi capacity 160Mhz Bw")
def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -81,6 +85,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12397", name="WIFI-12397")
@pytest.mark.tcp_bidirectional
@pytest.mark.sixg
@allure.title("Single client TCP Bidirectional wifi capacity 160Mhz Bw")
def test_client_wpa3_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -99,6 +104,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12396", name="WIFI-12396")
@pytest.mark.udp_bidirectional
@pytest.mark.sixg
@allure.title("Single client UDP Bidirectional wifi capacity 160Mhz Bw")
def test_client_wpa3_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -117,6 +123,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12393", name="WIFI-12393")
@pytest.mark.tcp_upload
@pytest.mark.sixg
@allure.title("Single client TCP Upload wifi capacity 160Mhz Bw")
def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -135,6 +142,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12392", name="WIFI-12392")
@pytest.mark.udp_upload
@pytest.mark.sixg
@allure.title("Single client UDP Upload wifi capacity 160Mhz Bw")
def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):

View File

@@ -1378,7 +1378,7 @@ class Test20Mhz2GChannel11PeakThroughput(object):
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_nat_tcp_bidirectional", mode=mode,
download_rate="1Gbps", batch_size="1",
upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000",
upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"2G": 1})
assert True
@@ -1453,7 +1453,7 @@ class Test20Mhz2GChannel11PeakThroughput(object):
ssid_name = profile_data["ssid_name"]
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_nat_tcp_ul", mode=mode,
download_rate="0Gbps", batch_size="1",
download_rate="56Kbps", batch_size="1",
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"2G": 1})
@@ -1472,7 +1472,7 @@ class Test20Mhz2GChannel11PeakThroughput(object):
ssid_name = profile_data["ssid_name"]
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_personal_nat_udp_ul", mode=mode,
download_rate="0Gbps", batch_size="1",
download_rate="56Kbps", batch_size="1",
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"2G": 1})

View File

@@ -58,7 +58,7 @@ class Test80Mhz5GChannel36PeakThroughput(object):
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_nat_tcp_bidirectional", mode=mode,
download_rate="1Gbps", batch_size="1",
upload_rate="0Gbps", protocol="TCP-IPv4", duration="60000",
upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"5G": 1})
assert True
@@ -133,7 +133,7 @@ class Test80Mhz5GChannel36PeakThroughput(object):
ssid_name = profile_data["ssid_name"]
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_nat_tcp_ul", mode=mode,
download_rate="0Gbps", batch_size="1",
download_rate="56Kbps", batch_size="1",
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"5G": 1})
@@ -152,7 +152,7 @@ class Test80Mhz5GChannel36PeakThroughput(object):
ssid_name = profile_data["ssid_name"]
mode = "NAT-WAN"
get_test_library.wifi_capacity(instance_name="test_client_wpa2_nat_udp_ul", mode=mode,
download_rate="0Gbps", batch_size="1",
download_rate="56Kbps", batch_size="1",
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000",
move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
num_stations={"5G": 1})

View File

@@ -15,6 +15,7 @@ setup_params_general = {
"mode": "NAT",
"ssid_modes": {
"wpa3_personal": [
{"ssid_name": "ssid_wpa3_2g", "appliedRadios": ["2G"], "security_key": "something"},
{"ssid_name": "ssid_wpa3_6g_channel_auto", "appliedRadios": ["6G"], "security_key": "something"}
]},
"rf": {
@@ -37,14 +38,14 @@ setup_params_general = {
scope="class"
)
@pytest.mark.wpa3_personal
@pytest.mark.sixg
@pytest.mark.sixg_band
@pytest.mark.twog
@pytest.mark.performance
@pytest.mark.usefixtures("setup_configuration")
class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12400", name="WIFI-12400")
@pytest.mark.tcp_download
@pytest.mark.sixg
@allure.title("Single client TCP Download wifi capacity 160Mhz Bw")
def test_client_wpa3_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -63,6 +64,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12401", name="WIFI-12401")
@pytest.mark.udp_download
@pytest.mark.sixg
@allure.title("Single client UDP Download wifi capacity 160Mhz Bw")
def test_client_wpa3_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -81,6 +83,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12403", name="WIFI-12403")
@pytest.mark.tcp_bidirectional
@pytest.mark.sixg
@allure.title("Single client TCP Bidirectional wifi capacity 160Mhz Bw")
def test_client_wpa3_nat_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -99,6 +102,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12402", name="WIFI-12402")
@pytest.mark.udp_bidirectional
@pytest.mark.sixg
@allure.title("Single client UDP Bidirectional wifi capacity 160Mhz Bw")
def test_client_wpa3_nat_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -117,6 +121,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12399", name="WIFI-12399")
@pytest.mark.tcp_upload
@pytest.mark.sixg
@allure.title("Single client TCP Upload wifi capacity 160Mhz Bw")
def test_client_wpa3_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):
@@ -135,6 +140,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12398", name="WIFI-12398")
@pytest.mark.udp_upload
@pytest.mark.sixg
@allure.title("Single client UDP Upload wifi capacity 160Mhz Bw")
def test_client_wpa3_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
get_test_device_logs, num_stations, setup_configuration):