diff options
| author | Sergey Kraynev <skraynev@mirantis.com> | 2016-01-21 02:09:00 -0500 |
|---|---|---|
| committer | Sergey Kraynev <skraynev@mirantis.com> | 2016-02-15 07:44:17 +0000 |
| commit | 396e1c207507bedae2fe142fc61fd64cbc5dc79f (patch) | |
| tree | caea6afc508ef8daf96e1bdfa6f2fad1a5c82d0a /rally-scenarios | |
| parent | fe2d05164c3f3a7a47d9cf8872156c58376bd854 (diff) | |
| download | heat-396e1c207507bedae2fe142fc61fd64cbc5dc79f.tar.gz | |
Fix rally internal Heat job
Previous scenarious were obsolete.
This patch adds necessary paramater "template_path".
Also default.yaml template was added for using in this list of scenarios.
Additionally fix wrong import in sample_plugin.py
Change-Id: I31cd295d322d907883a22cddef25b5ccc609f2c1
Diffstat (limited to 'rally-scenarios')
| -rw-r--r-- | rally-scenarios/extra/default.yaml | 1 | ||||
| -rw-r--r-- | rally-scenarios/heat-fakevirt.yaml | 4 | ||||
| -rw-r--r-- | rally-scenarios/plugins/sample_plugin.py | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/rally-scenarios/extra/default.yaml b/rally-scenarios/extra/default.yaml new file mode 100644 index 000000000..59198e5f9 --- /dev/null +++ b/rally-scenarios/extra/default.yaml @@ -0,0 +1 @@ +heat_template_version: 2014-10-16 diff --git a/rally-scenarios/heat-fakevirt.yaml b/rally-scenarios/heat-fakevirt.yaml index a827224f8..a7f8f8e76 100644 --- a/rally-scenarios/heat-fakevirt.yaml +++ b/rally-scenarios/heat-fakevirt.yaml @@ -1,6 +1,8 @@ --- HeatStacks.create_and_list_stack: - + args: + template_path: "~/.rally/extra/default.yaml" runner: type: "constant" times: 2000 @@ -12,6 +14,8 @@ HeatStacks.create_and_delete_stack: - + args: + template_path: "~/.rally/extra/default.yaml" runner: type: "constant" times: 200 diff --git a/rally-scenarios/plugins/sample_plugin.py b/rally-scenarios/plugins/sample_plugin.py index 16e98616e..7f20f0f2f 100644 --- a/rally-scenarios/plugins/sample_plugin.py +++ b/rally-scenarios/plugins/sample_plugin.py @@ -24,12 +24,12 @@ Rally concepts https://wiki.openstack.org/wiki/Rally/Concepts """ -from rally.benchmark.scenarios import base +from rally.plugins.openstack import scenario -class HeatPlugin(base.Scenario): +class HeatPlugin(scenario.OpenStackScenario): - @base.scenario(context={"cleanup": ["heat"]}) + @scenario.configure(context={"cleanup": ["heat"]}) def list_benchmark(self, container_format, image_location, disk_format, **kwargs): """Get heatclient and do whatever.""" |