From: stark, steven <steven.stark@att.com>
Date: Wed, 21 Aug 2019 18:12:39 +0000 (-0700)
Subject: [VVP] test_environment_file_parameters violation fix
X-Git-Tag: 5.0.0~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=commitdiff_plain;h=b1df832ae5ddaac6344b7ccf3f1f32a0bcfbdd67

[VVP] test_environment_file_parameters violation fix

test_environment_file_parameters check for environment violation is checking the wrong variable.

Also doesn't handle environment files with no parameters gracefully.

Issue-ID: VVP-267
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I9fbedbb5af4c045037131a7e7a7ca7f6c8febb14
---

diff --git a/ice_validator/tests/test_environment_file_parameters.py b/ice_validator/tests/test_environment_file_parameters.py
index 100e4a1..ff57c35 100644
--- a/ice_validator/tests/test_environment_file_parameters.py
+++ b/ice_validator/tests/test_environment_file_parameters.py
@@ -268,10 +268,11 @@ def env_violation(yaml_file, parameter, persistent):
     env_yaml = environment_pair.get("eyml")
     parameters = env_yaml.get("parameters", {})
     in_env = False
-    for param, value in parameters.items():
-        if re.match(parameter, parameter):
-            in_env = True
-            break
+    if parameters:  # env file can be just parameters:
+        for param, value in parameters.items():
+            if re.match(parameter, param):
+                in_env = True
+                break
 
     # confusing return. This function is looking for a violation.
     return not persistent == in_env