openstack/rally
Code Issues Proposed changes

Merge "Add the ability to specify versions for clients"

Browse Source
This commit is contained in:
Jenkins 2015-03-26 03:05:59 +00:00 committed by Gerrit Code Review
commit 2efe0cb9ed
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rally/benchmark/scenarios/base.py
View File

@ -182,26 +182,32 @@ class Scenario(object):
return False
return Scenario.meta(cls, "is_scenario", method_name, default=False)
def clients(self, client_type):
def clients(self, client_type, version=None):
"""Returns a python openstack client of the requested type.
The client will be that for one of the temporary non-administrator
users created before the benchmark launch.
:param client_type: Client type ("nova"/"glance" etc.)
:param version: client version ("1"/"2" etc.)
:returns: Standard python OpenStack client instance
"""
return getattr(self._clients, client_type)()
client = getattr(self._clients, client_type)
def admin_clients(self, client_type):
return client(version) if version is not None else client()
def admin_clients(self, client_type, version=None):
"""Returns a python admin openstack client of the requested type.
:param client_type: Client type ("nova"/"glance" etc.)
:param version: client version ("1"/"2" etc.)
:returns: Python openstack client object
"""
return getattr(self._admin_clients, client_type)()
client = getattr(self._admin_clients, client_type)
return client(version) if version is not None else client()
def sleep_between(self, min_sleep, max_sleep):
"""Performs a time.sleep() call for a random amount of seconds.