Merge "use logapi constants from neutron-lib"

This commit is contained in:
Zuul 2019-05-23 19:08:39 +00:00 committed by Gerrit Code Review
commit ea57fce620
6 changed files with 6 additions and 6 deletions

View File

@ -13,10 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.services.logapi.common import constants as log_const
from neutron.services.logapi.drivers import base
from neutron.services.logapi.drivers import manager
from neutron_lib.callbacks import resources
from neutron_lib.services.logapi import constants as log_const
from oslo_log import log as logging
from oslo_utils import importutils

View File

@ -19,8 +19,8 @@ import uuid
from neutron.agent.linux import utils
from neutron.services.logapi.agent import log_extension as log_ext
from neutron.services.logapi.common import constants as log_const
from neutron_lib import constants
from neutron_lib.services.logapi import constants as log_const
from oslo_config import cfg
from oslo_log import handlers
from oslo_log import log as logging

View File

@ -14,10 +14,10 @@
# under the License.
from neutron.objects import ports as port_objects
from neutron.services.logapi.common import constants as log_const
from neutron.services.logapi.drivers import manager
from neutron_lib.callbacks import events
from neutron_lib import constants as nl_const
from neutron_lib.services.logapi import constants as log_const
from neutron_fwaas.services.logapi.common import log_db_api

View File

@ -13,10 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.services.logapi.common import constants as log_const
from neutron.services.logapi.drivers import manager
from neutron_lib.callbacks import events
from neutron_lib import constants as nl_const
from neutron_lib.services.logapi import constants as log_const
from neutron_fwaas.services.logapi.common import log_db_api

View File

@ -18,10 +18,10 @@ import time
import mock
from neutron.agent.l3 import l3_agent_extension_api as l3_ext_api
from neutron.agent.linux import utils as linux_utils
from neutron.services.logapi.common import constants as log_const
from neutron.tests.functional.agent.l3 import framework
from neutron_lib import constants
from neutron_lib import context as neutron_context
from neutron_lib.services.logapi import constants as log_const
from oslo_config import cfg
from oslo_log import log as logging

View File

@ -16,8 +16,8 @@
from collections import defaultdict
import mock
from neutron.services.logapi.common import constants as log_const
from neutron.tests.unit.api.v2 import test_base
from neutron_lib.services.logapi import constants as log_const
from neutron_fwaas.privileged.netfilter_log import libnetfilter_log as libnflog
from neutron_fwaas.services.logapi.agents.drivers.iptables import log