diff --git a/tempest/api/identity/admin/v3/test_oauth_consumers.py b/tempest/api/identity/admin/v3/test_oauth_consumers.py index f06fb8f5f..970ead33b 100644 --- a/tempest/api/identity/admin/v3/test_oauth_consumers.py +++ b/tempest/api/identity/admin/v3/test_oauth_consumers.py @@ -14,7 +14,7 @@ # under the License. from tempest.api.identity import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest.lib import exceptions as exceptions diff --git a/tempest/common/utils/__init__.py b/tempest/common/utils/__init__.py index 84e31d0d4..e69de29bb 100644 --- a/tempest/common/utils/__init__.py +++ b/tempest/common/utils/__init__.py @@ -1,38 +0,0 @@ -# Copyright (c) 2015 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from functools import partial - -from tempest import config -from tempest.lib.common.utils import data_utils as lib_data_utils - -CONF = config.CONF - - -class DataUtils(object): - def __getattr__(self, attr): - - if attr == 'rand_name': - # NOTE(flwang): This is a proxy to generate a random name that - # includes a random number and a prefix if one is configured in - # CONF.resources_prefix - attr_obj = partial(lib_data_utils.rand_name, - prefix=CONF.resources_prefix) - else: - attr_obj = getattr(lib_data_utils, attr) - - self.__dict__[attr] = attr_obj - return attr_obj - -data_utils = DataUtils()