X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Futils%2Fports.py;h=d57625d393b0ab99f8c79c87468ad9c4de769ded;hb=5a9ec733d574ae7d2cd40e01e67d0e1791b7a804;hp=1f5f658e829bf0927c35a29403dfca36a75a8729;hpb=2c04e79bb65a4ffcf4db5d443d6cc3e3ea3f10fe;p=vvp%2Fvalidation-scripts.git diff --git a/ice_validator/tests/utils/ports.py b/ice_validator/tests/utils/ports.py index 1f5f658..d57625d 100644 --- a/ice_validator/tests/utils/ports.py +++ b/ice_validator/tests/utils/ports.py @@ -38,7 +38,7 @@ # from tests.structures import Heat from tests.helpers import parameter_type_to_heat_type, prop_iterator -from . import nested_dict +from tests.utils import nested_dict AAP_EXEMPT_CAVEAT = ( @@ -160,8 +160,9 @@ def validate_port_parameter( If the parameter is present in the resource metadata and exemptions are allowed, then the validation will be skipped. """ - parameter = param.get("get_param") - if not parameter: + if isinstance(param, dict) and "get_param" in param: + parameter = param.get("get_param") + else: return ( "Unexpected parameter format for {} {} property {}: {}. " "Please consult the heat guidelines documentation for details." @@ -242,19 +243,3 @@ def mismatch_resource_and_parameter_attribute(check, resource_re_match, paramete return ("{0} {1} does not match parameter {2} {1}").format( rid, check, parameter ) - - -def get_list_of_ports_attached_to_nova_server(nova_server): - networks_list = nova_server.get("properties", {}).get("networks") - - port_ids = [] - if networks_list: - for network in networks_list: - network_prop = network.get("port") - if network_prop: - pid = network_prop.get("get_param") - if not pid: - pid = network_prop.get("get_resource") - port_ids.append(pid) - - return port_ids