From f1afc00cf5e37a9119b8b467ba663a1de1d4eb1e Mon Sep 17 00:00:00 2001 From: Ezhilarasi Date: Thu, 26 Sep 2019 16:32:25 +0530 Subject: [PATCH] Reduce cognitive complexity Sonar fix to reduce cognitive complexity in method test_vm_type_assignments_on_nova_servers_only_use_get_param Change-Id: I52d78ee4252cee5a6406406bc60629583ac0bfa3 Issue-ID: VVP-293 Signed-off-by: Ezhilarasi --- .../tests/test_nova_servers_vm_types_use_get_param.py | 10 ++-------- 1 file 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(): -- 2.16.6