From 396e1c207507bedae2fe142fc61fd64cbc5dc79f Mon Sep 17 00:00:00 2001
From: Sergey Kraynev <skraynev@mirantis.com>
Date: Thu, 21 Jan 2016 02:09:00 -0500
Subject: [PATCH] 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
---
 rally-scenarios/extra/default.yaml       | 1 +
 rally-scenarios/heat-fakevirt.yaml       | 4 ++++
 rally-scenarios/plugins/sample_plugin.py | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 rally-scenarios/extra/default.yaml

diff --git a/rally-scenarios/extra/default.yaml b/rally-scenarios/extra/default.yaml
new file mode 100644
index 0000000000..59198e5f9b
--- /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 a827224f89..a7f8f8e769 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 16e98616e2..7f20f0f2f3 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."""