openstack
/
ec2-api
Code Issues Proposed changes

Merge "fix rally scenarios"

This commit is contained in:
Jenkins 2015-08-08 06:25:12 +00:00 committed by Gerrit Code Review
parent be29829e56 5b9b0cd55e
commit 32ff4af73d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally-scenarios/plugins/context_plugin_ec2_creds.py
View File

@ -25,7 +25,7 @@ from rally.task import context
LOG = logging.getLogger(__name__)
@context.context(name="prepare_ec2_client", order=110)
@context.configure(name="prepare_ec2_client", order=110)
class PrepareEC2ClientContext(context.Context):
def __init__(self, ctx):

4
rally-scenarios/plugins/context_plugin_ec2_objects.py
View File

@ -214,7 +214,7 @@ class EC2Objects(context.Context):
LOG.exception('')
@context.context(name="ec2_networks", order=451)
@context.configure(name="ec2_networks", order=451)
class FakeNetworkGenerator(EC2Objects):
"""Context class for adding temporary networks for benchmarks.
@ -269,7 +269,7 @@ class FakeNetworkGenerator(EC2Objects):
self.cleanup_networks(tenant_id, client)
@context.context(name="ec2_servers", order=450)
@context.configure(name="ec2_servers", order=450)
class FakeServerGenerator(EC2Objects):
"""Context class for adding temporary servers for benchmarks.

2
rally-scenarios/plugins/context_plugin_images.py
View File

@ -24,7 +24,7 @@ from rally.task.scenarios import base as scenario_base
LOG = logging.getLogger(__name__)
@context.context(name="fake_images", order=411)
@context.configure(name="fake_images", order=411)
class FakeImageGenerator(context.Context):
"""Context class for adding images to each user for benchmarks."""