openstack/cinder
Code Issues Proposed changes

Cleanup unused conf variables

Browse Source 
I noticed in nova that we had a lot of unused conf variables. I
wondered if this was a thing in other projects as well. Turns out
it is.

Change-Id: I2424e32dd4ad61881d9b6a0449e12937ea8151e0
This commit is contained in:
Michael Still 2016-02-16 11:24:43 +11:00
parent 67dd18df5b
commit fdc2c5d86a
20 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/contrib/volume_manage.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import uuidutils from oslo_utils import uuidutils
from webob import exc from webob import exc
@ -28,7 +27,6 @@ from cinder import volume as cinder_volume
from cinder.volume import volume_types from cinder.volume import volume_types
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
CONF = cfg.CONF
authorize = extensions.extension_authorizer('volume', 'volume_manage') authorize = extensions.extension_authorizer('volume', 'volume_manage')

2
cinder/objects/service.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import versionutils from oslo_utils import versionutils
from oslo_versionedobjects import fields from oslo_versionedobjects import fields
@ -24,7 +23,6 @@ from cinder import objects
from cinder.objects import base from cinder.objects import base
from cinder import utils from cinder import utils
CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/objects/volume_attachment.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_versionedobjects import fields from oslo_versionedobjects import fields
@ -20,7 +19,6 @@ from cinder import db
from cinder import objects from cinder import objects
from cinder.objects import base from cinder.objects import base
CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/objects/volume_type.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_versionedobjects import fields from oslo_versionedobjects import fields
@ -22,7 +21,6 @@ from cinder import objects
from cinder.objects import base from cinder.objects import base
from cinder.volume import volume_types from cinder.volume import volume_types
CONF = cfg.CONF
OPTIONAL_FIELDS = ['extra_specs', 'projects'] OPTIONAL_FIELDS = ['extra_specs', 'projects']
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
cinder/replication/api.py
View File

@ -17,7 +17,6 @@ Handles all requests relating to volume replication.
""" """
import functools import functools
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from cinder.db import base from cinder.db import base
@ -28,7 +27,6 @@ from cinder import volume as cinder_volume
from cinder.volume import rpcapi as volume_rpcapi from cinder.volume import rpcapi as volume_rpcapi
from cinder.volume import utils as volume_utils from cinder.volume import utils as volume_utils
CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
cinder/tests/unit/api/contrib/test_volume_actions.py
View File

@ -18,7 +18,6 @@ import json
import uuid import uuid
import mock import mock
from oslo_config import cfg
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import webob import webob
@ -36,8 +35,6 @@ from cinder import volume
from cinder.volume import api as volume_api from cinder.volume import api as volume_api
from cinder.volume import rpcapi as volume_rpcapi from cinder.volume import rpcapi as volume_rpcapi
CONF = cfg.CONF
class VolumeActionsTest(test.TestCase): class VolumeActionsTest(test.TestCase):

4
cinder/tests/unit/api/v1/test_snapshot_metadata.py
View File

@ -16,7 +16,6 @@
import uuid import uuid
import mock import mock
from oslo_config import cfg
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import webob import webob
@ -33,9 +32,6 @@ from cinder.tests.unit import fake_volume
from cinder import volume from cinder import volume
CONF = cfg.CONF
def return_create_snapshot_metadata(context, snapshot_id, metadata, delete): def return_create_snapshot_metadata(context, snapshot_id, metadata, delete):
return stub_snapshot_metadata() return stub_snapshot_metadata()

4
cinder/tests/unit/api/v2/test_snapshot_metadata.py
View File

@ -16,7 +16,6 @@
import uuid import uuid
import mock import mock
from oslo_config import cfg
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import webob import webob
@ -33,9 +32,6 @@ from cinder.tests.unit import fake_volume
from cinder import volume from cinder import volume
CONF = cfg.CONF
def return_create_snapshot_metadata(context, snapshot_id, metadata, delete): def return_create_snapshot_metadata(context, snapshot_id, metadata, delete):
return stub_snapshot_metadata() return stub_snapshot_metadata()

3
cinder/tests/unit/backup/drivers/test_backup_glusterfs.py
View File

@ -20,7 +20,6 @@ import os
import mock import mock
from os_brick.remotefs import remotefs as remotefs_brick from os_brick.remotefs import remotefs as remotefs_brick
from oslo_config import cfg
from cinder.backup.drivers import glusterfs from cinder.backup.drivers import glusterfs
from cinder import context from cinder import context
@ -28,8 +27,6 @@ from cinder import exception
from cinder import test from cinder import test
from cinder import utils from cinder import utils
CONF = cfg.CONF
FAKE_BACKUP_MOUNT_POINT_BASE = '/fake/mount-point-base' FAKE_BACKUP_MOUNT_POINT_BASE = '/fake/mount-point-base'
FAKE_HOST = 'fake_host' FAKE_HOST = 'fake_host'
FAKE_VOL_NAME = 'backup_vol' FAKE_VOL_NAME = 'backup_vol'

4
cinder/tests/unit/backup/test_rpcapi.py
View File

@ -19,7 +19,6 @@ Unit Tests for cinder.backup.rpcapi
import copy import copy
import mock import mock
from oslo_config import cfg
from cinder.backup import rpcapi as backup_rpcapi from cinder.backup import rpcapi as backup_rpcapi
from cinder import context from cinder import context
@ -28,9 +27,6 @@ from cinder import test
from cinder.tests.unit import fake_backup from cinder.tests.unit import fake_backup
CONF = cfg.CONF
class BackupRpcAPITestCase(test.TestCase): class BackupRpcAPITestCase(test.TestCase):
def setUp(self): def setUp(self):
super(BackupRpcAPITestCase, self).setUp() super(BackupRpcAPITestCase, self).setUp()

4
cinder/tests/unit/db/test_volume_type.py
View File

@ -14,15 +14,11 @@
"""Tests for volume type.""" """Tests for volume type."""
from oslo_config import cfg
from cinder import context from cinder import context
from cinder import db from cinder import db
from cinder import test from cinder import test
from cinder.volume import volume_types from cinder.volume import volume_types
CONF = cfg.CONF
class VolumeTypeTestCase(test.TestCase): class VolumeTypeTestCase(test.TestCase):
"""Test cases for volume type.""" """Test cases for volume type."""

4
cinder/tests/unit/scheduler/test_rpcapi.py
View File

@ -20,16 +20,12 @@ Unit Tests for cinder.scheduler.rpcapi
import copy import copy
import mock import mock
from oslo_config import cfg
from cinder import context from cinder import context
from cinder.scheduler import rpcapi as scheduler_rpcapi from cinder.scheduler import rpcapi as scheduler_rpcapi
from cinder import test from cinder import test
CONF = cfg.CONF
class SchedulerRpcAPITestCase(test.TestCase): class SchedulerRpcAPITestCase(test.TestCase):
def setUp(self): def setUp(self):

3
cinder/tests/unit/test_db_api.py
View File

@ -18,7 +18,6 @@ import datetime
import enum import enum
import mock import mock
from oslo_config import cfg
from oslo_utils import uuidutils from oslo_utils import uuidutils
import six import six
@ -30,8 +29,6 @@ from cinder import exception
from cinder import quota from cinder import quota
from cinder import test from cinder import test
CONF = cfg.CONF
THREE = 3 THREE = 3
THREE_HUNDREDS = 300 THREE_HUNDREDS = 300
ONE_HUNDREDS = 100 ONE_HUNDREDS = 100

2
cinder/tests/unit/test_hpe_xp_fc.py
View File

@ -25,9 +25,7 @@ from cinder.volume import driver
from cinder.volume.drivers.hpe import hpe_xp_fc from cinder.volume.drivers.hpe import hpe_xp_fc
from cinder.volume.drivers.hpe import hpe_xp_opts from cinder.volume.drivers.hpe import hpe_xp_opts
from oslo_config import cfg
from oslo_utils import importutils from oslo_utils import importutils
CONF = cfg.CONF
NORMAL_LDEV_TYPE = 'Normal' NORMAL_LDEV_TYPE = 'Normal'
POOL_INFO = {'30': {'total_gb': 'infinite', 'free_gb': 'infinite'}} POOL_INFO = {'30': {'total_gb': 'infinite', 'free_gb': 'infinite'}}

3
cinder/tests/unit/test_ibm_xiv_ds8k.py
View File

@ -22,7 +22,6 @@
import copy import copy
from mox3 import mox from mox3 import mox
from oslo_config import cfg
from cinder import context from cinder import context
from cinder import exception from cinder import exception
@ -82,8 +81,6 @@ CG_SNAPSHOT = {'id': CG_SNAPSHOT_ID,
CONNECTOR = {'initiator': "iqn.2012-07.org.fake:01:948f189c4695", } CONNECTOR = {'initiator': "iqn.2012-07.org.fake:01:948f189c4695", }
CONF = cfg.CONF
class XIVDS8KFakeProxyDriver(object): class XIVDS8KFakeProxyDriver(object):
"""Fake IBM XIV and DS8K Proxy Driver.""" """Fake IBM XIV and DS8K Proxy Driver."""

4
cinder/tests/unit/test_netapp_nfs.py
View File

@ -42,10 +42,6 @@ from cinder.volume.drivers.netapp.dataontap import nfs_base
from cinder.volume.drivers.netapp.dataontap import ssc_cmode from cinder.volume.drivers.netapp.dataontap import ssc_cmode
from cinder.volume.drivers.netapp import utils from cinder.volume.drivers.netapp import utils
from oslo_config import cfg
CONF = cfg.CONF
CONNECTION_INFO = { CONNECTION_INFO = {
'hostname': 'fake_host', 'hostname': 'fake_host',

4
cinder/tests/unit/test_volume_throttling.py
View File

@ -16,16 +16,12 @@
"""Tests for volume copy throttling helpers.""" """Tests for volume copy throttling helpers."""
import mock import mock
from oslo_config import cfg
from cinder import test from cinder import test
from cinder import utils from cinder import utils
from cinder.volume import throttling from cinder.volume import throttling
CONF = cfg.CONF
class ThrottleTestCase(test.TestCase): class ThrottleTestCase(test.TestCase):
def test_NoThrottle(self): def test_NoThrottle(self):

4
cinder/tests/unit/volume/flows/test_create_volume_flow.py
View File

@ -17,8 +17,6 @@
import ddt import ddt
import mock import mock
from oslo_config import cfg
from cinder import context from cinder import context
from cinder import exception from cinder import exception
from cinder.openstack.common import imageutils from cinder.openstack.common import imageutils
@ -33,8 +31,6 @@ from cinder.tests.unit.volume.flows import fake_volume_api
from cinder.volume.flows.api import create_volume from cinder.volume.flows.api import create_volume
from cinder.volume.flows.manager import create_volume as create_volume_manager from cinder.volume.flows.manager import create_volume as create_volume_manager
CONF = cfg.CONF
@ddt.ddt @ddt.ddt
class CreateVolumeFlowTestCase(test.TestCase): class CreateVolumeFlowTestCase(test.TestCase):

2
cinder/volume/qos_specs.py
View File

@ -16,7 +16,6 @@
"""The QoS Specs Implementation""" """The QoS Specs Implementation"""
from oslo_config import cfg
from oslo_db import exception as db_exc from oslo_db import exception as db_exc
from oslo_log import log as logging from oslo_log import log as logging
@ -27,7 +26,6 @@ from cinder.i18n import _, _LE, _LW
from cinder.volume import volume_types from cinder.volume import volume_types
CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
CONTROL_LOCATION = ['front-end', 'back-end', 'both'] CONTROL_LOCATION = ['front-end', 'back-end', 'both']

2
cinder/wsgi/common.py
View File

@ -14,14 +14,12 @@
"""Utility methods for working with WSGI servers.""" """Utility methods for working with WSGI servers."""
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
import webob.dec import webob.dec
import webob.exc import webob.exc
from cinder.i18n import _ from cinder.i18n import _
CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)