openstack
/
octavia
Code Issues Proposed changes

Remove unused logging import 

it's obviously the code was copied from other place,
let's make it perfect.

Change-Id: I4f24622c497dd65d1d8a3e829a5ef8c4978f6a46
This commit is contained in:
caoyue 2016-01-14 19:34:40 +08:00
parent f941cbbfff
commit 1f5031fedc
16 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/amphorae/backends/agent/api_server/server.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
import flask
import six
@ -26,8 +25,6 @@ from octavia.amphorae.backends.agent.api_server import listener
from octavia.amphorae.backends.agent.api_server import plug
LOG = logging.getLogger(__name__)
app = flask.Flask(__name__)

3
octavia/certificates/common/barbican.py
View File

@ -21,15 +21,12 @@ import abc
from barbicanclient import client as barbican_client
from oslo_config import cfg
from oslo_log import log as logging
import six
from octavia.certificates.common import cert
from octavia.i18n import _LE
LOG = logging.getLogger(__name__)
CONF = cfg.CONF

3
octavia/certificates/generator/barbican.py
View File

@ -20,14 +20,11 @@ import random
import time
from oslo_config import cfg
from oslo_log import log as logging
from stevedore import driver as stevedore_driver
from octavia.certificates.generator import cert_gen
LOG = logging.getLogger(__name__)
MAX_ATTEMPTS = 10

3
octavia/cmd/agent.py
View File

@ -16,7 +16,6 @@
# make sure PYTHONPATH includes the home directory if you didn't install
import logging
import multiprocessing as multiproc
import os
import ssl
@ -31,7 +30,7 @@ from octavia.amphorae.backends.health_daemon import health_daemon
from octavia.common import service
from octavia import version
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
CONF.import_group('amphora_agent', 'octavia.common.config')
CONF.import_group('haproxy_amphora', 'octavia.common.config')

2
octavia/common/service.py
View File

@ -17,8 +17,6 @@ from oslo_log import log
from octavia.common import config
LOG = log.getLogger(__name__)
def prepare_service(argv=None):
"""Sets global config from config file and sets up logging."""

4
octavia/controller/healthmanager/update_stats_mixin.py
View File

@ -12,16 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from octavia.amphorae.drivers import driver_base as driver_base
from octavia.db import api as db_api
from octavia.db import repositories as repo
import six
LOG = logging.getLogger(__name__)
class UpdateStatsMixin(driver_base.StatsMixin):

5
octavia/controller/worker/tasks/cert_task.py
View File

@ -13,16 +13,13 @@
# under the License.
#
import logging
from oslo_config import cfg
from stevedore import driver as stevedore_driver
from taskflow import task
CONF = cfg.CONF
CONF.import_group('controller_worker', 'octavia.common.config')
LOG = logging.getLogger(__name__)
CERT_VALIDITY = 2 * 365 * 24 * 60 * 60

4
octavia/controller/worker/tasks/controller_tasks.py
View File

@ -13,15 +13,11 @@
# under the License.
#
import logging
from taskflow import task
from octavia.db import api as db_apis
from octavia.db import repositories as repo
LOG = logging.getLogger(__name__)
class BaseControllerTask(task.Task):
"""Base task to load drivers common to the tasks."""

2
octavia/db/repositories.py
View File

@ -20,7 +20,6 @@ reference
import datetime
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import uuidutils
from octavia.common import constants
@ -29,7 +28,6 @@ from octavia.db import models
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
CONF.import_group('health_manager', 'octavia.common.config')
CONF.import_group('house_keeping', 'octavia.common.config')

4
octavia/network/drivers/neutron/utils.py
View File

@ -12,14 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from octavia.network import data_models as network_models
LOG = logging.getLogger(__name__)
def convert_subnet_dict_to_model(subnet_dict):
subnet = subnet_dict.get('subnet', subnet_dict)
return network_models.Subnet(id=subnet.get('id'), name=subnet.get('name'),

5
octavia/tests/functional/api/v1/base.py
View File

@ -12,8 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
import mock
import pecan
import pecan.testing
@ -25,9 +23,6 @@ from octavia.db import repositories
from octavia.tests.functional.db import base as base_db_test
LOG = logging.getLogger(__name__)
class BaseAPITest(base_db_test.OctaviaDBTestBase):
BASE_PATH = '/v1'

3
octavia/tests/unit/amphorae/drivers/haproxy/test_ssh_driver.py
View File

@ -16,7 +16,6 @@ import os
import mock
from oslo_config import cfg
from oslo_log import log
from oslo_utils import uuidutils
import paramiko
@ -32,8 +31,6 @@ from octavia.tests.unit import base
from octavia.tests.unit.common.sample_configs import sample_configs
LOG = log.getLogger(__name__)
MOCK_NETWORK_ID = '1'
MOCK_SUBNET_ID = '2'
MOCK_PORT_ID = '3'

2
octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from oslo_utils import uuidutils
from octavia.amphorae.drivers.noop_driver import driver as driver
@ -21,7 +20,6 @@ from octavia.network import data_models as network_models
from octavia.tests.unit import base as base
LOG = logging.getLogger(__name__)
FAKE_UUID_1 = uuidutils.generate_uuid()

4
octavia/tests/unit/compute/drivers/test_compute_noop_driver.py
View File

@ -12,16 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from oslo_utils import uuidutils
from octavia.compute.drivers.noop_driver import driver as driver
import octavia.tests.unit.base as base
LOG = logging.getLogger(__name__)
class TestNoopComputeDriver(base.TestCase):
FAKE_UUID_1 = uuidutils.generate_uuid()
FAKE_UUID_2 = uuidutils.generate_uuid()

2
octavia/tests/unit/controller/healthmanager/test_health_manager.py
View File

@ -14,7 +14,6 @@
import mock
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import uuidutils
from octavia.controller.healthmanager import health_manager as healthmanager
@ -22,7 +21,6 @@ import octavia.tests.unit.base as base
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
CONF.import_group('health_manager', 'octavia.common.config')
AMPHORA_ID = uuidutils.generate_uuid()

4
octavia/tests/unit/network/drivers/test_network_noop_driver.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from oslo_utils import uuidutils
from octavia.db import models as models
@ -20,9 +19,6 @@ from octavia.network.drivers.noop_driver import driver as driver
import octavia.tests.unit.base as base
LOG = logging.getLogger(__name__)
class TestNoopNetworkDriver(base.TestCase):
FAKE_UUID_1 = uuidutils.generate_uuid()
FAKE_UUID_2 = uuidutils.generate_uuid()