diff options
| author |   Lovett, Trevor <trevor.lovett@att.com> | 2019-10-08 13:32:34 -0500 |
|---|---|---|
| committer |   Lovett, Trevor (tl2972) <tl2972@att.com> | 2019-10-08 13:37:18 -0500 |
| commit | 842888dc28ebccab45e627669f7ee23f04920dc7 (patch) | |
| tree | f3cbc0bdc74dddd63ca9ce6f2bd8d6503f62def9 /ice_validator/preload | |
| parent | d78c645df31a19567667d3e6d3acdf0474f39bf1 (diff) | |
[VVP] Flag duplicate parameters in .env files
Also some minor tweaks to preload generation so it doesn't fail on
partial heat templates
Change-Id: If39288dde645b0b53a338e7672336807ffa1b6d7
Issue-ID: VVP-284
Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
Diffstat (limited to 'ice_validator/preload')
| -rw-r--r-- | ice_validator/preload/generator.py | 3 | ||||
| -rw-r--r-- | ice_validator/preload/model.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ice_validator/preload/generator.py b/ice_validator/preload/generator.py index 3da4014..bdd81fa 100644 --- a/ice_validator/preload/generator.py +++ b/ice_validator/preload/generator.py @@ -169,7 +169,8 @@ class AbstractPreloadGenerator(ABC): def generate(self): # handle the base module first print("\nGenerating {} preloads".format(self.format_name())) - self.generate_environments(self.vnf.base_module) + if self.vnf.base_module: + self.generate_environments(self.vnf.base_module) if self.supports_output_passing(): self.vnf.filter_base_outputs() for mod in self.vnf.incremental_modules: diff --git a/ice_validator/preload/model.py b/ice_validator/preload/model.py index c772465..db60438 100644 --- 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) |