add roam over the ds on different channel twog test (#930)

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

tests/e2e/advanced/roam_test/hard_roam/OTD/test_roam_otd.py

@@ -30,10 +30,10 @@ class TestRoamOTD(object):
     @pytest.mark.twog
     @pytest.mark.roam
     @pytest.mark.otd
-    def test_roam_2g_to_2g_sc_wpa2_psk(self, get_target_object, get_test_library, get_lab_info, selected_testbed):
+    def test_roam_2g_to_2g_wpa2_psk_sc(self, get_target_object, get_test_library, get_lab_info, selected_testbed):
         """
             Test Roaming between two APs, Same channel, 2G, WPA2 Personal
-            pytest -m "roam and twog and same_channel and wpa2_personal"
+            pytest -m "roam and twog and same_channel and wpa2_personal and otd"
         """
         ap_data = dict()
         dut_list = [str(selected_testbed)]
@@ -143,3 +143,125 @@ class TestRoamOTD(object):
             pytest.fail(f"Test failed with the following reasons: \n{message}")
         else:
             assert True
+
+    @pytest.mark.roam
+    @pytest.mark.twog
+    @pytest.mark.otd
+    @pytest.mark.wpa2_personal
+    @pytest.mark.different_channel
+    def test_roam_2g_to_2g_wpa2_psk_dc(self, get_target_object, get_test_library, get_lab_info, selected_testbed):
+        """
+            Test Roaming between two APs, Different channel, 2G, WPA2 Personal
+            pytest -m "roam and twog and different_channel and wpa2_personal and otd"
+        """
+        ap_data = dict()
+        dut_list = [str(selected_testbed)]
+        dut_names = list()
+        bssid_list = list()
+        freqs_ = ""
+        testbed_info = get_lab_info.CONFIGURATION
+        config = copy.deepcopy(config_data)
+        temp_list = list()
+        for key, val in testbed_info.items():
+            tb_type, tb_name = selected_testbed.split("-")
+            if tb_type in key and tb_name[0] in key:
+                temp_list.append(key)
+        temp_list.sort()
+        logging.info(f"---DUT's connected to {selected_testbed}: {temp_list}---")
+        if len(temp_list) < 2:
+            logging.error(
+                f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}")
+            assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}"
+        dut_list = [temp_list[idx] for idx in range(len(temp_list)) if idx <= 1]
+        config['radios'] = [
+            {"band": "2G", "channel": 11, "channel-mode": "HE", "channel-width": 40, "country": "CA"}]
+        config['interfaces'][0]["ssids"][0]["wifi-bands"] = ["2G"]
+        for ap in range(len(dut_list)):
+            serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier']
+            dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model'])
+            if ap == 1:
+                config['radios'] = [
+                    {"band": "2G", "channel": 1, "channel-mode": "HE", "channel-width": 20, "country": "CA"}]
+            logging.info(config)
+            payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2}
+            uri = get_target_object.controller_library_object.build_uri(
+                "device/" + serial_number + "/configure")
+            logging.info("Sending Command: " + "\n" + str(uri) + "\n" +
+                         "TimeStamp: " + str(datetime.datetime.utcnow()) + "\n" +
+                         "Data: " + str(json.dumps(payload, indent=2)) + "\n" +
+                         "Headers: " + str(get_target_object.controller_library_object.make_headers()))
+            allure.attach(name=f"Push roam config on {serial_number}: ", body="Sending Command: " + str(uri) + "\n" +
+                                                                              "TimeStamp: " + str(
+                datetime.datetime.utcnow()) + "\n" +
+                                                                              "Data: " + str(payload) + "\n" +
+                                                                              "Headers: " + str(
+                get_target_object.controller_library_object.make_headers()))
+            resp = requests.post(uri, data=json.dumps(payload, indent=2),
+                                 headers=get_target_object.controller_library_object.make_headers(),
+                                 verify=False, timeout=120)
+            time.sleep(10)
+            logging.info(resp.json())
+            allure.attach(name=f"Response - {resp.status_code} {resp.reason}", body=str(resp.json()))
+            if resp.status_code != 200:
+                if resp.status_code == 400 and "Device is already executing a command. Please try later." in \
+                        resp.json()["ErrorDescription"]:
+                    time.sleep(30)
+                    resp = requests.post(uri, data=json.dumps(payload, indent=2),
+                                         headers=get_target_object.controller_library_object.make_headers(),
+                                         verify=False, timeout=120)
+                    time.sleep(10)
+                    logging.info(resp.json())
+                else:
+                    assert False, f"push configuration to {serial_number} got failed"
+            get_target_object.dut_library_object.device_under_tests_data = testbed_info[dut_list[ap]][
+                "device_under_tests"]
+            ap_iwinfo = get_target_object.dut_library_object.get_iwinfo(attach_allure=True)
+            if str(ap_iwinfo) != "Error: pop from empty list":
+                include_essid = config['interfaces'][0]["ssids"][0]["name"]
+                re_obj = re.compile(
+                    rf'(wlan\d(?:-\d)?)\s+ESSID: "{re.escape(include_essid)}".*?\s+Access Point:\s+([0-9A-Fa-f:]+).*?Channel:\s+('
+                    r'\d+)\s+\(([\d.]+) GHz\)',
+                    re.DOTALL
+                )
+                # find all matches
+                interface_matches = re_obj.finditer(ap_iwinfo)
+                if interface_matches:
+                    for match in interface_matches:
+                        interface_name = match.group(1)
+                        access_point = match.group(2)
+                        channel = match.group(3)
+                        frequency = match.group(4).replace('.', '')
+                        ap_data.update(
+                            {serial_number: {'Access Point': access_point, 'Channel': channel, 'frequency': frequency}})
+                    logging.info(f"AP Data from iwinfo: {ap_data}")
+                else:
+                    logging.error("Failed to get iwinfo")
+                    pytest.exit("Failed to get iwinfo")
+            elif ap_iwinfo == {}:
+                pytest.fail("Empty iwinfo reponse from AP through minicom")
+            else:
+                pytest.fail("Failed to get iwinfo from minicom")
+        for serial in ap_data:
+            bssid_list.append(ap_data[serial]['Access Point'])
+            if not ap_data[serial]['frequency'].endswith(","):
+                freqs_ = freqs_ + ap_data[serial]['frequency'] + ","
+            else:
+                freqs_ = freqs_ + ap_data[serial]['frequency']
+        ssid = config['interfaces'][0]["ssids"][0]["name"]
+        key = config['interfaces'][0]["ssids"][0]["encryption"]["key"]
+        try:
+            pass_fail, message = get_test_library.roam_test(ap1_bssid=bssid_list[0], ap2_bssid=bssid_list[1],
+                                                            scan_freq=freqs_,
+                                                            band="twog", num_sta=1, security="wpa2", security_key=key,
+                                                            ssid=ssid, upstream="1.1.eth1", duration=None,
+                                                            iteration=1, channel="1", option="otd", dut_name=dut_names,
+                                                            traffic_type="lf_udp", sta_type="11r")
+        except Exception as e:
+            logging.error(f"Exception in roam test : {e}")
+            pass_fail, message = False, e
+        finally:
+            get_target_object.dut_library_object.get_dut_logs(print_log=False)
+        if not pass_fail:
+            pytest.fail(f"Test failed with the following reasons: \n{message}")
+        else:
+            assert True