Browse Source

Oslo logging changes requires import change for logging

Partial bug: #1431916

Change-Id: Ia8c623282d21f11792fd338f805b1f71e19de478
Shiv Haris 4 years ago
parent
commit
c3bd5274a2

+ 1
- 3
networking_brocade/test_discover/test_discover.py View File

@@ -28,9 +28,7 @@ def load_tests(loader, tests, pattern):
28 28
     base_path = os.path.split(os.path.dirname(os.path.abspath(__file__)))[0]
29 29
     base_path = os.path.split(base_path)[0]
30 30
     test_dirs = {'./networking_brocade/tests',
31
-                 './networking_brocade/vdx/tests/unit/ml2/drivers/brocade',
32
-                 MLX_TEST_BASE_PATH + '/unit/ml2/drivers/brocade',
33
-                 MLX_TEST_BASE_PATH + '/unit/services/l3_router/brocade'}
31
+                 './networking_brocade/vdx/tests/unit/ml2/drivers/brocade'}
34 32
     for test_dir in test_dirs:
35 33
         if not pattern:
36 34
             suite.addTests(loader.discover(test_dir, top_level_dir=base_path))

+ 1
- 1
networking_brocade/vdx/ml2driver/mechanism_brocade.py View File

@@ -18,10 +18,10 @@
18 18
 
19 19
 from neutron.i18n import _LE
20 20
 from neutron.i18n import _LI
21
-from neutron.openstack.common import log as logging
22 21
 from neutron.plugins.ml2 import driver_api
23 22
 from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
24 23
 from oslo_config import cfg
24
+from oslo_log import log as logging
25 25
 from oslo_utils import importutils
26 26
 
27 27
 LOG = logging.getLogger(__name__)

+ 1
- 1
networking_brocade/vdx/ml2driver/nos/nosdriver.py View File

@@ -19,13 +19,13 @@ Neutron network life-cycle management.
19 19
 """
20 20
 
21 21
 from ncclient import manager
22
+from oslo_log import log as logging
22 23
 from oslo_utils import excutils
23 24
 
24 25
 from xml.etree import ElementTree
25 26
 
26 27
 from networking_brocade.vdx.ml2driver.nos import nctemplates as template
27 28
 from neutron.i18n import _LE
28
-from neutron.openstack.common import log as logging
29 29
 
30 30
 LOG = logging.getLogger(__name__)
31 31
 SSH_PORT = 22

+ 1
- 1
networking_brocade/vdx/services/l3_router/l3_router_plugin.py View File

@@ -22,11 +22,11 @@ from networking_brocade.vdx.ml2driver.nos import nosdriver as driver
22 22
 from neutron.common import constants as l3_constants
23 23
 from neutron.i18n import _LE
24 24
 from neutron.i18n import _LI
25
-from neutron.openstack.common import log as logging
26 25
 from neutron.plugins.ml2 import db
27 26
 from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
28 27
 from neutron.services.l3_router import l3_router_plugin as router
29 28
 from oslo_config import cfg
29
+from oslo_log import log as logging
30 30
 from oslo_utils import excutils
31 31
 
32 32
 

+ 1
- 1
networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py View File

@@ -18,10 +18,10 @@
18 18
 import mock
19 19
 from neutron.db import api as db
20 20
 from neutron.i18n import _LI
21
-from neutron.openstack.common import log as logging
22 21
 from neutron.tests.unit import test_l3_plugin
23 22
 from oslo_config import cfg
24 23
 from oslo_context import context as oslo_context
24
+from oslo_log import log as logging
25 25
 from oslo_utils import importutils
26 26
 
27 27
 LOG = logging.getLogger(__name__)

+ 1
- 1
networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py View File

@@ -16,9 +16,9 @@
16 16
 import mock
17 17
 from networking_brocade.vdx.ml2driver import (
18 18
     mechanism_brocade as brocademechanism)
19
-from neutron.openstack.common import log as logging
20 19
 from neutron.plugins.ml2 import config as ml2_config
21 20
 from neutron.tests.unit.ml2 import test_ml2_plugin
21
+from oslo_log import log as logging
22 22
 from oslo_utils import importutils
23 23
 
24 24
 LOG = logging.getLogger(__name__)

Loading…
Cancel
Save