scottk/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2025-11-01 19:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wifi 13177 (#864)

Browse Source 
* Changed default value of testbed from basic-01 to basic-1

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

* Changed default value of testbed from basic-1 to basic-testbed

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

* Fixd firmware version issue for upgrade_downgrade_test

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

* Removed firmware version v2.0 for release latest and made generic for all firmware versions

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

---------

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
jitendracandela
2023-12-06 13:54:46 +05:30
committed by GitHub
parent 1f97d12881
commit e9b625df2a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/tip_2x/controller.py
View File

@@ -1421,18 +1421,22 @@ class FMSUtils:
release_images_all = [] release_images_all = []
least_3_release_images = [] least_3_release_images = []
for firmware in all_images_from_current_image: 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']: if "rc" not in firmware['image']:
release_images_all.append(firmware) release_images_all.append(firmware)
logging.info("release_images_all" + str(release_images_all)) logging.info("release_images_all" + str(release_images_all))
latest_release_image_number = int(release_images_all[0]['image'].split(".")[1]) 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, logging.info("latest_release_image_number: " + str(latest_release_image_number))
latest_release_image_number - 2] 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 count = 0
# Find out List of least 3 release Image # Find out List of least 3 release Image
# Logic for least 3 release Images # Logic for least 3 release Images
for i in release_images_all: 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) least_3_release_images.append(i)
count = count + 1 count = count + 1
if len(least_3_release_images) == 3: if len(least_3_release_images) == 3:

4
libs/tip_2x/tip_2x.py
View File

@@ -766,7 +766,7 @@ class tip_2x:
temp = "-".join(temp) temp = "-".join(temp)
firmware['image'] = temp firmware['image'] = temp
if self.device_under_tests_info[ap]['firmware_version'].split('-')[0] == 'release': 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)) logging.info("Target Firmware: \n" + str(firmware))
allure.attach(name="Target firmware : ", body=str(firmware)) allure.attach(name="Target firmware : ", body=str(firmware))
target_revision = firmware['revision'].split("/")[1].replace(" ", "") target_revision = firmware['revision'].split("/")[1].replace(" ", "")
@@ -934,7 +934,7 @@ class tip_2x:
target_fw = "" target_fw = ""
for firmware in fw_list: for firmware in fw_list:
if self.device_under_tests_info[ap]['firmware_version'].split('-')[0] == 'release': 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 target_fw = firmware
break break
if firmware['image'].split("-")[-2] == \ if firmware['image'].split("-")[-2] == \