openstack/tempest
Code Issues Proposed changes

Switching to oslo importutils in the stress tests

Browse Source 
The importutils is helper module for dynamic class and module,
 loading.

The importutils is compatible with python 2.6 and it is
used in multiple other openstack projects.

The previously used importlib defined with python 2.7.

Change-Id: I4e99ccf9d51cea28584c9d28a4aceab633b3f998
This commit is contained in:
Attila Fazekas 2013-07-30 14:38:20 +02:00
parent 6a97094c24
commit 1e30d5d096
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack-common.conf
View File

@ -4,6 +4,7 @@
module=install_venv_common module=install_venv_common
module=lockutils module=lockutils
module=log module=log
module=importlib
# The base module to hold the copy of openstack.common # The base module to hold the copy of openstack.common
base=tempest base=tempest

9
tempest/stress/driver.py
View File

@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import importlib
import logging import logging
import multiprocessing import multiprocessing
import time import time
@ -21,6 +20,7 @@ from tempest import clients
from tempest.common import ssh from tempest.common import ssh
from tempest.common.utils.data_utils import rand_name from tempest.common.utils.data_utils import rand_name
from tempest import exceptions from tempest import exceptions
from tempest.openstack.common import importutils
from tempest.stress import cleanup from tempest.stress import cleanup
admin_manager = clients.AdminManager() admin_manager = clients.AdminManager()
@ -93,11 +93,6 @@ def _error_in_logs(logfiles, nodes):
return None return None
def get_action_object(path):
(module_part, _, obj_name) = path.rpartition('.')
return getattr(importlib.import_module(module_part), obj_name)
def stress_openstack(tests, duration, max_runs=None): def stress_openstack(tests, duration, max_runs=None):
""" """
Workload driver. Executes an action function against a nova-cluster. Workload driver. Executes an action function against a nova-cluster.
@ -131,7 +126,7 @@ def stress_openstack(tests, duration, max_runs=None):
password="pass", password="pass",
tenant_name=tenant_name) tenant_name=tenant_name)
test_obj = get_action_object(test['action']) test_obj = importutils.import_class(test['action'])
test_run = test_obj(manager, logger, max_runs) test_run = test_obj(manager, logger, max_runs)
kwargs = test.get('kwargs', {}) kwargs = test.get('kwargs', {})