Removed unwanted code and Modified as per new framework

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

tests/e2e/basic/dfs_test/wpa2_personal/dfs_80MHz/test_dfs_80_bridge.py

@@ -31,70 +31,34 @@ setup_params_general1 = {
 
 
 @pytest.mark.parametrize(
-    'setup_profiles',
+    'setup_configuration',
     [setup_params_general1],
     indirect=True,
     scope="class"
 )
-@pytest.mark.usefixtures("setup_profiles")
+@pytest.mark.usefixtures("setup_configuration")
+@allure.parent_suite("OpenWifi DFS Test")
+@allure.suite("BRIDGE Mode(80 MHz)")
+@allure.sub_suite("Channel-52")
 class TestDFSChannel52Bw80(object):
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6376", name="WIFI-6376")
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.dfs_channel_52_bw_80
-    def test_dfs_channel_52_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-        lf_tools.reset_scenario()
+    @allure.title("Test for Channel 52 and bandwidth 80")
+    def test_dfs_channel_52_bw_80(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs,
+                                  num_stations, setup_configuration, get_target_object):
         profile_data = setup_params_general1["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        channel = setup_params_general1["rf"]["5G"]["channel"]
         security = "wpa2"
         band = "fiveg"
         mode = "BRIDGE"
-        vlan = 1
-        dfs_fail = True
-        print("station_names_fiveg :", station_names_fiveg)
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-        channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-        print("channel before dfs: ", channel1)
-        if channel1 == str(channel):
-            dfs_start.dfs()
-            time.sleep(15)
-        else:
-            print("Station not connected to applied channel")
-            allure.attach(name="log Data", body="Station not connected to applied channel")
-            assert False
-        channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-        log = dfs_start.dfs_logread()
-        if channel1 != channel2:
-            print(log)
-            print("channel after dfs: ", channel2)
-            allure.attach(name="log Data", body=log)
-        else:
-            print(log)
-            print("dfs not happened")
-            allure.attach(name="log Data", body=log)
-            dfs_fail = False
-        dfs_start.reboot()
+        get_test_library.dfs_test(ssid=ssid_name, security=security,
+                                  passkey=security_key, mode=mode, band=band,
+                                  num_sta=1, dut_data=setup_configuration, tip_2x_obj=get_target_object)
+        get_target_object.reboot()
         time.sleep(200)
-        count = 0
-        while True:
-            connected, latest, active = dfs_start.get_ucentral_status()
-            if connected is True:
-                print("status is connected after reboot: ", connected)
-                break
-            else:
-                count = count + 1
-                if count > 5:
-                    break
-            time.sleep(5)
-        if count > 5:
-            assert False, "AP is disconnected"
-        if not dfs_fail:
-            assert False
 
 
 setup_params_general2 = {
@@ -119,664 +83,37 @@ setup_params_general2 = {
 
 
 @pytest.mark.parametrize(
-    'setup_profiles',
+    'setup_configuration',
     [setup_params_general2],
     indirect=True,
     scope="class"
 )
-@pytest.mark.usefixtures("setup_profiles")
+@pytest.mark.usefixtures("setup_configuration")
+@pytest.mark.usefixtures("setup_configuration")
+@allure.parent_suite("OpenWifi DFS Test")
+@allure.suite("BRIDGE Mode(80 MHz)")
+@allure.sub_suite("Channel-100")
 class TestDFSChannel100Bw80(object):
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6311", name="WIFI-6311")
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.dfs_channel_100_bw_80
-    def test_dfs_channel_100_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-        lf_tools.reset_scenario()
+    @allure.title("Test for Channel 100 and bandwidth 80")
+    def test_dfs_channel_100_bw_80(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs,
+                                   num_stations, setup_configuration, get_target_object):
         profile_data = setup_params_general2["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        channel = setup_params_general2["rf"]["5G"]["channel"]
         security = "wpa2"
         band = "fiveg"
         mode = "BRIDGE"
-        vlan = 1
-        dfs_fail = True
-        print("station_names_fiveg :", station_names_fiveg)
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-        channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-        print("channel before dfs: ", channel1)
-        if channel1 == str(channel):
-            dfs_start.dfs()
-            time.sleep(15)
-        else:
-            print("Station not connected to applied channel")
-            allure.attach(name="log Data", body="Station not connected to applied channel")
-            assert False
-        channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-        log = dfs_start.dfs_logread()
-        if channel1 != channel2:
-            print(log)
-            print("channel after dfs: ", channel2)
-            allure.attach(name="log Data", body=log)
-        else:
-            print(log)
-            print("dfs not happened")
-            allure.attach(name="log Data", body=log)
-            dfs_fail = False
-        dfs_start.reboot()
+        get_test_library.dfs_test(ssid=ssid_name, security=security,
+                                  passkey=security_key, mode=mode, band=band,
+                                  num_sta=1, dut_data=setup_configuration, tip_2x_obj=get_target_object)
+        get_target_object.reboot()
         time.sleep(200)
-        count = 0
-        while True:
-            connected, latest, active = dfs_start.get_ucentral_status()
-            if connected is True:
-                print("status is connected after reboot: ", connected)
-                break
-            else:
-                count = count + 1
-                if count > 5:
-                    break
-            time.sleep(5)
-        if count > 5:
-            assert False, "AP is disconnected"
-        if not dfs_fail:
-            assert False
 
 
-# setup_params_general3 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 104,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general3],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel104Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6313", name="WIFI-6313")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_104_bw_80
-#     def test_dfs_channel_104_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general3["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general3["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general4 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 56,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general4],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel56Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6377", name="WIFI-6377")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_56_bw_80
-#     def test_dfs_channel_56_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general4["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general4["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general5 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 60,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general5],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel60Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6378", name="WIFI-6378")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_60_bw_80
-#     def test_dfs_channel_60_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general5["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general5["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general6 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 64,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general6],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel64Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6379", name="WIFI-6379")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_64_bw_80
-#     def test_dfs_channel_64_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general6["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general6["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general7 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 108,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general7],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel108Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6380", name="WIFI-6380")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_108_bw_80
-#     def test_dfs_channel_108_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general7["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general7["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general8 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 120,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general8],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel120Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6381", name="WIFI-6381")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_120_bw_80
-#     def test_dfs_channel_120_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general8["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general8["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general9 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 124,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general9],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel124Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6382", name="WIFI-6382")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_124_bw_80
-#     def test_dfs_channel_124_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general9["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general9["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-# 
-# setup_params_general10 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 128,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general10],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-# 
-# class TestDFSChannel128Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6383", name="WIFI-6383")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_128_bw_80
-#     def test_dfs_channel_128_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general10["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general10["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-
 setup_params_general11 = {
     "mode": "BRIDGE",
     "ssid_modes": {
@@ -799,215 +136,32 @@ setup_params_general11 = {
 
 
 @pytest.mark.parametrize(
-    'setup_profiles',
+    'setup_configuration',
     [setup_params_general11],
     indirect=True,
     scope="class"
 )
-@pytest.mark.usefixtures("setup_profiles")
+@pytest.mark.usefixtures("setup_configuration")
+@pytest.mark.usefixtures("setup_configuration")
+@allure.parent_suite("OpenWifi DFS Test")
+@allure.suite("BRIDGE Mode(80 MHz)")
+@allure.sub_suite("Channel-132")
 class TestDFSChannel132Bw80(object):
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6384", name="WIFI-6384")
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.dfs_channel_132_bw_80
-    def test_dfs_channel_132_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-        lf_tools.reset_scenario()
+    @allure.title("Test for Channel 132 and bandwidth 80")
+    def test_dfs_channel_132_bw_80(self, get_test_library, get_dut_logs_per_test_case, get_test_device_logs,
+                                   num_stations, setup_configuration, get_target_object):
         profile_data = setup_params_general11["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        channel = setup_params_general11["rf"]["5G"]["channel"]
         security = "wpa2"
         band = "fiveg"
         mode = "BRIDGE"
-        vlan = 1
-        dfs_fail = True
-        print("station_names_fiveg :", station_names_fiveg)
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-        channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-        print("channel before dfs: ", channel1)
-        if channel1 == str(channel):
-            dfs_start.dfs()
-            time.sleep(15)
-        else:
-            print("Station not connected to applied channel")
-            allure.attach(name="log Data", body="Station not connected to applied channel")
-            assert False
-        channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-        log = dfs_start.dfs_logread()
-        if channel1 != channel2:
-            print(log)
-            print("channel after dfs: ", channel2)
-            allure.attach(name="log Data", body=log)
-        else:
-            print(log)
-            print("dfs not happened")
-            allure.attach(name="log Data", body=log)
-            dfs_fail = False
-        dfs_start.reboot()
+        get_test_library.dfs_test(ssid=ssid_name, security=security,
+                                  passkey=security_key, mode=mode, band=band,
+                                  num_sta=1, dut_data=setup_configuration, tip_2x_obj=get_target_object)
+        get_target_object.reboot()
         time.sleep(200)
-        count = 0
-        while True:
-            connected, latest, active = dfs_start.get_ucentral_status()
-            if connected is True:
-                print("status is connected after reboot: ", connected)
-                break
-            else:
-                count = count + 1
-                if count > 5:
-                    break
-            time.sleep(5)
-        if count > 5:
-            assert False, "AP is disconnected"
-        if not dfs_fail:
-            assert False
-
-# setup_params_general12 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 140,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general12],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-#
-# class TestDFSChannel140Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6385", name="WIFI-6385")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_140_bw_80
-#     def test_dfs_channel_140_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general12["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general12["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False
-#
-# setup_params_general13 = {
-#     "mode": "BRIDGE",
-#     "ssid_modes": {
-#         "wpa2_personal": [
-#             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}
-#         ]
-#     },
-#     "dfs": {
-#         "channel": 144,
-#         "channel_bandwidth": 80
-#     },
-#     "rf": {},
-#     "radius": False
-# }
-# @pytest.mark.parametrize(
-#     'setup_profiles',
-#     [setup_params_general13],
-#     indirect=True,
-#     scope="class"
-# )
-# @pytest.mark.usefixtures("setup_profiles")
-#
-# class TestDFSChannel144Bw80(object):
-#     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6386", name="WIFI-6386")
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     @pytest.mark.dfs_channel_144_bw_80
-#     def test_dfs_channel_144_bw_80(self, lf_test, lf_tools, station_names_fiveg, dfs_start):
-#         lf_tools.reset_scenario()
-#         profile_data = setup_params_general13["ssid_modes"]["wpa2_personal"][0]
-#         ssid_name = profile_data["ssid_name"]
-#         security_key = profile_data["security_key"]
-#         channel = setup_params_general13["dfs"]["channel"]
-#         security = "wpa2"
-#         band = "fiveg"
-#         mode = "BRIDGE"
-#         vlan = 1
-#         dfs_fail = True
-#         print("station_names_fiveg :", station_names_fiveg)
-#         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-#                                          passkey=security_key, mode=mode, band=band,
-#                                          station_name=station_names_fiveg, vlan_id=vlan)
-#         print("station", station)
-#         channel1 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         print("channel before dfs: ", channel1)
-#         if channel1 == str(channel):
-#             dfs_start.dfs()
-#             time.sleep(15)
-#         else:
-#             print("Station not connected to applied channel")
-#             allure.attach(name="log Data", body="Station not connected to applied channel")
-#             assert False
-#         channel2 = lf_tools.station_data_query(station_name=station_names_fiveg[0], query="channel")
-#         log = dfs_start.dfs_logread()
-#         if channel1 != channel2:
-#             print(log)
-#             print("channel after dfs: ", channel2)
-#             allure.attach(name="log Data", body=log)
-#         else:
-#             print(log)
-#             print("dfs not happened")
-#             allure.attach(name="log Data", body=log)
-#             dfs_fail = False
-#         dfs_start.reboot()
-#         time.sleep(200)
-#         while True:
-#             connected, latest, active = dfs_start.get_ucentral_status()
-#             if connected is True:
-#                 print("status is connected after reboot: ", connected)
-#                 break
-#             time.sleep(1)
-#         if not dfs_fail:
-#             assert False