Merge "TrivialFix: Remove logging import unused"

designate/api/admin/app.py

@@ -16,13 +16,10 @@
 import pecan
 import pecan.deploy
 from oslo_config import cfg
-from oslo_log import log as logging
 
 from designate.api.v2 import patches
 
 
-LOG = logging.getLogger(__name__)
-
 cfg.CONF.register_opts([
     cfg.BoolOpt('pecan_debug', default=False,
                 help='Pecan HTML Debug Interface'),

designate/api/v1/extensions/diagnostics.py

@@ -15,12 +15,10 @@
 # under the License.
 import flask
 import oslo_messaging as messaging
-from oslo_log import log as logging
 
 from designate import rpc
 
 
-LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('diagnostics', __name__)
 
 

designate/api/v1/extensions/quotas.py

@@ -14,12 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-from oslo_log import log as logging
 
 from designate.central import rpcapi as central_rpcapi
 
 
-LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('quotas', __name__)
 

designate/api/v1/extensions/reports.py

@@ -14,12 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-from oslo_log import log as logging
 
 from designate.central import rpcapi as central_rpcapi
 
 
-LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('reports', __name__)
 

designate/api/v1/extensions/sync.py

@@ -14,12 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-from oslo_log import log as logging
 
 from designate.central import rpcapi as central_rpcapi
 
 
-LOG = logging.getLogger(__name__)
 central_api = central_rpcapi.CentralAPI()
 blueprint = flask.Blueprint('sync', __name__)
 

designate/api/v1/limits.py

@@ -14,13 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import flask
-from oslo_log import log as logging
 
 from designate import schema
 from designate.central import rpcapi as central_rpcapi
 
 
-LOG = logging.getLogger(__name__)
 blueprint = flask.Blueprint('limits', __name__)
 limits_schema = schema.Schema('v1', 'limits')
 

designate/api/v2/app.py

@@ -16,13 +16,10 @@
 import pecan
 import pecan.deploy
 from oslo_config import cfg
-from oslo_log import log as logging
 
 from designate.api.v2 import patches
 
 
-LOG = logging.getLogger(__name__)
-
 cfg.CONF.register_opts([
     cfg.BoolOpt('pecan_debug', default=False,
                 help='Pecan HTML Debug Interface'),

designate/api/v2/controllers/errors.py

@@ -15,12 +15,9 @@
 # under the License.
 
 from pecan import expose
-from oslo_log import log as logging
 
 from designate import exceptions
 
-LOG = logging.getLogger(__name__)
-
 
 class ErrorsController(object):
 

designate/api/v2/controllers/limits.py

@@ -15,13 +15,11 @@
 # under the License.
 
 import pecan
-from oslo_log import log as logging
 from oslo_config import cfg
 
 from designate.api.v2.controllers import rest
 
 
-LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 

designate/api/v2/controllers/rest.py

@@ -29,7 +29,6 @@ import inspect
 import pecan
 import pecan.rest
 import pecan.routing
-from oslo_log import log as logging
 
 from designate import exceptions
 from designate.central import rpcapi as central_rpcapi
@@ -37,9 +36,6 @@ from designate.pool_manager import rpcapi as pool_mgr_rpcapi
 from designate.i18n import _
 
 
-LOG = logging.getLogger(__name__)
-
-
 class RestController(pecan.rest.RestController):
     """
     Extension for Pecan's RestController to better handle POST/PUT/PATCH

designate/api/v2/controllers/root.py

@@ -14,7 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo_config import cfg
-from oslo_log import log as logging
 from stevedore import named
 
 from designate.api.v2.controllers import limits
@@ -29,8 +28,6 @@ from designate.api.v2.controllers import tsigkeys
 from designate.api.v2.controllers import recordsets
 from designate.api.v2.controllers import quotas
 
-LOG = logging.getLogger(__name__)
-
 
 class RootController(object):
     """

designate/api/v2/controllers/service_status.py

@@ -13,14 +13,11 @@
 # under the License.
 
 import pecan
-from oslo_log import log as logging
 
 from designate import utils
 from designate.api.v2.controllers import rest
 from designate.objects.adapters import DesignateAdapter
 
-LOG = logging.getLogger(__name__)
-
 
 class ServiceStatusController(rest.RestController):
     SORT_KEYS = ['created_at', 'id', 'updated_at', 'hostname', 'service_name',

designate/api/v2/patches.py

@@ -18,13 +18,11 @@ from inspect import getargspec
 
 import six
 from oslo_serialization import jsonutils
-from oslo_log import log as logging
 import pecan.core
 
 from designate import exceptions
 
 JSON_TYPES = ('application/json', 'application/json-patch+json')
-LOG = logging.getLogger(__name__)
 
 
 class Request(pecan.core.Request):

designate/backend/agent_backend/base.py

@@ -15,14 +15,9 @@
 # under the License.
 import abc
 
-from oslo_log import log as logging
-
 from designate.plugin import DriverPlugin
 
 
-LOG = logging.getLogger(__name__)
-
-
 class AgentBackend(DriverPlugin):
     """Base class for backend implementations"""
     __plugin_type__ = 'backend'

designate/backend/impl_infoblox/config.py

@@ -14,9 +14,6 @@
 # under the License.
 
 from oslo_config import cfg
-from oslo_log import log
-
-LOG = log.getLogger(__name__)
 
 
 cfg.CONF.register_group(cfg.OptGroup(

designate/manage/pool_manager_cache.py

@@ -18,15 +18,12 @@ import os
 
 from migrate.versioning import api as versioning_api
 from oslo_config import cfg
-from oslo_log import log as logging
 from oslo_db import exception
 
 from designate.manage import base
 from designate.sqlalchemy import utils
 
 
-LOG = logging.getLogger(__name__)
-
 REPOSITORY = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
                                           'pool_manager',
                                           'cache', 'impl_sqlalchemy',

designate/manage/powerdns.py

@@ -18,14 +18,12 @@ import os
 from migrate.versioning import api as versioning_api
 from oslo_config import cfg
 from oslo_db.sqlalchemy.migration_cli import manager as migration_manager
-from oslo_log import log as logging
 
 from designate.manage import base
 from designate import rpc
 from designate import utils
 from designate.central import rpcapi as central_rpcapi
 
-LOG = logging.getLogger(__name__)
 
 REPOSITORY = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
                                           'backend', 'impl_powerdns',

designate/objects/adapters/api_v1/base.py

@@ -11,12 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters import base
 
-LOG = logging.getLogger(__name__)
-
 
 class APIv1Adapter(base.DesignateAdapter):
 

designate/objects/adapters/api_v2/base.py

@@ -12,14 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from six.moves.urllib import parse
-from oslo_log import log as logging
 from oslo_config import cfg
 
 from designate.objects.adapters import base
 from designate.objects import base as obj_base
 from designate import exceptions
 
-LOG = logging.getLogger(__name__)
 
 cfg.CONF.import_opt('api_base_uri', 'designate.api', group='service:api')
 cfg.CONF.import_opt('enable_host_header', 'designate.api', group='service:api')

designate/objects/adapters/api_v2/blacklist.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class BlacklistAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/floating_ip.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class FloatingIPAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/pool.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/pool_attribute.py

@@ -12,11 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import six
-from oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolAttributeAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/pool_ns_record.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolNsRecordAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/quota.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class QuotaAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/record.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class RecordAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/recordset.py

@@ -11,12 +11,10 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
 from designate import exceptions
-LOG = logging.getLogger(__name__)
 
 
 class RecordSetAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/service_status.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class ServiceStatusAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/tld.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class TldAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/tsigkey.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class TsigKeyAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/validation_error.py

@@ -13,11 +13,8 @@
 #    under the License.
 import re
 
-from oslo_log import log as logging
-
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class NotSpecifiedSential:

designate/objects/adapters/api_v2/zone.py

@@ -11,13 +11,10 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
 
-LOG = logging.getLogger(__name__)
-
 
 class ZoneAPIv2Adapter(base.APIv2Adapter):
 

designate/objects/adapters/api_v2/zone_attribute.py

@@ -12,11 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import six
-from oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class ZoneAttributeAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/zone_export.py

@@ -13,11 +13,9 @@
 # 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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class ZoneExportAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/zone_import.py

@@ -13,11 +13,9 @@
 # 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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class ZoneImportAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/zone_master.py

@@ -11,12 +11,10 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
 from designate import utils
-LOG = logging.getLogger(__name__)
 
 
 class ZoneMasterAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/zone_transfer_accept.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class ZoneTransferAcceptAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/api_v2/zone_transfer_request.py

@@ -11,13 +11,11 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.api_v2 import base
 from designate import objects
 from designate import policy
 from designate import exceptions
-LOG = logging.getLogger(__name__)
 
 
 class ZoneTransferRequestAPIv2Adapter(base.APIv2Adapter):

designate/objects/adapters/yaml/pool_also_notify.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolAlsoNotifyYAMLAdapter(base.YAMLAdapter):

designate/objects/adapters/yaml/pool_attribute.py

@@ -12,11 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import six
-from oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolAttributeYAMLAdapter(base.YAMLAdapter):

designate/objects/adapters/yaml/pool_nameserver.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolNameserverYAMLAdapter(base.YAMLAdapter):

designate/objects/adapters/yaml/pool_ns_record.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolNsRecordYAMLAdapter(base.YAMLAdapter):

designate/objects/adapters/yaml/pool_target.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolTargetYAMLAdapter(base.YAMLAdapter):

designate/objects/adapters/yaml/pool_target_master.py

@@ -11,11 +11,9 @@
 #    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 oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolTargetMasterYAMLAdapter(base.YAMLAdapter):

designate/objects/adapters/yaml/pool_target_option.py

@@ -12,11 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import six
-from oslo_log import log as logging
 
 from designate.objects.adapters.yaml import base
 from designate import objects
-LOG = logging.getLogger(__name__)
 
 
 class PoolTargetOptionYAMLAdapter(base.YAMLAdapter):

designate/schema/format.py

@@ -18,11 +18,8 @@ import re
 import jsonschema
 from jsonschema import compat
 import netaddr
-from oslo_log import log as logging
 
 
-LOG = logging.getLogger(__name__)
-
 # NOTE(kiall): All of the below regular expressions are termined with
 #              "\Z", rather than simply "$" to ensure a string with a
 #              trailing newline is NOT matched. See bug #1471158.

designate/schema/validators.py

@@ -14,13 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from jsonschema import validators
-from oslo_log import log as logging
 
 from designate.schema import _validators
 
 
-LOG = logging.getLogger(__name__)
-
 Draft3Validator = validators.extend(
     validators.Draft3Validator,
     validators={