diff options
author | 2018-12-17 12:43:02 -0800 | |
---|---|---|
committer | 2018-12-17 13:04:00 -0800 | |
commit | 1f4df7c7ad27b23773ad9cdbe4db1632ce388cf1 (patch) | |
tree | 8092104f8be23051ff81c9f71ee34116df4d33ba /ice_validator/tests/test_network_format.py | |
parent | ca9085f0f77d442d3741a8c754e65cc45b6a318d (diff) |
[VVP] updating validation scripts in dublin
- adding backlog of new validation scripts for dublin
- updating existing tests
- removing outdated tests
Issue-ID: VVP-123
Change-Id: Ib8260889ac957c1dd28d8ede450fc8edc6fb0ec0
Signed-off-by: stark, steven <steven.stark@att.com>
Diffstat (limited to 'ice_validator/tests/test_network_format.py')
-rw-r--r-- | ice_validator/tests/test_network_format.py | 112 |
1 files changed, 105 insertions, 7 deletions
diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py index 7fb343a..bfa9813 100644 --- a/ice_validator/tests/test_network_format.py +++ b/ice_validator/tests/test_network_format.py @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # org.onap.vvp/validation-scripts # =================================================================== -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. # =================================================================== # # Unless otherwise specified, all software contained herein is licensed @@ -39,19 +39,25 @@ # import pytest +import re + from tests import cached_yaml as yaml from .helpers import validates -from .utils.network_roles import get_network_role_from_port, \ - property_uses_get_resource +from .utils.network_roles import get_network_role_from_port, property_uses_get_resource + +RE_INTERNAL_NETWORK_RID = re.compile( # match pattern + r"int_(?P<network_role>.+)_network$" +) +NETWORK_RESOURCE_TYPES = ["OS::Neutron::Net", "OS::ContrailV2::VirtualNetwork"] -@validates('R-62983', 'R-86182') +@validates("R-62983", "R-86182") def test_network_format(heat_template): - ''' + """ Make sure all network properties use the allowed naming conventions - ''' + """ with open(heat_template) as fh: yml = yaml.load(fh) @@ -72,4 +78,96 @@ def test_network_format(heat_template): if not get_network_role_from_port(v): invalid_ports.append(k) - assert not set(invalid_ports) + assert not set(invalid_ports), ( + "Missing 'network' property or improperly " + "formatted network parameter name on the " + "following OS::Neutron::Ports: " + "{}".format(", ".join(invalid_ports)) + ) + + +@validates("R-16968", "R-35666") +def test_network_resource_id_format(yaml_file): + """ + Make sure all network resource ids use the allowed naming + convention + """ + RE_INTERNAL_NETWORK_RID = re.compile( # match pattern + r"int_(?P<network_role>.+)_network$" + ) + + with open(yaml_file) as fh: + yml = yaml.load(fh) + + # skip if resources are not defined + if "resources" not in yml: + pytest.skip("No resources specified in the heat template") + + invalid_networks = [] + for k, v in yml["resources"].items(): + if not isinstance(v, dict): + continue + if "properties" not in v: + continue + if property_uses_get_resource(v, "network"): + continue + if v.get("type") not in NETWORK_RESOURCE_TYPES: + continue + match = RE_INTERNAL_NETWORK_RID.match(k) + if not match: + invalid_networks.append(k) + + assert not set(invalid_networks), ( + "Heat templates must only create internal networks " + "and follow format int_{network-role}_network" + "{}".format(", ".join(invalid_networks)) + ) + + +@validates("R-16241") +def test_network_has_subnet(yaml_file): + """ + if creating internal network, make sure there is a + corresponding subnet that references it + """ + + with open(yaml_file) as fh: + yml = yaml.load(fh) + + # skip if resources are not defined + if "resources" not in yml: + pytest.skip("No resources specified in the heat template") + + networks = [] + + for k, v in yml["resources"].items(): + if not isinstance(v, dict): + continue + if "properties" not in v: + continue + # need to check if contrail networks also require subnet + # and it is defined the same as neutron networks + # if v.get("type") not in NETWORK_RESOURCE_TYPES: + if v.get("type") not in ["OS::Neutron::Net"]: + continue + networks.append(k) + + for k, v in yml["resources"].items(): + if not isinstance(v, dict): + continue + if "properties" not in v: + continue + if v.get("type") != "OS::Neutron::Subnet": + continue + network_prop = v.get("properties", {}).get("network", {}).get("get_resource") + + if not network_prop: + continue + x = 0 + for network in networks: + if network == network_prop: + networks.pop(x) + break + x += 1 + + assert not networks, "Networks detected without subnet {}".format(networks) |