openstack
/
ec2-api
Code Issues Proposed changes

fix rally 

Change-Id: Ic8048b6e36afce2863228e74a3827bccae24109a
This commit is contained in:
Andrey Pavlov 2015-12-14 18:03:51 +03:00
parent e22e6a1bc0
commit 400f130485
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,8 @@ class PrepareEC2ClientContext(context.Context):
def __init__(self, ctx): def __init__(self, ctx):
super(PrepareEC2ClientContext, self).__init__(ctx) super(PrepareEC2ClientContext, self).__init__(ctx)
self.net_wrapper = network_wrapper.wrap( self.net_wrapper = network_wrapper.wrap(
osclients.Clients(self.context["admin"]["endpoint"]), osclients.Clients(self.context["admin"]["credential"]),
self.config) self, config=self.config)
self.net_wrapper.start_cidr = '10.0.0.0/16' self.net_wrapper.start_cidr = '10.0.0.0/16'
@logging.log_task_wrapper(LOG.info, _("Enter context: `EC2 creds`")) @logging.log_task_wrapper(LOG.info, _("Enter context: `EC2 creds`"))
@ -40,7 +40,7 @@ class PrepareEC2ClientContext(context.Context):
"""This method is called before the task start.""" """This method is called before the task start."""
try: try:
for user in self.context['users']: for user in self.context['users']:
osclient = osclients.Clients(user['endpoint']) osclient = osclients.Clients(user['credential'])
keystone = osclient.keystone() keystone = osclient.keystone()
creds = keystone.ec2.list(user['id']) creds = keystone.ec2.list(user['id'])
if not creds: if not creds:

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

@ -55,7 +55,7 @@ class FakeImageGenerator(context.Context):
for user, tenant_id in rutils.iterate_per_tenants( for user, tenant_id in rutils.iterate_per_tenants(
self.context["users"]): self.context["users"]):
glance = osclients.Clients(user["endpoint"]).glance().images glance = osclients.Clients(user["credential"]).glance().images
current_images = [] current_images = []
for i in range(images_per_tenant): for i in range(images_per_tenant):
kw = { kw = {
@ -73,7 +73,7 @@ class FakeImageGenerator(context.Context):
def cleanup(self): def cleanup(self):
for user, tenant_id in rutils.iterate_per_tenants( for user, tenant_id in rutils.iterate_per_tenants(
self.context["users"]): self.context["users"]):
glance = osclients.Clients(user["endpoint"]).glance().images glance = osclients.Clients(user["credential"]).glance().images
for image in self.context["tenants"][tenant_id].get("images", []): for image in self.context["tenants"][tenant_id].get("images", []):
with logging.ExceptionLogger( with logging.ExceptionLogger(
LOG, LOG,