aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Wright <sw3588@att.com>2019-10-01 14:26:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-01 14:26:09 +0000
commita911d303c59263d01fbd648593729c3f1328c766 (patch)
treed95a0e5f6f02d94e51a1e0899f73ee07fe6af38e
parentf9b8aeaed0a323ba8666c0e0706eded720e0b5da (diff)
parentf1afc00cf5e37a9119b8b467ba663a1de1d4eb1e (diff)
Merge "Reduce cognitive complexity"
-rw-r--r--ice_validator/tests/test_nova_servers_vm_types_use_get_param.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py b/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
index 63698f1..ce653f6 100644
--- a/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
+++ b/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
@@ -40,7 +40,7 @@
import pytest
from tests import cached_yaml as yaml
-from .helpers import validates
+from .helpers import validates, is_nova_server
@validates("R-901331", "R-481670", "R-663631")
@@ -59,13 +59,7 @@ def test_vm_type_assignments_on_nova_servers_only_use_get_param(yaml_file):
invalid_nova_servers = set()
for k, v in yml["resources"].items():
- if not isinstance(v, dict):
- continue
- if "properties" not in v:
- continue
- if "type" not in v:
- continue
- if v["type"] != "OS::Nova::Server":
+ if not is_nova_server(v):
continue
for k2, v2 in v["properties"].items():