scottk/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2025-11-02 20:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wifi 7435 (#439)

Browse Source 
* removed dfs key and added radio config in rf

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

* removed dfs logic

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

* changed setup_params_general numbers

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
jitendracandela
2022-03-24 19:03:23 +05:30
committed by GitHub
parent 7a4c9724fd
commit a0746ba876
5 changed files with 205 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/controller/controller_2x/controller.py
View File

@@ -468,7 +468,7 @@ class UProfileUtility:
ssid_info.append(temp) ssid_info.append(temp)
return ssid_info return ssid_info
def set_radio_config(self, radio_config={}, DFS=False, channel=None, bw=None): def set_radio_config(self, radio_config={}):
base_radio_config_2g = { base_radio_config_2g = {
"band": "2G", "band": "2G",
"country": "CA", "country": "CA",
@@ -493,17 +493,9 @@ class UProfileUtility:
# for keys in radio_config[band]: # for keys in radio_config[band]:
# base_radio_config_6g[keys] = radio_config[band][keys] # base_radio_config_6g[keys] = radio_config[band][keys]
if DFS:
self.base_profile_config["radios"].append({ self.base_profile_config["radios"].append(base_radio_config_2g)
"band": "5G", self.base_profile_config["radios"].append(base_radio_config_5g)
"country": "CA",
"channel-mode": "VHT",
"channel-width": bw,
"channel": channel
})
else:
self.base_profile_config["radios"].append(base_radio_config_2g)
self.base_profile_config["radios"].append(base_radio_config_5g)
print(self.base_profile_config) print(self.base_profile_config)
self.vlan_section["ssids"] = [] self.vlan_section["ssids"] = []
self.vlan_ids = [] self.vlan_ids = []

180
tests/e2e/basic/dfs_test/wpa2_personal/dfs_20MHz/test_dfs_20_bridge.py
View File

@@ -13,11 +13,16 @@ setup_params_general1 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 52, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 52
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -38,7 +43,7 @@ class TestDFSChannel52Bw20(object):
profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general1["dfs"]["channel"] channel = setup_params_general1["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -87,11 +92,16 @@ setup_params_general2 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 100, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 100
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -112,7 +122,7 @@ class TestDFSChannel100Bw20(object):
profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general2["dfs"]["channel"] channel = setup_params_general2["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -161,11 +171,16 @@ setup_params_general3 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 104, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 104
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -186,7 +201,7 @@ class TestDFSChannel104Bw20(object):
profile_data = setup_params_general3["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general3["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general3["dfs"]["channel"] channel = setup_params_general3["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -235,11 +250,16 @@ setup_params_general4 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 56, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 56
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -260,7 +280,7 @@ class TestDFSChannel56Bw20(object):
profile_data = setup_params_general4["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general4["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general4["dfs"]["channel"] channel = setup_params_general4["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -309,11 +329,16 @@ setup_params_general5 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 60, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 60
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -334,7 +359,7 @@ class TestDFSChannel60Bw20(object):
profile_data = setup_params_general5["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general5["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general5["dfs"]["channel"] channel = setup_params_general5["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -383,11 +408,16 @@ setup_params_general6 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 64, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 64
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -408,7 +438,7 @@ class TestDFSChannel64Bw20(object):
profile_data = setup_params_general6["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general6["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general6["dfs"]["channel"] channel = setup_params_general6["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -457,11 +487,16 @@ setup_params_general7 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 108, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 108
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -482,7 +517,7 @@ class TestDFSChannel108Bw20(object):
profile_data = setup_params_general7["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general7["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general7["dfs"]["channel"] channel = setup_params_general7["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -531,11 +566,16 @@ setup_params_general8 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 112, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 112
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -556,7 +596,7 @@ class TestDFSChannel112Bw20(object):
profile_data = setup_params_general8["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general8["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general8["dfs"]["channel"] channel = setup_params_general8["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -679,11 +719,16 @@ setup_params_general10 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 132, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 132
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -704,7 +749,7 @@ class TestDFSChannel132Bw20(object):
profile_data = setup_params_general10["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general10["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general10["dfs"]["channel"] channel = setup_params_general10["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -753,11 +798,16 @@ setup_params_general11 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 136, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 136
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -778,7 +828,7 @@ class TestDFSChannel136Bw20(object):
profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general11["dfs"]["channel"] channel = setup_params_general11["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -827,11 +877,16 @@ setup_params_general12 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 140, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 140
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -852,7 +907,7 @@ class TestDFSChannel140Bw20(object):
profile_data = setup_params_general12["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general12["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general12["dfs"]["channel"] channel = setup_params_general12["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -901,11 +956,16 @@ setup_params_general13 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 144, "5G": {
"channel_bandwidth": 20 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 20,
"channel": 144
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -926,7 +986,7 @@ class TestDFSChannel144Bw20(object):
profile_data = setup_params_general13["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general13["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general13["dfs"]["channel"] channel = setup_params_general13["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"

76
tests/e2e/basic/dfs_test/wpa2_personal/dfs_40MHz/test_dfs_40_bridge.py
View File

@@ -13,11 +13,16 @@ setup_params_general1 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 52, "5G": {
"channel_bandwidth": 40 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 40,
"channel": 52
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -38,7 +43,7 @@ class TestDFSChannel52Bw40(object):
profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general1["dfs"]["channel"] channel = setup_params_general1["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -87,11 +92,16 @@ setup_params_general2 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 100, "5G": {
"channel_bandwidth": 40 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 40,
"channel": 100
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -112,7 +122,7 @@ class TestDFSChannel100Bw40(object):
profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general2["dfs"]["channel"] channel = setup_params_general2["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -309,11 +319,16 @@ setup_params_general5 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 60, "5G": {
"channel_bandwidth": 40 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 40,
"channel": 60
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -334,7 +349,7 @@ class TestDFSChannel60Bw40(object):
profile_data = setup_params_general5["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general5["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general5["dfs"]["channel"] channel = setup_params_general5["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -457,11 +472,16 @@ setup_params_general7 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 108, "5G": {
"channel_bandwidth": 40 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 40,
"channel": 108
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -482,7 +502,7 @@ class TestDFSChannel108Bw40(object):
profile_data = setup_params_general7["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general7["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general7["dfs"]["channel"] channel = setup_params_general7["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -753,11 +773,17 @@ setup_params_general11 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 132, "5G": {
"channel_bandwidth": 40 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 40,
"channel": 132
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -778,7 +804,7 @@ class TestDFSChannel132Bw40(object):
profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general11["dfs"]["channel"] channel = setup_params_general11["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"

45
tests/e2e/basic/dfs_test/wpa2_personal/dfs_80MHz/test_dfs_80_bridge.py
View File

@@ -13,11 +13,16 @@ setup_params_general1 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 52, "5G": {
"channel_bandwidth": 80 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 80,
"channel": 52
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -38,7 +43,7 @@ class TestDFSChannel52Bw80(object):
profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general1["dfs"]["channel"] channel = setup_params_general1["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -87,11 +92,16 @@ setup_params_general2 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 100, "5G": {
"channel_bandwidth": 80 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 80,
"channel": 100
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -112,7 +122,7 @@ class TestDFSChannel100Bw80(object):
profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general2["dfs"]["channel"] channel = setup_params_general2["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"
@@ -753,11 +763,16 @@ setup_params_general11 = {
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"} {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
] ]
}, },
"dfs": { "rf": {
"channel": 132, "5G": {
"channel_bandwidth": 80 "band": "5G",
"country": "CA",
"allow-dfs": True,
"channel-mode": "VHT",
"channel-width": 80,
"channel": 132
}
}, },
"rf": {},
"radius": False "radius": False
} }
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -778,7 +793,7 @@ class TestDFSChannel132Bw80(object):
profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0] profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"] ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"] security_key = profile_data["security_key"]
channel = setup_params_general11["dfs"]["channel"] channel = setup_params_general11["rf"]["5G"]["channel"]
security = "wpa2" security = "wpa2"
band = "fiveg" band = "fiveg"
mode = "BRIDGE" mode = "BRIDGE"

5
tests/fixtures_2x.py
View File

@@ -380,11 +380,6 @@ class Fixtures_2x:
test_cases = {} test_cases = {}
profile_data = {} profile_data = {}
var = "" var = ""
list_key = list(parameter.keys())
if "dfs" in list_key:
print("In dfs")
instantiate_profile_obj.set_radio_config(DFS=True, channel=parameter["dfs"]["channel"], bw=parameter["dfs"]["channel_bandwidth"])
if len(parameter['rf']) > 0: if len(parameter['rf']) > 0:
print("Country code channel division") print("Country code channel division")
instantiate_profile_obj.set_radio_config(radio_config=parameter['rf']) instantiate_profile_obj.set_radio_config(radio_config=parameter['rf'])