From d8d2e4b763fbd7cedc42046f6f45395bf15caa79 Mon Sep 17 00:00:00 2001 From: Boris Pavlovic Date: Wed, 26 Aug 2015 10:36:42 -0700 Subject: [PATCH] Fix the scenario plugin sample We forgot to fix scenario plugin sample when we were doing rally.task.scenario refactoring Change-Id: Iadbb960cf168bd3b9cd6c1881a5f7a8dffd7036f --- samples/plugins/scenario/scenario_plugin.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/samples/plugins/scenario/scenario_plugin.py b/samples/plugins/scenario/scenario_plugin.py index 00045fb853..a573ad68a5 100644 --- a/samples/plugins/scenario/scenario_plugin.py +++ b/samples/plugins/scenario/scenario_plugin.py @@ -13,13 +13,14 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.task.scenarios import base +from rally.plugins.openstack import scenario +from rally.task import atomic -class ScenarioPlugin(base.Scenario): +class ScenarioPlugin(scenario.OpenStackScenario): """Sample plugin which lists flavors.""" - @base.atomic_action_timer("list_flavors") + @atomic.action_timer("list_flavors") def _list_flavors(self): """Sample of usage clients - list flavors @@ -28,12 +29,12 @@ class ScenarioPlugin(base.Scenario): """ self.clients("nova").flavors.list() - @base.atomic_action_timer("list_flavors_as_admin") + @atomic.action_timer("list_flavors_as_admin") def _list_flavors_as_admin(self): """The same with admin clients.""" self.admin_clients("nova").flavors.list() - @base.scenario() + @scenario.configure() def list_flavors(self): """List flavors.""" self._list_flavors()