X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Fstructures.py;h=887917c240a1ae3182884c92fedfe53fdf2d7536;hb=d78c645df31a19567667d3e6d3acdf0474f39bf1;hp=9c47b8042687803f5b7458c649a642c35d2b32e7;hpb=8540eb59f7e7f8ff2043a8eaf7edfc255a60874a;p=vvp%2Fvalidation-scripts.git diff --git a/ice_validator/tests/structures.py b/ice_validator/tests/structures.py index 9c47b80..887917c 100644 --- a/ice_validator/tests/structures.py +++ b/ice_validator/tests/structures.py @@ -45,7 +45,7 @@ import re import sys from tests import cached_yaml as yaml -from tests.helpers import load_yaml +from tests.helpers import load_yaml, get_param from .utils import nested_dict VERSION = "4.2.0" @@ -85,13 +85,19 @@ class HeatProcessor(object): # regex parses the proper resource id format. @staticmethod - def get_param_value(value): + def get_param_value(value, withIndex=False): """Return get_param value of `value` """ if isinstance(value, dict) and len(value) == 1: v = value.get("get_param") if isinstance(v, list) and v: - v = v[0] + if withIndex and len(v) > 1: + idx = v[1] + if isinstance(idx, dict): + idx = idx.get("get_param", idx) + v = "{}{}".format(v[0], idx) + else: + v = v[0] else: v = None return v @@ -161,7 +167,7 @@ class HeatProcessor(object): # are replaced in the template in arbitrary order. name = template for key, value in params.items(): - param = cls.get_param_value(value) + param = cls.get_param_value(value, withIndex=True) if param is None: return None name = name.replace(key, str(param)) @@ -223,7 +229,7 @@ class ContrailV2NetworkFlavorBaseProcessor(HeatProcessor): network_flavor_external = "external" network_flavor_internal = "internal" - network_flavor_subint = "subint" + network_flavor_subint = "subinterface" @classmethod def get_network_flavor(cls, resource): @@ -246,15 +252,19 @@ class ContrailV2NetworkFlavorBaseProcessor(HeatProcessor): network_flavor = cls.network_flavor_internal else: p = param.get("get_param") - if isinstance(p, str): - if "_int_" in p or p.startswith("int_"): - network_flavor = cls.network_flavor_internal - elif "_subint_" in p: - network_flavor = cls.network_flavor_subint - else: - network_flavor = cls.network_flavor_external + network_flavor = cls.get_network_format(p) return network_flavor + @classmethod + def get_network_format(cls, param): + if isinstance(param, str): + if "_int_" in param or param.startswith("int_"): + return cls.network_flavor_internal + elif "_subint_" in param: + return cls.network_flavor_subint + else: + return cls.network_flavor_external + class ContrailV2InstanceIpProcessor(ContrailV2NetworkFlavorBaseProcessor): """ ContrailV2 InstanceIp @@ -264,7 +274,7 @@ class ContrailV2InstanceIpProcessor(ContrailV2NetworkFlavorBaseProcessor): re_rids = collections.OrderedDict( [ ( - "int_ip", + "internal", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -272,27 +282,14 @@ class ContrailV2InstanceIpProcessor(ContrailV2NetworkFlavorBaseProcessor): r"_(?P.+)" r"_vmi" r"_(?P\d+)" + r"(_v6)?" r"_IP" r"_(?P\d+)" r"$" ), ), ( - "int_v6_ip", - _get_regex( - r"(?P.+)" - r"_(?P\d+)" - r"_int" - r"_(?P.+)" - r"_vmi" - r"_(?P\d+)" - r"_v6_IP" - r"_(?P\d+)" - r"$" - ), - ), - ( - "subint_ip", + "subinterface", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -300,51 +297,26 @@ class ContrailV2InstanceIpProcessor(ContrailV2NetworkFlavorBaseProcessor): r"_(?P.+)" r"_vmi" r"_(?P\d+)" + r"(_v6)?" r"_IP" r"_(?P\d+)" r"$" ), ), ( - "subint_v6_ip", - _get_regex( - r"(?P.+)" - r"_(?P\d+)" - r"_subint" - r"_(?P.+)" - r"_vmi" - r"_(?P\d+)" - r"_v6_IP" - r"_(?P\d+)" - r"$" - ), - ), - ( - "ip", + "external", _get_regex( r"(?P.+)" r"_(?P\d+)" r"_(?P.+)" r"_vmi" r"_(?P\d+)" + r"(_v6)?" r"_IP" r"_(?P\d+)" r"$" ), ), - ( - "v6_ip", - _get_regex( - r"(?P.+)" - r"_(?P\d+)" - r"_(?P.+)" - r"_vmi" - r"_(?P\d+)" - r"_v6_IP" - r"_(?P\d+)" - r"$" - ), - ), ] ) @@ -406,7 +378,7 @@ class ContrailV2VirtualMachineInterfaceProcessor(ContrailV2NetworkFlavorBaseProc re_rids = collections.OrderedDict( [ ( - "vmi_internal", + "internal", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -418,7 +390,7 @@ class ContrailV2VirtualMachineInterfaceProcessor(ContrailV2NetworkFlavorBaseProc ), ), ( - "vmi_subint", + "subinterface", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -430,7 +402,7 @@ class ContrailV2VirtualMachineInterfaceProcessor(ContrailV2NetworkFlavorBaseProc ), ), ( - "vmi_external", + "external", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -452,7 +424,7 @@ class ContrailV2VirtualNetworkProcessor(HeatProcessor): re_rids = collections.OrderedDict( [ ("network", _get_regex(r"int" r"_(?P.+)" r"_network" r"$")), - ("rvn", _get_regex(r"int" r"_(?P.+)" r"_RVN" r"$")), + # ("rvn", _get_regex(r"int" r"_(?P.+)" r"_RVN" r"$")), ] ) @@ -498,7 +470,7 @@ class NeutronPortProcessor(HeatProcessor): re_rids = collections.OrderedDict( [ ( - "internal_port", + "internal", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -509,7 +481,7 @@ class NeutronPortProcessor(HeatProcessor): ), ), ( - "port", + "external", _get_regex( r"(?P.+)" r"_(?P\d+)" @@ -518,26 +490,6 @@ class NeutronPortProcessor(HeatProcessor): r"$" ), ), - ( - "floating_ip", - _get_regex( - r"reserve_port" - r"_(?P.+)" - r"_(?P.+)" - r"_floating_ip_(?P\d+)" - r"$" - ), - ), - ( - "floating_v6_ip", - _get_regex( - r"reserve_port" - r"_(?P.+)" - r"_(?P.+)" - r"_floating_v6_ip_(?P\d+)" - r"$" - ), - ), ] ) @@ -546,11 +498,14 @@ class NeutronPortProcessor(HeatProcessor): """Returns True/False as `resource` is/not An OS::Nova:Port with the property binding:vnic_type """ - return nested_dict.get( - resource, "type" - ) == cls.resource_type and "binding:vnic_type" in nested_dict.get( - resource, "properties", default={} - ) + resource_properties = nested_dict.get(resource, "properties", default={}) + if ( + nested_dict.get(resource, "type") == cls.resource_type + and resource_properties.get("binding:vnic_type", "") == "direct" + ): + return True + + return False class NovaServerProcessor(HeatProcessor): @@ -650,6 +605,10 @@ class Heat(object): self.load_env(envpath) self.heat_processors = self.get_heat_processors() + @property + def is_heat(self): + return "heat_template_version" in self.yml + @property def contrail_resources(self): """This attribute is a dict of Contrail resources. @@ -658,19 +617,28 @@ class Heat(object): resource_type=ContrailV2VirtualMachineInterfaceProcessor.resource_type ) - def get_all_resources(self, base_dir): + def get_all_resources(self, base_dir=None, count=1): """ - Like ``resources``, - but this returns all the resources definitions + Like ``resources``, but this returns all the resources definitions defined in the template, resource groups, and nested YAML files. + + A special variable will be added to all resource properties (__count__). + This will normally be 1, but if the resource is generated by a + ResourceGroup **and** an env file is present, then the count will be + the value from the env file (assuming this follows standard VNF Heat + Guidelines) """ + base_dir = base_dir or self.dirname resources = {} for r_id, r_data in self.resources.items(): + r_data["__count__"] = count resources[r_id] = r_data resource = Resource(r_id, r_data) if resource.is_nested(): + nested_count = resource.get_count(self.env) nested = Heat(os.path.join(base_dir, resource.get_nested_filename())) - resources.update(nested.get_all_resources(base_dir)) + nested_resources = nested.get_all_resources(count=nested_count) + resources.update(nested_resources) return resources @staticmethod @@ -680,13 +648,14 @@ class Heat(object): """ return _HEAT_PROCESSORS - def get_resource_by_type(self, resource_type): + def get_resource_by_type(self, resource_type, all_resources=False): """Return dict of resources whose type is `resource_type`. key is resource_id, value is resource. """ + resources = self.get_all_resources() if all_resources else self.resources return { rid: resource - for rid, resource in self.resources.items() + for rid, resource in resources.items() if self.nested_get(resource, "type") == resource_type } @@ -817,6 +786,24 @@ class Resource(object): else: return self.properties + def get_count(self, env): + if self.resource_type == "OS::Heat::ResourceGroup": + if not env: + return 1 + env_params = env.parameters + count_param = get_param(self.properties["count"]) + count_value = env_params.get(count_param) if count_param else 1 + try: + return int(count_value) + except (ValueError, TypeError): + print( + ( + "WARNING: Invalid value for count parameter {}. Expected " + "an integer, but got {}. Defaulting to 1" + ).format(count_param, count_value) + ) + return 1 + @property def depends_on(self): """