TrivialFix: Redundant alias in import statement

Change-Id: I4a9a755b322a8f9097dc532dcc38027a7e3ca155

14 files changed, 14 insertions, 14 deletions

diff --git a/trove/extensions/mgmt/datastores/service.py b/trove/extensions/mgmt/datastores/service.py
index 7154d596..23643ae0 100644
--- a/trove/extensions/mgmt/datastores/service.py
+++ b/trove/extensions/mgmt/datastores/service.py
@@ -16,7 +16,7 @@
 from glanceclient import exc as glance_exceptions
 from oslo_log import log as logging
 
-from trove.common import apischema as apischema
+from trove.common import apischema
 from trove.common.auth import admin_context
 from trove.common import exception
 from trove.common import glance_remote
diff --git a/trove/guestagent/datastore/experimental/couchbase/service.py b/trove/guestagent/datastore/experimental/couchbase/service.py
index d33bed75..3d1b06d0 100644
--- a/trove/guestagent/datastore/experimental/couchbase/service.py
+++ b/trove/guestagent/datastore/experimental/couchbase/service.py
@@ -29,7 +29,7 @@ from trove.common.db import models
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import instance as rd_instance
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.experimental.couchbase import system
 from trove.guestagent.datastore import service
diff --git a/trove/guestagent/datastore/experimental/couchdb/service.py b/trove/guestagent/datastore/experimental/couchdb/service.py
index 534c1766..fcadb124 100644
--- a/trove/guestagent/datastore/experimental/couchdb/service.py
+++ b/trove/guestagent/datastore/experimental/couchdb/service.py
@@ -25,7 +25,7 @@ from trove.common.i18n import _
 from trove.common import instance as rd_instance
 from trove.common import pagination
 from trove.common.stream_codecs import JsonCodec
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common import operating_system
 from trove.guestagent.common.operating_system import FileMode
 from trove.guestagent.datastore.experimental.couchdb import system
diff --git a/trove/guestagent/datastore/experimental/db2/service.py b/trove/guestagent/datastore/experimental/db2/service.py
index 8bca135f..b2935cf3 100644
--- a/trove/guestagent/datastore/experimental/db2/service.py
+++ b/trove/guestagent/datastore/experimental/db2/service.py
@@ -24,7 +24,7 @@ from trove.common import exception
 from trove.common.i18n import _
 from trove.common import instance as rd_instance
 from trove.common.stream_codecs import PropertiesCodec
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common.configuration import ConfigurationManager
 from trove.guestagent.common.configuration import ImportOverrideStrategy
 from trove.guestagent.common import guestagent_utils
diff --git a/trove/guestagent/datastore/experimental/mongodb/service.py b/trove/guestagent/datastore/experimental/mongodb/service.py
index 50f985a9..8a9c9f5a 100644
--- a/trove/guestagent/datastore/experimental/mongodb/service.py
+++ b/trove/guestagent/datastore/experimental/mongodb/service.py
@@ -25,7 +25,7 @@ from trove.common import exception
 from trove.common.i18n import _
 from trove.common import instance as ds_instance
 from trove.common.stream_codecs import JsonCodec, SafeYamlCodec
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common.configuration import ConfigurationManager
 from trove.guestagent.common.configuration import OneFileOverrideStrategy
 from trove.guestagent.common import guestagent_utils
diff --git a/trove/guestagent/datastore/experimental/redis/service.py b/trove/guestagent/datastore/experimental/redis/service.py
index d2e1f542..bcfed683 100644
--- a/trove/guestagent/datastore/experimental/redis/service.py
+++ b/trove/guestagent/datastore/experimental/redis/service.py
@@ -24,7 +24,7 @@ from trove.common import exception
 from trove.common.i18n import _
 from trove.common import instance as rd_instance
 from trove.common.stream_codecs import PropertiesCodec, StringConverter
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common.configuration import ConfigurationManager
 from trove.guestagent.common.configuration import OneFileOverrideStrategy
 from trove.guestagent.common import guestagent_utils
diff --git a/trove/guestagent/datastore/experimental/vertica/service.py b/trove/guestagent/datastore/experimental/vertica/service.py
index 9a09e695..77b0f0f8 100644
--- a/trove/guestagent/datastore/experimental/vertica/service.py
+++ b/trove/guestagent/datastore/experimental/vertica/service.py
@@ -26,7 +26,7 @@ from trove.common.i18n import _
 from trove.common.i18n import _LI
 from trove.common import instance as rd_instance
 from trove.common.stream_codecs import PropertiesCodec
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common.configuration import ConfigurationManager
 from trove.guestagent.common.configuration import ImportOverrideStrategy
 from trove.guestagent.common import guestagent_utils
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py
index 49c3d4ab..5eeef9d4 100644
--- a/trove/guestagent/datastore/mysql_common/service.py
+++ b/trove/guestagent/datastore/mysql_common/service.py
@@ -40,7 +40,7 @@ from trove.common.exception import PollTimeOut
 from trove.common.i18n import _
 from trove.common import instance as rd_instance
 from trove.common.stream_codecs import IniCodec
-from trove.common import utils as utils
+from trove.common import utils
 from trove.guestagent.common.configuration import ConfigurationManager
 from trove.guestagent.common.configuration import ImportOverrideStrategy
 from trove.guestagent.common import guestagent_utils
diff --git a/trove/tests/api/instances_resize.py b/trove/tests/api/instances_resize.py
index 24f5cba3..aef79123 100644
--- a/trove/tests/api/instances_resize.py
+++ b/trove/tests/api/instances_resize.py
@@ -30,7 +30,7 @@ from trove.guestagent import api as guest
 from trove.instance.models import DBInstance
 from trove.instance.models import InstanceServiceStatus
 from trove.instance.tasks import InstanceTasks
-from trove.taskmanager import models as models
+from trove.taskmanager import models
 from trove.tests.fakes import nova
 from trove.tests.unittests import trove_testtools
 from trove.tests.util import test_config
diff --git a/trove/tests/unittests/guestagent/test_cassandra_manager.py b/trove/tests/unittests/guestagent/test_cassandra_manager.py
index 36429b75..24affccc 100644
--- a/trove/tests/unittests/guestagent/test_cassandra_manager.py
+++ b/trove/tests/unittests/guestagent/test_cassandra_manager.py
@@ -36,7 +36,7 @@ from trove.guestagent.datastore.experimental.cassandra import (
     manager as cass_manager)
 from trove.guestagent.datastore.experimental.cassandra import (
     service as cass_service)
-from trove.guestagent import pkg as pkg
+from trove.guestagent import pkg
 from trove.guestagent import volume
 from trove.tests.unittests.guestagent.test_datastore_manager import \
     DatastoreManagerTest
diff --git a/trove/tests/unittests/guestagent/test_couchdb_manager.py b/trove/tests/unittests/guestagent/test_couchdb_manager.py
index b41ad7fa..775f5d0a 100644
--- a/trove/tests/unittests/guestagent/test_couchdb_manager.py
+++ b/trove/tests/unittests/guestagent/test_couchdb_manager.py
@@ -25,7 +25,7 @@ from trove.guestagent.datastore.experimental.couchdb import (
     manager as couchdb_manager)
 from trove.guestagent.datastore.experimental.couchdb import (
     service as couchdb_service)
-from trove.guestagent import pkg as pkg
+from trove.guestagent import pkg
 from trove.guestagent import volume
 from trove.tests.unittests.guestagent.test_datastore_manager import \
     DatastoreManagerTest
diff --git a/trove/tests/unittests/guestagent/test_db2_manager.py b/trove/tests/unittests/guestagent/test_db2_manager.py
index 6a8b8f9b..e55c4316 100644
--- a/trove/tests/unittests/guestagent/test_db2_manager.py
+++ b/trove/tests/unittests/guestagent/test_db2_manager.py
@@ -26,7 +26,7 @@ from trove.guestagent.datastore.experimental.db2 import (
     manager as db2_manager)
 from trove.guestagent.datastore.experimental.db2 import (
     service as db2_service)
-from trove.guestagent import pkg as pkg
+from trove.guestagent import pkg
 from trove.guestagent import volume
 from trove.tests.unittests.guestagent.test_datastore_manager import \
     DatastoreManagerTest
diff --git a/trove/tests/unittests/guestagent/test_mysql_manager.py b/trove/tests/unittests/guestagent/test_mysql_manager.py
index 1355420a..516c4e9e 100644
--- a/trove/tests/unittests/guestagent/test_mysql_manager.py
+++ b/trove/tests/unittests/guestagent/test_mysql_manager.py
@@ -31,7 +31,7 @@ from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.mysql.manager import Manager
 import trove.guestagent.datastore.mysql.service as dbaas
 from trove.guestagent import dbaas as base_dbaas
-from trove.guestagent import pkg as pkg
+from trove.guestagent import pkg
 from trove.guestagent import volume
 from trove.guestagent.volume import VolumeDevice
 from trove.tests.unittests.guestagent.test_datastore_manager import \
diff --git a/trove/tests/util/__init__.py b/trove/tests/util/__init__.py
index da83461f..a8d64068 100644
--- a/trove/tests/util/__init__.py
+++ b/trove/tests/util/__init__.py
@@ -41,7 +41,7 @@ from trove.common import cfg
 from trove.common.utils import import_class
 from trove.common.utils import import_object
 from trove.tests.config import CONFIG as test_config
-from trove.tests.util.client import TestClient as TestClient
+from trove.tests.util.client import TestClient
 from trove.tests.util import test_config as CONFIG
 from trove.tests.util.users import Requirements