Merge "Remove cfg and logging import unused"

26 files changed, 0 insertions, 75 deletions

diff --git a/trove/backup/service.py b/trove/backup/service.py
index 56a60c71..4d505f54 100644
--- a/trove/backup/service.py
+++ b/trove/backup/service.py
@@ -18,14 +18,12 @@ from oslo_log import log as logging
 from trove.backup.models import Backup
 from trove.backup import views
 from trove.common import apischema
-from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import notification
 from trove.common.notification import StartNotification
 from trove.common import pagination
 from trove.common import wsgi
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/trove/common/apischema.py b/trove/common/apischema.py
index 5747166f..484e8176 100644
--- a/trove/common/apischema.py
+++ b/trove/common/apischema.py
@@ -13,9 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from trove.common import cfg
-
-CONF = cfg.CONF
 
 url_ref = {
     "type": "string",
diff --git a/trove/common/extensions.py b/trove/common/extensions.py
index 243bf642..1cd8c4f0 100644
--- a/trove/common/extensions.py
+++ b/trove/common/extensions.py
@@ -26,12 +26,10 @@ import webob.exc
 
 from trove.common import base_exception as exception
 from trove.common import base_wsgi
-from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import wsgi
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 DEFAULT_XMLNS = "http://docs.openstack.org/trove"
 XMLNS_ATOM = "http://www.w3.org/2005/Atom"
 
diff --git a/trove/common/server_group.py b/trove/common/server_group.py
index 05bda312..f66f6a2c 100644
--- a/trove/common/server_group.py
+++ b/trove/common/server_group.py
@@ -18,12 +18,10 @@ import six
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common.i18n import _
 from trove.common.remote import create_nova_client
 
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/trove/common/strategies/cluster/experimental/cassandra/guestagent.py b/trove/common/strategies/cluster/experimental/cassandra/guestagent.py
index 60c20271..6bdd8bc2 100644
--- a/trove/common/strategies/cluster/experimental/cassandra/guestagent.py
+++ b/trove/common/strategies/cluster/experimental/cassandra/guestagent.py
@@ -15,13 +15,11 @@
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common.strategies.cluster import base
 from trove.guestagent import api as guest_api
 
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 
 
 class CassandraGuestAgentStrategy(base.BaseGuestAgentStrategy):
diff --git a/trove/common/strategies/cluster/experimental/redis/guestagent.py b/trove/common/strategies/cluster/experimental/redis/guestagent.py
index 41417747..d8ec3f3b 100644
--- a/trove/common/strategies/cluster/experimental/redis/guestagent.py
+++ b/trove/common/strategies/cluster/experimental/redis/guestagent.py
@@ -13,13 +13,11 @@
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common.strategies.cluster import base
 from trove.guestagent import api as guest_api
 
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 
 
 class RedisGuestAgentStrategy(base.BaseGuestAgentStrategy):
diff --git a/trove/extensions/common/models.py b/trove/extensions/common/models.py
index e3b14dc5..1b1a97e2 100644
--- a/trove/extensions/common/models.py
+++ b/trove/extensions/common/models.py
@@ -15,7 +15,6 @@
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common import exception
 from trove.common.remote import create_guest_client
 from trove.common import utils
@@ -24,7 +23,6 @@ from trove.guestagent.db import models as guest_models
 from trove.instance import models as base_models
 
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/trove/guestagent/datastore/experimental/postgresql/service/root.py b/trove/guestagent/datastore/experimental/postgresql/service/root.py
index 8316dd02..068bc777 100644
--- a/trove/guestagent/datastore/experimental/postgresql/service/root.py
+++ b/trove/guestagent/datastore/experimental/postgresql/service/root.py
@@ -13,14 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove.common import cfg
 from trove.guestagent.datastore.experimental.postgresql import pgutil
 from trove.guestagent.datastore.experimental.postgresql.service.users import (
     PgSqlUsers)
 from trove.guestagent.db import models
 
-CONF = cfg.CONF
-
 
 class PgSqlRoot(PgSqlUsers):
     """Mixin that provides the root-enable API."""
diff --git a/trove/guestagent/datastore/experimental/pxc/service.py b/trove/guestagent/datastore/experimental/pxc/service.py
index 5fbc37f6..8b9ed091 100644
--- a/trove/guestagent/datastore/experimental/pxc/service.py
+++ b/trove/guestagent/datastore/experimental/pxc/service.py
@@ -14,16 +14,9 @@
 #    under the License.
 #
 
-from oslo_log import log as logging
-
-from trove.common import cfg
 from trove.guestagent.datastore.galera_common import service as galera_service
 from trove.guestagent.datastore.mysql_common import service as mysql_service
 
-LOG = logging.getLogger(__name__)
-
-CONF = cfg.CONF
-
 
 class PXCApp(galera_service.GaleraApp):
 
diff --git a/trove/guestagent/module/drivers/module_driver.py b/trove/guestagent/module/drivers/module_driver.py
index 650cf3c6..e758c2a7 100644
--- a/trove/guestagent/module/drivers/module_driver.py
+++ b/trove/guestagent/module/drivers/module_driver.py
@@ -21,13 +21,11 @@ import six
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/trove/guestagent/module/drivers/new_relic_license_driver.py b/trove/guestagent/module/drivers/new_relic_license_driver.py
index a9a7670b..a954cfab 100644
--- a/trove/guestagent/module/drivers/new_relic_license_driver.py
+++ b/trove/guestagent/module/drivers/new_relic_license_driver.py
@@ -18,7 +18,6 @@ from datetime import date
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import stream_codecs
 from trove.common import utils
@@ -27,7 +26,6 @@ from trove.guestagent.module.drivers import module_driver
 
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 
 
 NR_ADD_LICENSE_CMD = ['nrsysmond-config', '--set', 'license_key=%s']
diff --git a/trove/guestagent/module/drivers/ping_driver.py b/trove/guestagent/module/drivers/ping_driver.py
index c842ce42..7738bc8c 100644
--- a/trove/guestagent/module/drivers/ping_driver.py
+++ b/trove/guestagent/module/drivers/ping_driver.py
@@ -16,19 +16,12 @@
 
 from datetime import date
 
-from oslo_log import log as logging
-
-from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import stream_codecs
 from trove.guestagent.common import operating_system
 from trove.guestagent.module.drivers import module_driver
 
 
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
-
-
 class PingDriver(module_driver.ModuleDriver):
     """Concrete module to show implementation and functionality. Responds
     like an actual module driver, but does nothing except return the
diff --git a/trove/guestagent/module/module_manager.py b/trove/guestagent/module/module_manager.py
index 37aa9da7..28de671d 100644
--- a/trove/guestagent/module/module_manager.py
+++ b/trove/guestagent/module/module_manager.py
@@ -19,7 +19,6 @@ import os
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import stream_codecs
@@ -28,7 +27,6 @@ from trove.guestagent.common import operating_system
 
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 
 
 class ModuleManager(object):
diff --git a/trove/guestagent/strategies/replication/experimental/redis_sync.py b/trove/guestagent/strategies/replication/experimental/redis_sync.py
index 3eb95524..ae3fbadb 100644
--- a/trove/guestagent/strategies/replication/experimental/redis_sync.py
+++ b/trove/guestagent/strategies/replication/experimental/redis_sync.py
@@ -17,11 +17,8 @@
 from oslo_log import log as logging
 from oslo_utils import netutils
 
-from trove.common import cfg
 from trove.guestagent.strategies.replication import base
 
-CONF = cfg.CONF
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/trove/guestagent/strategies/replication/mysql_binlog.py b/trove/guestagent/strategies/replication/mysql_binlog.py
index 409a08cb..c3c4b5f1 100644
--- a/trove/guestagent/strategies/replication/mysql_binlog.py
+++ b/trove/guestagent/strategies/replication/mysql_binlog.py
@@ -18,7 +18,6 @@ import csv
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 from trove.guestagent.backup.backupagent import BackupAgent
@@ -28,7 +27,6 @@ from trove.guestagent.datastore.mysql.service import MySqlApp
 from trove.guestagent.strategies.replication import mysql_base
 
 AGENT = BackupAgent()
-CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
 
diff --git a/trove/guestagent/strategies/replication/mysql_gtid.py b/trove/guestagent/strategies/replication/mysql_gtid.py
index b60c95a2..67ae7376 100644
--- a/trove/guestagent/strategies/replication/mysql_gtid.py
+++ b/trove/guestagent/strategies/replication/mysql_gtid.py
@@ -15,7 +15,6 @@
 #
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 from trove.guestagent.backup.backupagent import BackupAgent
@@ -25,7 +24,6 @@ from trove.guestagent.datastore.mysql.service import MySqlApp
 from trove.guestagent.strategies.replication import mysql_base
 
 AGENT = BackupAgent()
-CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
 
diff --git a/trove/instance/service.py b/trove/instance/service.py
index ebf92181..7c819da1 100644
--- a/trove/instance/service.py
+++ b/trove/instance/service.py
@@ -20,7 +20,6 @@ import webob.exc
 from trove.backup.models import Backup as backup_model
 from trove.backup import views as backup_views
 import trove.common.apischema as apischema
-from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common.i18n import _LI
@@ -38,7 +37,6 @@ from trove.module import models as module_models
 from trove.module import views as module_views
 
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/trove/instance/views.py b/trove/instance/views.py
index 83f96d58..cb383dc5 100644
--- a/trove/instance/views.py
+++ b/trove/instance/views.py
@@ -15,12 +15,10 @@
 
 from oslo_log import log as logging
 
-from trove.common import cfg
 from trove.common.views import create_links
 from trove.instance import models
 
 LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
 
 
 class InstanceView(object):
diff --git a/trove/module/service.py b/trove/module/service.py
index f609454e..555fee5d 100644
--- a/trove/module/service.py
+++ b/trove/module/service.py
@@ -19,7 +19,6 @@ import copy
 from oslo_log import log as logging
 
 import trove.common.apischema as apischema
-from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import pagination
@@ -31,7 +30,6 @@ from trove.module import models
 from trove.module import views
 
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/trove/tests/fakes/common.py b/trove/tests/fakes/common.py
index 46a8bf32..d96ac8e9 100644
--- a/trove/tests/fakes/common.py
+++ b/trove/tests/fakes/common.py
@@ -17,11 +17,6 @@
 
 from novaclient import exceptions as nova_exceptions
 
-from trove.common import cfg
-
-
-CONF = cfg.CONF
-
 
 def authorize(context):
     if not context.is_admin:
diff --git a/trove/tests/scenario/runners/cluster_actions_runners.py b/trove/tests/scenario/runners/cluster_actions_runners.py
index 61b2b24a..ad863870 100644
--- a/trove/tests/scenario/runners/cluster_actions_runners.py
+++ b/trove/tests/scenario/runners/cluster_actions_runners.py
@@ -19,7 +19,6 @@ from proboscis import SkipTest
 import six
 import time as timer
 
-from trove.common import cfg
 from trove.common import exception
 from trove.common.utils import poll_until
 from trove.tests.scenario.helpers.test_helper import DataType
@@ -28,9 +27,6 @@ from trove.tests.util.check import TypeCheck
 from troveclient.compat import exceptions
 
 
-CONF = cfg.CONF
-
-
 class ClusterActionsRunner(TestRunner):
 
     USE_CLUSTER_ID_FLAG = 'TESTS_USE_CLUSTER_ID'
diff --git a/trove/tests/unittests/cluster/test_cluster_views.py b/trove/tests/unittests/cluster/test_cluster_views.py
index d0549795..45a2127c 100644
--- a/trove/tests/unittests/cluster/test_cluster_views.py
+++ b/trove/tests/unittests/cluster/test_cluster_views.py
@@ -21,13 +21,10 @@ from mock import patch
 from trove.cluster.views import ClusterInstanceDetailView
 from trove.cluster.views import ClusterView
 from trove.cluster.views import load_view
-from trove.common import cfg
 from trove.common.strategies.cluster.experimental.mongodb.api import (
     MongoDbClusterView)
 from trove.tests.unittests import trove_testtools
 
-CONF = cfg.CONF
-
 
 class ClusterViewTest(trove_testtools.TestCase):
 
diff --git a/trove/tests/unittests/cluster/test_galera_cluster.py b/trove/tests/unittests/cluster/test_galera_cluster.py
index 346a547d..c2dcab2a 100644
--- a/trove/tests/unittests/cluster/test_galera_cluster.py
+++ b/trove/tests/unittests/cluster/test_galera_cluster.py
@@ -21,7 +21,6 @@ from novaclient import exceptions as nova_exceptions
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks
 from trove.cluster.models import DBCluster
-from trove.common import cfg
 from trove.common import exception
 from trove.common import remote
 from trove.common.strategies.cluster.experimental.galera_common import (
@@ -31,8 +30,6 @@ from trove.quota.quota import QUOTAS
 from trove.taskmanager import api as task_api
 from trove.tests.unittests import trove_testtools
 
-CONF = cfg.CONF
-
 
 class FakeOptGroup(object):
     def __init__(self, min_cluster_member_count=3,
diff --git a/trove/tests/unittests/cluster/test_redis_cluster.py b/trove/tests/unittests/cluster/test_redis_cluster.py
index 9d0a9f03..28964f54 100644
--- a/trove/tests/unittests/cluster/test_redis_cluster.py
+++ b/trove/tests/unittests/cluster/test_redis_cluster.py
@@ -19,7 +19,6 @@ from novaclient import exceptions as nova_exceptions
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks
 from trove.cluster.models import DBCluster
-from trove.common import cfg
 from trove.common import exception
 from trove.common import remote
 from trove.common.strategies.cluster.experimental.redis import api as redis_api
@@ -30,8 +29,6 @@ from trove.quota.quota import QUOTAS
 from trove.taskmanager import api as task_api
 from trove.tests.unittests import trove_testtools
 
-CONF = cfg.CONF
-
 
 class FakeOptGroup(object):
     def __init__(self, cluster_member_count=3,
diff --git a/trove/tests/unittests/cluster/test_vertica_cluster.py b/trove/tests/unittests/cluster/test_vertica_cluster.py
index 7ad7b194..37bf911d 100644
--- a/trove/tests/unittests/cluster/test_vertica_cluster.py
+++ b/trove/tests/unittests/cluster/test_vertica_cluster.py
@@ -19,7 +19,6 @@ from novaclient import exceptions as nova_exceptions
 from trove.cluster.models import Cluster
 from trove.cluster.models import ClusterTasks
 from trove.cluster.models import DBCluster
-from trove.common import cfg
 from trove.common import exception
 from trove.common import remote
 from trove.common.strategies.cluster.experimental.vertica import (
@@ -29,8 +28,6 @@ from trove.quota.quota import QUOTAS
 from trove.taskmanager import api as task_api
 from trove.tests.unittests import trove_testtools
 
-CONF = cfg.CONF
-
 
 class FakeOptGroup(object):
     def __init__(self, cluster_member_count=3,
diff --git a/trove/tests/unittests/module/test_module_models.py b/trove/tests/unittests/module/test_module_models.py
index bc30e794..a4d608b2 100644
--- a/trove/tests/unittests/module/test_module_models.py
+++ b/trove/tests/unittests/module/test_module_models.py
@@ -16,14 +16,11 @@
 
 from mock import Mock, patch
 
-from trove.common import cfg
 from trove.module import models
 from trove.taskmanager import api as task_api
 from trove.tests.unittests import trove_testtools
 from trove.tests.unittests.util import util
 
-CONF = cfg.CONF
-
 
 class CreateModuleTest(trove_testtools.TestCase):