diff options
| author |   Dimitrios Markou <mardim@intracom-telecom.com> | 2018-02-23 16:13:09 +0200 |
|---|---|---|
| committer |   Ross Brattain <ross.b.brattain@intel.com> | 2018-02-23 21:30:31 +0000 |
| commit | d3c5f9eccf240162687ec0aa026e1b1065a982d6 (patch) | |
| tree | 968bad74d3f1c8ba102fa7c2b5b1c7f29601efe5 /yardstick | |
| parent | a134474819400f2f7075d62990899943a06a5086 (diff) | |
Bug Fix: Move heat_timeout variable higher
If a heat_template was used by a testcase the heat_timeout
variable was not getting initialized and that caused errors
in the Shade python module.
JIRA: YARDSTICK-1027
Change-Id: Ic0bf15b13cc00595964a97f8150dc5e6f2b7e1d7
Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com>
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index d873ee8a1..7b7f1be32 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -102,6 +102,8 @@ class HeatContext(Context): self._user = attrs.get("user") self.template_file = attrs.get("heat_template") + + self.heat_timeout = attrs.get("timeout", DEFAULT_HEAT_TIMEOUT) if self.template_file: self.heat_parameters = attrs.get("heat_parameters") return @@ -113,8 +115,6 @@ class HeatContext(Context): self._flavor = attrs.get("flavor") - self.heat_timeout = attrs.get("timeout", DEFAULT_HEAT_TIMEOUT) - self.placement_groups = [PlacementGroup(name, self, pg_attrs["policy"]) for name, pg_attrs in attrs.get( "placement_groups", {}).items()] |