From 4cf93b60ca1a978110a1756ce196f6e084f376dc Mon Sep 17 00:00:00 2001 From: bhargavi-ct Date: Thu, 23 Oct 2025 13:07:44 +0530 Subject: [PATCH] Update roam tests to mention AP model in the allure report Signed-off-by: bhargavi-ct --- .../OTA/test_roam_ota_wpa2_enterprise.py | 18 ++++++---- .../OTA/test_roam_ota_wpa2_personal.py | 15 +++++--- .../OTA/test_roam_ota_wpa3_enterprise.py | 36 ++++++++++++------- .../OTA/test_roam_ota_wpa3_personal.py | 18 ++++++---- .../OTD/test_roam_otd_wpa2_enterprise.py | 18 ++++++---- .../OTD/test_roam_otd_wpa2_personal.py | 15 +++++--- .../OTD/test_roam_otd_wpa3_enterprise.py | 30 ++++++++++------ .../OTD/test_roam_otd_wpa3_personal.py | 15 +++++--- 8 files changed, 110 insertions(+), 55 deletions(-) diff --git a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_enterprise.py b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_enterprise.py index 8fefed16c..d2b14e641 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_enterprise.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_enterprise.py @@ -85,6 +85,7 @@ class TestRoamOTA(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -94,7 +95,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -229,6 +230,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -238,7 +240,7 @@ class TestRoamOTA(object): "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 AP{ap+1}: {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -376,6 +378,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -389,7 +392,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -528,6 +531,7 @@ class TestRoamOTA(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -537,7 +541,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -674,6 +678,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -683,7 +688,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}: {serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -822,6 +827,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -835,7 +841,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_personal.py b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_personal.py index 0b7af8e84..d1ec12fd2 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_personal.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa2_personal.py @@ -64,6 +64,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -73,7 +74,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -189,6 +190,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -201,7 +203,7 @@ class TestRoamOTA(object): "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" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -316,6 +318,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -325,7 +328,7 @@ class TestRoamOTA(object): "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" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -440,6 +443,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -452,7 +456,7 @@ class TestRoamOTA(object): "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" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -569,6 +573,7 @@ class TestRoamOTA(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['interfaces'][0]["ssids"][0]["wifi-bands"] = ["2G"] @@ -582,7 +587,7 @@ class TestRoamOTA(object): "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" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_enterprise.py b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_enterprise.py index 526a2abe3..719533939 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_enterprise.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_enterprise.py @@ -84,6 +84,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} uri = get_target_object.controller_library_object.build_uri( @@ -92,7 +93,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -230,6 +231,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} uri = get_target_object.controller_library_object.build_uri( @@ -238,7 +240,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1} : {ap_model} {serial_number}:", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -393,6 +395,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") channel_mode = "EHT" if "wifi7" in ap_mode else "HE" @@ -408,7 +411,7 @@ class TestRoamOTA(object): "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 AP{ap+1}: {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -547,6 +550,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] if ap == 1: config['radios'] = [ {"band": "2G", "channel": 11, "channel-mode": "HE", "channel-width": 20, "country": "CA"}] @@ -559,7 +563,7 @@ class TestRoamOTA(object): "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 onAP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -718,6 +722,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -733,7 +738,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -894,6 +899,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -909,7 +915,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -1047,6 +1053,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} uri = get_target_object.controller_library_object.build_uri( @@ -1055,7 +1062,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1194,6 +1201,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} uri = get_target_object.controller_library_object.build_uri( @@ -1202,7 +1210,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1358,6 +1366,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") channel_mode = "EHT" if "wifi7" in ap_mode else "HE" @@ -1373,7 +1382,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}: {serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1514,6 +1523,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] if ap == 1: config['radios'] = [ {"band": "2G", "channel": 11, "channel-mode": "HE", "channel-width": 20, "country": "CA"}] @@ -1526,7 +1536,7 @@ class TestRoamOTA(object): "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 onAP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config onAP{ap + 1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1686,6 +1696,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -1701,7 +1712,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1863,6 +1874,7 @@ class TestRoamOTA(object): 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']) + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -1878,7 +1890,7 @@ class TestRoamOTA(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1} : {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_personal.py b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_personal.py index 916db8855..31fb507ee 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_personal.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTA/test_roam_ota_wpa3_personal.py @@ -68,6 +68,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -77,7 +78,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -195,6 +196,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -204,7 +206,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -334,6 +336,7 @@ class TestRoamOTA(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -350,7 +353,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -467,6 +470,7 @@ class TestRoamOTA(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -480,7 +484,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -616,6 +620,7 @@ class TestRoamOTA(object): config['interfaces'][0]["ssids"][0]["encryption"]["proto"] = "sae" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] @@ -632,7 +637,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -765,6 +770,7 @@ class TestRoamOTA(object): config['interfaces'][0]["ssids"][0]["encryption"]["proto"] = "sae" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] @@ -781,7 +787,7 @@ class TestRoamOTA(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_enterprise.py b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_enterprise.py index 6b7058fe2..e7486bc11 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_enterprise.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_enterprise.py @@ -82,6 +82,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -91,7 +92,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -224,6 +225,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -233,7 +235,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -372,6 +374,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -385,7 +388,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -520,6 +523,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -529,7 +533,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -663,6 +667,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -672,7 +677,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -811,6 +816,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -824,7 +830,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_personal.py b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_personal.py index c3b7ab2fb..8c4de975f 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_personal.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa2_personal.py @@ -65,6 +65,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -74,7 +75,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -189,6 +190,7 @@ class TestRoamOTD(object): 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'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -201,7 +203,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -315,6 +317,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -324,7 +327,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -440,6 +443,7 @@ class TestRoamOTD(object): config['interfaces'][0]["ssids"][0]["wifi-bands"] = ["5G"] for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -452,7 +456,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -569,6 +573,7 @@ class TestRoamOTD(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['interfaces'][0]["ssids"][0]["wifi-bands"] = ["2G"] @@ -582,7 +587,7 @@ class TestRoamOTD(object): "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" + + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_enterprise.py b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_enterprise.py index 242ee033d..ba46aedce 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_enterprise.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_enterprise.py @@ -83,6 +83,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -92,7 +93,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -227,6 +228,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -236,7 +238,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -387,6 +389,7 @@ class TestRoamOTD(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -403,7 +406,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}: {serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -543,6 +546,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -556,7 +560,7 @@ class TestRoamOTD(object): "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 onAP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config onAP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -715,6 +719,7 @@ class TestRoamOTD(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] @@ -731,7 +736,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -872,6 +877,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -881,7 +887,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1017,6 +1023,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -1026,7 +1033,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1179,6 +1186,7 @@ class TestRoamOTD(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -1195,7 +1203,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}: {serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1335,6 +1343,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -1348,7 +1357,7 @@ class TestRoamOTD(object): "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 onAP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config onAP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -1507,6 +1516,7 @@ class TestRoamOTD(object): for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] @@ -1523,7 +1533,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + diff --git a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_personal.py b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_personal.py index 691870b70..181b88fd5 100644 --- a/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_personal.py +++ b/tests/e2e/basic/roam_test/hard_roam/OTD/test_roam_otd_wpa3_personal.py @@ -68,6 +68,7 @@ class TestRoamOTD(object): config['interfaces'][0]["ssids"][0]["encryption"]["proto"] = "sae" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -77,7 +78,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -196,6 +197,7 @@ class TestRoamOTD(object): config['interfaces'][0]["ssids"][0]["encryption"]["proto"] = "sae" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) logging.info(f"config:{config}") payload = {"configuration": json.dumps(config), "serialNumber": serial_number, "UUID": 2} @@ -205,7 +207,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -337,6 +339,7 @@ class TestRoamOTD(object): # change wifi-band and security type to sae for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] logging.info(f"ap_mode:{ap_mode}") @@ -354,7 +357,7 @@ class TestRoamOTD(object): "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 AP{ap+1}:{serial_number}: ", body="Sending Command: " + str(uri) + "\n" + + allure.attach(name=f"Push roam config on AP{ap+1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + "Data: " + str(payload) + "\n" + @@ -470,6 +473,7 @@ class TestRoamOTD(object): assert False, f"This test need two AP's but number of DUT's available in the selected testbed is {dut_list}" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: config['radios'] = [ @@ -483,7 +487,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" + @@ -618,6 +622,7 @@ class TestRoamOTD(object): config['interfaces'][0]["ssids"][0]["encryption"]["proto"] = "sae" for ap in range(len(dut_list)): serial_number = testbed_info[dut_list[ap]]["device_under_tests"][0]['identifier'] + ap_model = testbed_info[dut_list[ap]]["device_under_tests"][0]['model'] dut_names.append(testbed_info[dut_list[ap]]["device_under_tests"][0]['model']) if ap == 1: ap_mode = testbed_info[dut_list[ap]]["device_under_tests"][0]['mode'] @@ -634,7 +639,7 @@ class TestRoamOTD(object): "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 AP{ap + 1}:{serial_number}: ", + allure.attach(name=f"Push roam config on AP{ap + 1}: {ap_model} {serial_number}: ", body="Sending Command: " + str(uri) + "\n" + "TimeStamp: " + str( datetime.datetime.utcnow()) + "\n" +