[VVP] Make Preload Generation more reslient to failures

[vvp/validation-scripts.git] / ice_validator / preload / model.py

diff --git a/ice_validator/preload/model.py b/ice_validator/preload/model.py
index c772465..3ca7bda 100644 (file)
--- a/ice_validator/preload/model.py
+++ b/ice_validator/preload/model.py
@@ -236,7 +236,7 @@ class Vnf:
 
     @property
     def base_output_params(self):
-        return self.base_module.heat.outputs
+        return self.base_module.heat.outputs if self.base_module else {}
 
     def filter_base_outputs(self):
         non_base_modules = (m for m in self.modules if not m.is_base_module)
@@ -251,7 +251,8 @@ def env_path(heat_path):
     :return: path to env file (assumes it is present and named correctly)
     """
     base_path = os.path.splitext(heat_path)[0]
-    return "{}.env".format(base_path)
+    env_path = "{}.env".format(base_path)
+    return env_path if os.path.exists(env_path) else None
 
 
 class VnfModule(FilterBaseOutputs):