Browse Source

Use oslo_log instead of oslo-incubator code

Code from manila/openstack/common/log.py duplicates code
from oslo_log, so we use oslo_log instead of oslo-incubator
log.py module.

Change-Id: I0e4c5833d20ce76a9cf7f2ed2293007d6048ff08
changes/72/175772/3
Julia Varlamova 7 years ago
parent
commit
c8a06f808d
  1. 9
      manila/db/migrations/alembic/versions/38e632621e5a_change_volume_type_to_share_type.py
  2. 4
      manila/network/standalone_network_plugin.py
  3. 4
      manila/share/drivers/hdfs/hdfs_native.py
  4. 2
      manila/share/drivers/hp/hp_3par_driver.py
  5. 4
      manila/share/drivers/hp/hp_3par_mediator.py

9
manila/db/migrations/alembic/versions/38e632621e5a_change_volume_type_to_share_type.py

@ -25,15 +25,14 @@ revision = '38e632621e5a'
down_revision = '211836bf835c'
from alembic import op
from manila.i18n import _LI
from manila.openstack.common import log as logging
from oslo_log import log
from oslo_utils import strutils
import sqlalchemy as sa
from sqlalchemy.sql import table
LOG = logging.getLogger(__name__)
from manila.i18n import _LI
LOG = log.getLogger(__name__)
def upgrade():

4
manila/network/standalone_network_plugin.py

@ -15,13 +15,13 @@
import netaddr
from oslo_config import cfg
from oslo_log import log
import six
from manila.common import constants
from manila import exception
from manila.i18n import _
from manila import network
from manila.openstack.common import log as logging
from manila import utils
standalone_network_plugin_opts = [
@ -59,7 +59,7 @@ standalone_network_plugin_opts = [
]
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
LOG = log.getLogger(__name__)
class StandaloneNetworkPlugin(network.NetworkBaseAPI):

4
manila/share/drivers/hdfs/hdfs_native.py

@ -32,16 +32,16 @@ import socket
from oslo_concurrency import processutils
from oslo_config import cfg
from oslo_log import log
from oslo_utils import units
import six
from manila import exception
from manila.i18n import _
from manila.openstack.common import log as logging
from manila.share import driver
from manila import utils
LOG = logging.getLogger(__name__)
LOG = log.getLogger(__name__)
hdfs_native_share_opts = [
cfg.StrOpt('hdfs_namenode_ip',

2
manila/share/drivers/hp/hp_3par_driver.py

@ -20,12 +20,12 @@ import logging
import os
from oslo_config import cfg
from oslo_log import log
import six
from manila import exception
from manila.i18n import _
from manila.i18n import _LI
from manila.openstack.common import log
from manila.share import driver
from manila.share.drivers.hp import hp_3par_mediator

4
manila/share/drivers/hp/hp_3par_mediator.py

@ -18,20 +18,20 @@ This 'mediator' de-couples the 3PAR focused client from the OpenStack focused
driver.
"""
from oslo_log import log
from oslo_utils import importutils
from oslo_utils import units
import six
from manila import exception
from manila.i18n import _
from manila.openstack.common import log as logging
hp3parclient = importutils.try_import("hp3parclient")
if hp3parclient:
from hp3parclient import file_client
LOG = logging.getLogger(__name__)
LOG = log.getLogger(__name__)
DENY = '-'
ALLOW = '+'
OPEN_STACK_MANILA_FSHARE = 'OpenStack Manila fshare'

Loading…
Cancel
Save