Clean imports in code

In some part in the code we import objects.
In the Openstack style guidelines they recommend to import only modules.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I12a875436c10be2137a031e3ed4ec04a7fdf5e35
This commit is contained in:
Cao Xuan Hoang 2016-08-25 16:11:14 +07:00
parent c68b1493c2
commit 36fe23c3bc
5 changed files with 17 additions and 14 deletions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from collections import OrderedDict
import collections
import copy
import six
@ -112,7 +112,7 @@ BASE_CDH_DESC = {
DEFAULT_TEMPLATES = {
'vanilla': OrderedDict([
'vanilla': collections.OrderedDict([
('2.6.0', copy.deepcopy(BASE_VANILLA_DESC)),
('2.7.1', copy.deepcopy(BASE_VANILLA_DESC)),
('1.2.1', {
@ -148,7 +148,7 @@ DEFAULT_TEMPLATES = {
}
})
]),
'hdp': OrderedDict([
'hdp': collections.OrderedDict([
('2.0.6', {
'NODES': {
'master1': {
@ -174,11 +174,11 @@ DEFAULT_TEMPLATES = {
}
})
]),
'spark': OrderedDict([
'spark': collections.OrderedDict([
('1.0.0', copy.deepcopy(BASE_SPARK_DESC)),
('1.3.1', copy.deepcopy(BASE_SPARK_DESC))
]),
'cdh': OrderedDict([
'cdh': collections.OrderedDict([
('5.4.0', copy.deepcopy(BASE_CDH_DESC)),
('5.3.0', copy.deepcopy(BASE_CDH_DESC)),
('5', copy.deepcopy(BASE_CDH_DESC))

View File

@ -22,7 +22,7 @@ from oslo_config import generator
from oslo_log import log as logging
from six import moves
from tempest.cmd.workspace import WorkspaceManager
from tempest.cmd import workspace
LOG = logging.getLogger(__name__)
@ -167,7 +167,8 @@ class TempestInit(command.Command):
subprocess.call(['testr', 'init'], cwd=local_dir)
def take_action(self, parsed_args):
workspace_manager = WorkspaceManager(parsed_args.workspace_path)
workspace_manager = workspace.WorkspaceManager(
parsed_args.workspace_path)
name = parsed_args.name or parsed_args.dir.split(os.path.sep)[-1]
workspace_manager.register_new_workspace(
name, parsed_args.dir, init=True)

View File

@ -21,7 +21,7 @@ Utility for listing all currently installed Tempest plugins.
from cliff import command
import prettytable
from tempest.test_discover.plugins import TempestTestPluginManager
from tempest.test_discover import plugins as plg
class TempestListPlugins(command.Command):
@ -32,7 +32,7 @@ class TempestListPlugins(command.Command):
return 'List all tempest plugins'
def _list_plugins(self):
plugins = TempestTestPluginManager()
plugins = plg.TempestTestPluginManager()
output = prettytable.PrettyTable(["Name", "EntryPoint"])
for plugin in plugins.ext_plugins.extensions:

View File

@ -17,7 +17,7 @@ import shutil
import subprocess
import tempfile
from tempest.cmd.workspace import WorkspaceManager
from tempest.cmd import workspace
from tempest.lib.common.utils import data_utils
from tempest.tests import base
@ -31,7 +31,8 @@ class TestTempestWorkspaceBase(base.TestCase):
store_dir = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, store_dir, ignore_errors=True)
self.store_file = os.path.join(store_dir, 'workspace.yaml')
self.workspace_manager = WorkspaceManager(path=self.store_file)
self.workspace_manager = workspace.WorkspaceManager(
path=self.store_file)
self.workspace_manager.register_new_workspace(self.name, self.path)
@ -92,7 +93,8 @@ class TestTempestWorkspaceManager(TestTempestWorkspaceBase):
store_dir = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, store_dir, ignore_errors=True)
self.store_file = os.path.join(store_dir, 'workspace.yaml')
self.workspace_manager = WorkspaceManager(path=self.store_file)
self.workspace_manager = workspace.WorkspaceManager(
path=self.store_file)
self.workspace_manager.register_new_workspace(self.name, self.path)
def test_workspace_manager_get(self):

View File

@ -14,7 +14,7 @@
import copy
from tempest.lib.services.network.versions_client import NetworkVersionsClient
from tempest.lib.services.network import versions_client
from tempest.tests.lib import fake_auth_provider
from tempest.tests.lib.services import base
@ -59,7 +59,7 @@ class TestNetworkVersionsClient(base.BaseServiceTest):
super(TestNetworkVersionsClient, self).setUp()
fake_auth = fake_auth_provider.FakeAuthProvider()
self.versions_client = (
NetworkVersionsClient
versions_client.NetworkVersionsClient
(fake_auth, 'compute', 'regionOne'))
def _test_versions_client(self, bytes_body=False):