From 655f39713cca2595a812ccd60cc738301aef8b2f Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Mon, 23 Apr 2018 08:49:34 -0700 Subject: [VVP] add bug fixes and reserve port updates Adding test script updates and reserve port Change-Id: I2af5263a48a53117021f166d08395685e89fd122 Issue-ID: VVP-56 Signed-off-by: stark, steven --- ice_validator/tests/test_fixed_ips_format.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ice_validator/tests/test_fixed_ips_format.py') diff --git a/ice_validator/tests/test_fixed_ips_format.py b/ice_validator/tests/test_fixed_ips_format.py index 039c619..8e159ba 100644 --- a/ice_validator/tests/test_fixed_ips_format.py +++ b/ice_validator/tests/test_fixed_ips_format.py @@ -40,7 +40,9 @@ import pytest import yaml -from .utils.network_roles import get_network_role_from_port +from .utils.ports import is_reserved_port +from .utils.network_roles import get_network_role_from_port,\ + property_uses_get_resource import re @@ -76,13 +78,17 @@ def test_fixed_ips_format(heat_template): pytest.skip("No resources specified in the heat template") invalid_fixed_ips = [] - for v1 in yml["resources"].values(): + for k1, v1 in yml["resources"].items(): if not isinstance(v1, dict): continue if "properties" not in v1: continue if v1.get("type") != "OS::Neutron::Port": continue + if is_reserved_port(k1): + continue + if property_uses_get_resource(v1, "network"): + continue network_role = get_network_role_from_port(v1) for k2, v2 in v1["properties"].items(): -- cgit 1.2.3-korg