Merge "Trivial: Remove unused logging import"

This commit is contained in:
Jenkins
2016-05-12 18:52:43 +00:00
committed by Gerrit Code Review
25 changed files with 0 additions and 85 deletions
-3
View File
@@ -21,13 +21,10 @@ context or provide additional information in their specific WSGI pipeline.
"""
from oslo_context import context
from oslo_log import log as logging
from trove.common import local
from trove.common.serializable_notification import SerializableNotification
LOG = logging.getLogger(__name__)
class TroveContext(context.RequestContext):
"""
-2
View File
@@ -16,7 +16,6 @@
from trove.common import cfg
from trove.common.remote import normalize_url
import trove.openstack.common.log as logging
from cinderclient.v2 import client as CinderClient
from neutronclient.v2_0 import client as NeutronClient
@@ -51,7 +50,6 @@ remote_neutron_client = \
"""
PROXY_AUTH_URL = CONF.trove_auth_url
LOG = logging.getLogger(__name__)
def nova_client_trove_admin(context=None):
-4
View File
@@ -12,12 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo_log import log as logging
from trove.db import get_db_api
LOG = logging.getLogger(__name__)
def persisted_models():
return {'conductor_lastseen': LastSeen}
-4
View File
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
LOG = logging.getLogger(__name__)
class ConfigurationView(object):
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from sqlalchemy import ForeignKey
from sqlalchemy.schema import Column
from sqlalchemy.schema import MetaData
@@ -27,8 +26,6 @@ from trove.db.sqlalchemy.migrate_repo.schema import Table
from trove.db.sqlalchemy import utils as db_utils
logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
meta = MetaData()
configurations = Table(
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from sqlalchemy import ForeignKey
from sqlalchemy.schema import Column
from sqlalchemy.schema import Index
@@ -29,8 +28,6 @@ from trove.db.sqlalchemy.migrate_repo.schema import Table
from trove.db.sqlalchemy import utils as db_utils
logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
meta = MetaData()
clusters = Table(
-3
View File
@@ -13,14 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import cfg
from trove.common import exception
from trove.extensions.common.service import ClusterRootController
from trove.instance.models import DBInstance
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
MANAGER = CONF.datastore_manager if CONF.datastore_manager else 'mongodb'
-3
View File
@@ -17,8 +17,6 @@
Model classes that extend the instances functionality for MySQL instances.
"""
from oslo_log import log as logging
from trove.common import cfg
from trove.common import exception
from trove.common.notification import StartNotification
@@ -29,7 +27,6 @@ from trove.extensions.common.models import RootHistory
from trove.guestagent.db import models as guest_models
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
def persisted_models():
-3
View File
@@ -13,13 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import cfg
from trove.common import exception
from trove.extensions.common.service import ClusterRootController
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
MANAGER = CONF.datastore_manager if CONF.datastore_manager else 'pxc'
-5
View File
@@ -13,15 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import extensions
from trove.extensions.account import service
LOG = logging.getLogger(__name__)
class Account(extensions.ExtensionDescriptor):
def get_name(self):
-4
View File
@@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import extensions
from trove.extensions.mgmt.clusters.service import MgmtClusterController
from trove.extensions.mgmt.configuration import service as conf_service
@@ -26,8 +24,6 @@ from trove.extensions.mgmt.quota.service import QuotaController
from trove.extensions.mgmt.upgrade.service import UpgradeController
from trove.extensions.mgmt.volume.service import StorageController
LOG = logging.getLogger(__name__)
class Mgmt(extensions.ExtensionDescriptor):
-4
View File
@@ -13,14 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import extensions
from trove.extensions.common import service as common_service
from trove.extensions.mysql import service as mysql_service
LOG = logging.getLogger(__name__)
class Mysql(extensions.ExtensionDescriptor):
@@ -14,15 +14,11 @@
# under the License.
#
from oslo_log import log as logging
from trove.common import cfg
from trove.common import extensions
from trove.extensions.security_group import service
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
-4
View File
@@ -16,10 +16,6 @@
import os
from oslo_log import log as logging
LOG = logging.getLogger(__name__)
def _base_url(req):
return req.application_url
-3
View File
@@ -13,14 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import cfg
from trove.common import exception
from trove.extensions.common.service import ClusterRootController
from trove.instance.models import DBInstance
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
MANAGER = CONF.datastore_manager if CONF.datastore_manager else 'vertica'
@@ -13,13 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
import psycopg2
from trove.common import exception
LOG = logging.getLogger(__name__)
PG_ADMIN = 'os_admin'
@@ -15,8 +15,6 @@
import os
from oslo_log import log as logging
from trove.common import cfg
from trove.guestagent.common import operating_system
from trove.guestagent.datastore.experimental.postgresql.service.status import (
@@ -24,7 +22,6 @@ from trove.guestagent.datastore.experimental.postgresql.service.status import (
from trove.guestagent import guest_log
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
@@ -13,15 +13,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.common import cfg
from trove.common import utils
from trove.guestagent.datastore.experimental.postgresql import pgutil
from trove.guestagent.datastore.experimental.postgresql.service.users import (
PgSqlUsers)
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
@@ -17,12 +17,9 @@
import abc
import six
from oslo_log import log as logging
from trove.common import cfg
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
@@ -13,12 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from trove.guestagent.strategies.backup import base
LOG = logging.getLogger(__name__)
class PgDump(base.BackupRunner):
"""Implementation of Backup Strategy for pg_dump."""
@@ -15,7 +15,6 @@
# under the License.
#
from oslo_log import log as logging
from oslo_utils import netutils
from trove.common import cfg
@@ -26,7 +25,6 @@ from trove.guestagent.datastore.experimental.mongodb import (
from trove.guestagent.strategies.restore import base
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
IP = netutils.get_my_ipv4()
LARGE_TIMEOUT = 1200
MONGODB_DBPATH = CONF.mongodb.mount_point
-4
View File
@@ -14,13 +14,9 @@
# under the License.
#
from oslo_log import log as logging
from trove.datastore import models as datastore_models
from trove.module import models
LOG = logging.getLogger(__name__)
class ModuleView(object):
-4
View File
@@ -13,14 +13,10 @@
# under the License.
from oslo_log import log as logging
from trove.common import cfg
from trove.common import utils
from trove.db import models as dbmodels
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
-5
View File
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
LOG = logging.getLogger(__name__)
class TaskService(object):
"""Task Manager interface."""
-2
View File
@@ -16,13 +16,11 @@
"""Common code to help in faking the models."""
from novaclient import exceptions as nova_exceptions
from oslo_log import log as logging
from trove.common import cfg
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
def authorize(context):