From e64fa802faccc63d3bc97b0ff5d352f6d5bfed12 Mon Sep 17 00:00:00 2001 From: Satellite QE <115476073+Satellite-QE@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:11:59 -0400 Subject: [PATCH] [6.16.z] Fetch pre_upgrade data based on node properties (#16550) Fetch pre_upgrade data based on node properties (#16423) * Fetch pre_upgrade data regardless the ipvX suffix * Fetch pre_upgrade data based on node properties * Fetch pre_upgrade data based on settings (cherry picked from commit 65d7c33465f2f7ff3bb05cbeda2b77d8f146bdd0) Co-authored-by: vsedmik <46570670+vsedmik@users.noreply.github.com> --- tests/upgrades/conftest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/upgrades/conftest.py b/tests/upgrades/conftest.py index afa8c8eb21c..03f1b41e3fb 100644 --- a/tests/upgrades/conftest.py +++ b/tests/upgrades/conftest.py @@ -90,6 +90,7 @@ def test_capsule_post_upgrade_skipped(pre_upgrade_data): from box import Box import pytest +from robottelo.config import settings from robottelo.logging import logger from robottelo.utils.decorators.func_locker import lock_function @@ -260,11 +261,13 @@ def test_something_post_upgrade(pre_upgrade_data): start_index = test_node_id.find('[') + 1 end_index = test_node_id.find(']') extracted_value = test_node_id[start_index:end_index] - upgrade_data[extracted_value] = _read_test_data(test_node_id) + if request.param in extracted_value: + upgrade_data[extracted_value] = _read_test_data(test_node_id) if len(upgrade_data) == 1: param_value = next(iter(upgrade_data.values())) else: - param_value = upgrade_data.get(request.param) + network_type = 'ipv6' if settings.server.is_ipv6 else 'ipv4' + param_value = upgrade_data.get(f'{request.param}-{network_type}') if param_value is None: pytest.fail(f"Invalid test parameter: {request.param}. Test data not found.") return Box(param_value)