diff options
Diffstat (limited to 'ice_validator/tests/test_nova_servers_environment_context.py')
| -rw-r--r-- | ice_validator/tests/test_nova_servers_environment_context.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/ice_validator/tests/test_nova_servers_environment_context.py b/ice_validator/tests/test_nova_servers_environment_context.py index 0da97f2..780733a 100644 --- a/ice_validator/tests/test_nova_servers_environment_context.py +++ b/ice_validator/tests/test_nova_servers_environment_context.py @@ -43,7 +43,8 @@ import pytest from tests import cached_yaml as yaml -from .helpers import validates +from .helpers import validates, get_param + VERSION = "1.0.0" @@ -89,17 +90,5 @@ def validate_metadata(metadata, parameters): Return error message string or None if no errors. """ for value in metadata.values(): - if isinstance(value, dict): - if "get_param" in value: - if value["get_param"] == "environment_context": - wc = parameters.get("environment_context", {}) - if wc.get("type") == "string": - break - else: - return ( - 'must have parameter "environment_context"' - ' of type "string"' - ) - break - else: - return None + if get_param(value) == "environment_context" and parameters.get("environment_context", {}).get("type", "") != "string": + return 'must have parameter "environment_context" of type "string"' |