Merge "[VVP] Support pluggable data sources for preload data"

[vvp/validation-scripts.git] / ice_validator / tests / test_neutron_port_fixed_ips_subnet.py

diff --git a/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py b/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py
index 8c15711..a6c9f91 100644 (file)
--- a/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py
+++ b/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py
@@ -38,12 +38,11 @@
 #
 import re
 
-import pytest
 
 from tests.utils.network_roles import get_network_type_from_port
 
 from tests.structures import Heat
-from tests.helpers import validates, load_yaml, get_base_template_from_yaml_files
+from tests.helpers import validates, load_yaml, get_base_template_from_yaml_files, get_param
 from tests.utils.nested_files import get_nested_files
 from .utils.ports import check_parameter_format
 from tests.structures import NeutronPortProcessor
@@ -100,8 +99,6 @@ def test_external_subnet_format(yaml_file):
 @validates("R-84123", "R-76160")
 def test_neutron_port_internal_fixed_ips_subnet_in_base(yaml_files):
     base_path = get_base_template_from_yaml_files(yaml_files)
-    if not base_path:
-        pytest.skip("No base module detected")
     base_heat = load_yaml(base_path)
     base_outputs = base_heat.get("outputs") or {}
     nested_template_paths = get_nested_files(yaml_files)
@@ -128,7 +125,7 @@ def test_neutron_port_internal_fixed_ips_subnet_in_base(yaml_files):
 
                 if "get_param" not in subnet:
                     continue
-                param = subnet.get("get_param")
+                param = get_param(subnet)
                 if param not in base_outputs:
                     errors.append(
                         (