From: Ezhilarasi <ezhrajam@in.ibm.com>
Date: Thu, 26 Sep 2019 11:02:25 +0000 (+0530)
Subject: Reduce cognitive complexity
X-Git-Tag: 6.0.0~38^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F96275%2F1;p=vvp%2Fvalidation-scripts.git

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 <ezhrajam@in.ibm.com>
---

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():