Merge "Remove unnecessary check for pytest.skip"

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

diff --git a/ice_validator/tests/test_ip_parameters_start_at_0.py b/ice_validator/tests/test_ip_parameters_start_at_0.py
index e16c161..c295d69 100644 (file)
--- a/ice_validator/tests/test_ip_parameters_start_at_0.py
+++ b/ice_validator/tests/test_ip_parameters_start_at_0.py
@@ -38,13 +38,27 @@ import re
 
 from tests.helpers import validates, check_indices
 from tests.structures import Heat
+from tests.utils import nested_dict
 
 
 IP_PARAM_PATTERN = re.compile(r"^(.*_ip_)(\d+)$")
 
 
 @validates("R-71577", "R-40971")
-def test_ips_start_at_0(heat_template):
-    params = Heat(heat_template).parameters
-    invalid_params = check_indices(IP_PARAM_PATTERN, params, "IP Parameters")
+def test_ips_start_at_0(yaml_file):
+    heat = Heat(filepath=yaml_file)
+    ports = heat.get_resource_by_type("OS::Neutron::Port")
+    ip_parameters = []
+
+    for rid, resource in ports.items():
+        fips = nested_dict.get(resource, "properties", "fixed_ips", default={})
+        for fip in fips:
+            ip_address = fip.get("ip_address", {})
+            param = ip_address.get("get_param")
+            if isinstance(param, list):
+                param = param[0]
+            if isinstance(param, str):
+                ip_parameters.append(param)
+
+    invalid_params = check_indices(IP_PARAM_PATTERN, ip_parameters, "IP Parameters")
     assert not invalid_params, ". ".join(invalid_params)