X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_nova_servergroup_policies.py;h=b3df88ad2cf3c4e6b04896a9caadcc5594e861ce;hb=10535815da964c683e5f91030934652bfb3f53b8;hp=6915fd4ac1ea8f7b18dec73b42a3dbad30d66af1;hpb=f5edc06be0d8bedeb0904b348ba5e3e67c74f186;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_nova_servergroup_policies.py b/ice_validator/tests/test_nova_servergroup_policies.py
index 6915fd4..b3df88a 100644
--- a/ice_validator/tests/test_nova_servergroup_policies.py
+++ b/ice_validator/tests/test_nova_servergroup_policies.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -35,19 +35,18 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-import yaml
+from tests import cached_yaml as yaml
 import pytest
 
 
 def test_nova_servergroup_policies(yaml_file):
-    '''
+    """
     Check that nova servergroup resources using either anti-affinity or
     affinity rules in policies
-    '''
-    req_rules = ['affinity', 'anti-affinity']
+    """
+    req_rules = ["affinity", "anti-affinity"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
@@ -56,8 +55,8 @@ def test_nova_servergroup_policies(yaml_file):
     if "resources" not in yml:
         pytest.skip("No resources specified in the heat template")
 
-    has_req_rules = []
-    for v1 in yml["resources"].values():
+    invalid_policies = []
+    for r_id, v1 in yml["resources"].items():
         if not isinstance(v1, dict):
             continue
         if "properties" not in v1:
@@ -70,11 +69,19 @@ def test_nova_servergroup_policies(yaml_file):
         try:
             all_rules = v1["properties"]["policies"]
             detected_rules = set(all_rules) & set(req_rules)
-            has_req_rules.append(len(detected_rules) > 0)
-        except (ValueError):
+            if len(detected_rules) == 0:
+                invalid_policies.append(
+                    "{} policies must include one of {}".format(
+                        r_id, ", ".join(req_rules)
+                    )
+                )
+            elif len(detected_rules) > 1:
+                invalid_policies.append(
+                    "{} policies must include only one of {}".format(
+                        r_id, ", ".join(req_rules)
+                    )
+                )
+        except ValueError:
             continue
 
-    if not has_req_rules:
-        pytest.skip("No policies Nova::ServerGroup instances were detected")
-
-    assert all(has_req_rules)
+    assert not invalid_policies, ". ".join(invalid_policies)