From bfc334ba47cedef4aa768b3f58dffb3a9cdbe4af Mon Sep 17 00:00:00 2001 From: jitendracandela <78074038+jitendracandela@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:54:46 +0530 Subject: [PATCH] Wifi 13177 (#864) * Changed default value of testbed from basic-01 to basic-1 Signed-off-by: jitendracandela * Changed default value of testbed from basic-1 to basic-testbed Signed-off-by: jitendracandela * Fixd firmware version issue for upgrade_downgrade_test Signed-off-by: jitendracandela * Removed firmware version v2.0 for release latest and made generic for all firmware versions Signed-off-by: jitendracandela --------- Signed-off-by: jitendracandela --- libs/tip_2x/controller.py | 12 ++++++++---- libs/tip_2x/tip_2x.py | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/tip_2x/controller.py b/libs/tip_2x/controller.py index 4b16272de..e95058b75 100644 --- a/libs/tip_2x/controller.py +++ b/libs/tip_2x/controller.py @@ -1421,18 +1421,22 @@ class FMSUtils: release_images_all = [] least_3_release_images = [] for firmware in all_images_from_current_image: - if firmware['revision'].split("/")[1].replace(" ", "").split('-')[1].__contains__('v2.'): + if firmware['revision'].split("/")[1].replace(" ", "").split('-')[1][0] == "v": if "rc" not in firmware['image']: release_images_all.append(firmware) logging.info("release_images_all" + str(release_images_all)) latest_release_image_number = int(release_images_all[0]['image'].split(".")[1]) - latest_3_releases_list_num = [latest_release_image_number, latest_release_image_number - 1, - latest_release_image_number - 2] + logging.info("latest_release_image_number: " + str(latest_release_image_number)) + all_releases_num_list = [11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10] + index_latest_release = all_releases_num_list.index(latest_release_image_number) + latest_3_releases_list_num = [all_releases_num_list[index_latest_release], all_releases_num_list[index_latest_release+1], + all_releases_num_list[index_latest_release+2]] + logging.info("latest_3_releases_list_num: " + str(latest_3_releases_list_num)) count = 0 # Find out List of least 3 release Image # Logic for least 3 release Images for i in release_images_all: - if "v2." + str(latest_3_releases_list_num[count]) + "." in str(i['image']): + if "." + str(latest_3_releases_list_num[count]) + "." in str(i['image']): least_3_release_images.append(i) count = count + 1 if len(least_3_release_images) == 3: diff --git a/libs/tip_2x/tip_2x.py b/libs/tip_2x/tip_2x.py index 0a2091675..169d0c9e6 100644 --- a/libs/tip_2x/tip_2x.py +++ b/libs/tip_2x/tip_2x.py @@ -766,7 +766,7 @@ class tip_2x: temp = "-".join(temp) firmware['image'] = temp if self.device_under_tests_info[ap]['firmware_version'].split('-')[0] == 'release': - if firmware['revision'].split("/")[1].replace(" ", "").split('-')[1].__contains__('v2.'): + if firmware['revision'].split("/")[1].replace(" ", "").split('-')[1][0] == "v": logging.info("Target Firmware: \n" + str(firmware)) allure.attach(name="Target firmware : ", body=str(firmware)) target_revision = firmware['revision'].split("/")[1].replace(" ", "") @@ -934,7 +934,7 @@ class tip_2x: target_fw = "" for firmware in fw_list: if self.device_under_tests_info[ap]['firmware_version'].split('-')[0] == 'release': - if firmware['revision'].split("/")[1].replace(" ", "").split('-')[1].__contains__('v2.'): + if firmware['revision'].split("/")[1].replace(" ", "").split('-')[1][0] == "v": target_fw = firmware break if firmware['image'].split("-")[-2] == \