From 1b8664f8e1213a1703304c9e4259f544d0b223e6 Mon Sep 17 00:00:00 2001 From: Boden R Date: Wed, 26 Jul 2017 10:59:16 -0600 Subject: [PATCH] use qos constants from neutron-lib neutron-lib contains the QoS constants. This patch removes them from neutron and replaces all such uses to lib's QoS constants. NeutronLibImpact Change-Id: I6ed379b178a2b79fd14385a1d1e87d87eb04bfb9 --- neutron/agent/l2/extensions/qos.py | 2 +- neutron/agent/linux/tc_lib.py | 2 +- neutron/core_extensions/qos.py | 2 +- neutron/extensions/qos.py | 2 +- neutron/objects/qos/qos_policy_validator.py | 2 +- neutron/objects/qos/rule.py | 2 +- neutron/objects/qos/rule_type.py | 2 +- .../agent/extension_drivers/qos_driver.py | 2 +- neutron/plugins/ml2/plugin.py | 2 +- neutron/plugins/ml2/rpc.py | 2 +- .../qos/drivers/linuxbridge/driver.py | 2 +- neutron/services/qos/drivers/manager.py | 2 +- .../qos/drivers/openvswitch/driver.py | 2 +- neutron/services/qos/drivers/sriov/driver.py | 2 +- neutron/services/qos/qos_consts.py | 56 ------------------- neutron/services/qos/qos_plugin.py | 2 +- neutron/tests/fullstack/test_qos.py | 2 +- neutron/tests/tempest/api/test_qos.py | 2 +- neutron/tests/tempest/scenario/test_qos.py | 2 +- .../unit/agent/l2/extensions/test_qos.py | 2 +- neutron/tests/unit/agent/linux/test_tc_lib.py | 2 +- .../tests/unit/core_extensions/test_qos.py | 2 +- neutron/tests/unit/objects/qos/test_policy.py | 2 +- neutron/tests/unit/objects/qos/test_rule.py | 2 +- .../tests/unit/objects/qos/test_rule_type.py | 2 +- .../extension_drivers/test_qos_driver.py | 2 +- neutron/tests/unit/plugins/ml2/test_rpc.py | 2 +- .../unit/services/qos/drivers/test_manager.py | 2 +- .../unit/services/qos/test_qos_plugin.py | 2 +- 29 files changed, 28 insertions(+), 84 deletions(-) delete mode 100644 neutron/services/qos/qos_consts.py diff --git a/neutron/agent/l2/extensions/qos.py b/neutron/agent/l2/extensions/qos.py index 96a3c4f876b..302a6a27ef3 100644 --- a/neutron/agent/l2/extensions/qos.py +++ b/neutron/agent/l2/extensions/qos.py @@ -17,6 +17,7 @@ import abc import collections from neutron_lib import constants +from neutron_lib.services.qos import constants as qos_consts from oslo_concurrency import lockutils from oslo_log import log as logging import six @@ -27,7 +28,6 @@ from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc from neutron import manager -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/tc_lib.py b/neutron/agent/linux/tc_lib.py index aefc41f2aa6..ab9d13e9c5b 100644 --- a/neutron/agent/linux/tc_lib.py +++ b/neutron/agent/linux/tc_lib.py @@ -16,10 +16,10 @@ import re from neutron_lib import exceptions +from neutron_lib.services.qos import constants as qos_consts from neutron._i18n import _ from neutron.agent.linux import ip_lib -from neutron.services.qos import qos_consts INGRESS_QDISC_ID = "ffff:" diff --git a/neutron/core_extensions/qos.py b/neutron/core_extensions/qos.py index 787c4b8fad4..e3257d488e1 100644 --- a/neutron/core_extensions/qos.py +++ b/neutron/core_extensions/qos.py @@ -15,12 +15,12 @@ from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib.services.qos import constants as qos_consts from neutron.common import exceptions as n_exc from neutron.core_extensions import base from neutron.db import api as db_api from neutron.objects.qos import policy as policy_object -from neutron.services.qos import qos_consts class QosCoreResourceExtension(base.CoreResourceExtension): diff --git a/neutron/extensions/qos.py b/neutron/extensions/qos.py index b389725c4e1..980718f0aaf 100644 --- a/neutron/extensions/qos.py +++ b/neutron/extensions/qos.py @@ -24,13 +24,13 @@ from neutron_lib.db import constants as db_const from neutron_lib.plugins import constants from neutron_lib.plugins import directory from neutron_lib.services import base as service_base +from neutron_lib.services.qos import constants as qos_consts import six from neutron.api import extensions from neutron.api.v2 import base from neutron.api.v2 import resource_helper from neutron.objects.qos import rule as rule_object -from neutron.services.qos import qos_consts ALIAS = "qos" diff --git a/neutron/objects/qos/qos_policy_validator.py b/neutron/objects/qos/qos_policy_validator.py index 078a74ceb52..cbcc9fd8813 100644 --- a/neutron/objects/qos/qos_policy_validator.py +++ b/neutron/objects/qos/qos_policy_validator.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib.services.qos import constants as qos_consts from neutron.common import exceptions as n_exc -from neutron.services.qos import qos_consts def check_bandwidth_rule_conflict(policy, rule_data): diff --git a/neutron/objects/qos/rule.py b/neutron/objects/qos/rule.py index bbd23911e95..f5e6baacf8f 100644 --- a/neutron/objects/qos/rule.py +++ b/neutron/objects/qos/rule.py @@ -17,6 +17,7 @@ import abc import sys from neutron_lib import constants +from neutron_lib.services.qos import constants as qos_consts from neutron_lib.utils import helpers from oslo_utils import versionutils from oslo_versionedobjects import base as obj_base @@ -28,7 +29,6 @@ from neutron.db import api as db_api from neutron.db.qos import models as qos_db_model from neutron.objects import base from neutron.objects import common_types -from neutron.services.qos import qos_consts DSCP_MARK = 'dscp_mark' diff --git a/neutron/objects/qos/rule_type.py b/neutron/objects/qos/rule_type.py index 006ca1535c2..e34b980edf6 100644 --- a/neutron/objects/qos/rule_type.py +++ b/neutron/objects/qos/rule_type.py @@ -12,6 +12,7 @@ from neutron_lib.plugins import constants from neutron_lib.plugins import directory +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging from oslo_utils import versionutils from oslo_versionedobjects import base as obj_base @@ -19,7 +20,6 @@ from oslo_versionedobjects import fields as obj_fields from neutron.objects import base from neutron.objects import common_types -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py b/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py index 186f7ad3b9c..5beab5f3d4a 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py @@ -15,12 +15,12 @@ import collections from neutron_lib import constants +from neutron_lib.services.qos import constants as qos_consts from oslo_config import cfg from oslo_log import log as logging from neutron.agent.l2.extensions import qos_linux as qos from neutron.services.qos.drivers.openvswitch import driver -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index e9a88e0bc39..809c59f7392 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -31,6 +31,7 @@ from neutron_lib.exceptions import port_security as psec_exc from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory from neutron_lib.plugins.ml2 import api +from neutron_lib.services.qos import constants as qos_consts from oslo_config import cfg from oslo_db import exception as os_db_exception from oslo_log import helpers as log_helpers @@ -89,7 +90,6 @@ from neutron.plugins.ml2 import models from neutron.plugins.ml2 import ovo_rpc from neutron.plugins.ml2 import rpc from neutron.quota import resource_registry -from neutron.services.qos import qos_consts from neutron.services.segments import plugin as segments_plugin LOG = log.getLogger(__name__) diff --git a/neutron/plugins/ml2/rpc.py b/neutron/plugins/ml2/rpc.py index bf3f47154cf..3ace6b593c7 100644 --- a/neutron/plugins/ml2/rpc.py +++ b/neutron/plugins/ml2/rpc.py @@ -19,6 +19,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants as n_const from neutron_lib.plugins import directory from neutron_lib.plugins.ml2 import api +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log import oslo_messaging from sqlalchemy.orm import exc @@ -31,7 +32,6 @@ from neutron.db import l3_hamode_db from neutron.db import provisioning_blocks from neutron.plugins.ml2 import db as ml2_db from neutron.plugins.ml2.drivers import type_tunnel -from neutron.services.qos import qos_consts # REVISIT(kmestery): Allow the type and mechanism drivers to supply the # mixins and eventually remove the direct dependencies on type_tunnel. diff --git a/neutron/services/qos/drivers/linuxbridge/driver.py b/neutron/services/qos/drivers/linuxbridge/driver.py index 78aa8975273..180740b9663 100644 --- a/neutron/services/qos/drivers/linuxbridge/driver.py +++ b/neutron/services/qos/drivers/linuxbridge/driver.py @@ -17,9 +17,9 @@ from neutron_lib.api.definitions import portbindings from neutron_lib import constants from neutron_lib.db import constants as db_consts from neutron_lib.services.qos import base +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/services/qos/drivers/manager.py b/neutron/services/qos/drivers/manager.py index 2ac31c5647f..0ed60362b9d 100644 --- a/neutron/services/qos/drivers/manager.py +++ b/neutron/services/qos/drivers/manager.py @@ -13,6 +13,7 @@ from neutron_lib.api.definitions import portbindings from neutron_lib.callbacks import events from neutron_lib.callbacks import registry +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging from neutron.api.rpc.callbacks import events as rpc_events @@ -22,7 +23,6 @@ from neutron.api.rpc.handlers import resources_rpc from neutron.common import constants from neutron.common import exceptions from neutron.objects.qos import policy as policy_object -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/services/qos/drivers/openvswitch/driver.py b/neutron/services/qos/drivers/openvswitch/driver.py index db519df54f1..fec382cd522 100644 --- a/neutron/services/qos/drivers/openvswitch/driver.py +++ b/neutron/services/qos/drivers/openvswitch/driver.py @@ -17,9 +17,9 @@ from neutron_lib.api.definitions import portbindings from neutron_lib import constants from neutron_lib.db import constants as db_consts from neutron_lib.services.qos import base +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/services/qos/drivers/sriov/driver.py b/neutron/services/qos/drivers/sriov/driver.py index 2fe8e3644fa..37224b3ef6e 100644 --- a/neutron/services/qos/drivers/sriov/driver.py +++ b/neutron/services/qos/drivers/sriov/driver.py @@ -17,9 +17,9 @@ from neutron_lib.api.definitions import portbindings from neutron_lib import constants from neutron_lib.db import constants as db_consts from neutron_lib.services.qos import base +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging -from neutron.services.qos import qos_consts LOG = logging.getLogger(__name__) diff --git a/neutron/services/qos/qos_consts.py b/neutron/services/qos/qos_consts.py deleted file mode 100644 index e4a14cf1b1d..00000000000 --- a/neutron/services/qos/qos_consts.py +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (c) 2015 Red Hat Inc. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -RULE_TYPE_BANDWIDTH_LIMIT = 'bandwidth_limit' -RULE_TYPE_DSCP_MARKING = 'dscp_marking' -RULE_TYPE_MINIMUM_BANDWIDTH = 'minimum_bandwidth' -VALID_RULE_TYPES = [RULE_TYPE_BANDWIDTH_LIMIT, - RULE_TYPE_DSCP_MARKING, - RULE_TYPE_MINIMUM_BANDWIDTH, - ] - -# Names of rules' attributes -MAX_KBPS = "max_kbps" -MAX_BURST = "max_burst_kbps" -MIN_KBPS = "min_kbps" -DIRECTION = "direction" -DSCP_MARK = "dscp_mark" - -QOS_POLICY_ID = 'qos_policy_id' - -QOS_PLUGIN = 'qos_plugin' - -# NOTE(slaweq): Value used to calculate burst value for egress bandwidth limit -# if burst is not given by user. In such case burst value will be calculated -# as 80% of bw_limit to ensure that at least limits for TCP traffic will work -# fine. -DEFAULT_BURST_RATE = 0.8 - -# Method names for QoSDriver -PRECOMMIT_POSTFIX = '_precommit' -CREATE_POLICY = 'create_policy' -CREATE_POLICY_PRECOMMIT = CREATE_POLICY + PRECOMMIT_POSTFIX -UPDATE_POLICY = 'update_policy' -UPDATE_POLICY_PRECOMMIT = UPDATE_POLICY + PRECOMMIT_POSTFIX -DELETE_POLICY = 'delete_policy' -DELETE_POLICY_PRECOMMIT = DELETE_POLICY + PRECOMMIT_POSTFIX - -QOS_CALL_METHODS = ( - CREATE_POLICY, - CREATE_POLICY_PRECOMMIT, - UPDATE_POLICY, - UPDATE_POLICY_PRECOMMIT, - DELETE_POLICY, - DELETE_POLICY_PRECOMMIT, ) diff --git a/neutron/services/qos/qos_plugin.py b/neutron/services/qos/qos_plugin.py index bc9902e6a5d..3ca58911fc4 100644 --- a/neutron/services/qos/qos_plugin.py +++ b/neutron/services/qos/qos_plugin.py @@ -17,6 +17,7 @@ from neutron_lib.callbacks import events as callbacks_events from neutron_lib.callbacks import registry as callbacks_registry from neutron_lib.callbacks import resources as callbacks_resources from neutron_lib import exceptions as lib_exc +from neutron_lib.services.qos import constants as qos_consts from neutron.common import exceptions as n_exc from neutron.db import api as db_api @@ -29,7 +30,6 @@ from neutron.objects.qos import policy as policy_object from neutron.objects.qos import qos_policy_validator as checker from neutron.objects.qos import rule_type as rule_type_object from neutron.services.qos.drivers import manager -from neutron.services.qos import qos_consts class QoSPlugin(qos.QoSPluginBase): diff --git a/neutron/tests/fullstack/test_qos.py b/neutron/tests/fullstack/test_qos.py index 4509c6c28e6..8d76adbe505 100644 --- a/neutron/tests/fullstack/test_qos.py +++ b/neutron/tests/fullstack/test_qos.py @@ -15,13 +15,13 @@ import functools from neutron_lib import constants +from neutron_lib.services.qos import constants as qos_consts from neutronclient.common import exceptions from oslo_utils import uuidutils import testscenarios from neutron.agent.linux import tc_lib from neutron.common import utils -from neutron.services.qos import qos_consts from neutron.tests.common.agents import l2_extensions from neutron.tests.fullstack import base from neutron.tests.fullstack.resources import environment diff --git a/neutron/tests/tempest/api/test_qos.py b/neutron/tests/tempest/api/test_qos.py index 5a28a9fef8e..83c20d70877 100644 --- a/neutron/tests/tempest/api/test_qos.py +++ b/neutron/tests/tempest/api/test_qos.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib.services.qos import constants as qos_consts from tempest.common import utils from tempest.lib.common.utils import data_utils from tempest.lib import decorators @@ -20,7 +21,6 @@ from tempest.lib import exceptions import testscenarios import testtools -from neutron.services.qos import qos_consts from neutron.tests.tempest.api import base diff --git a/neutron/tests/tempest/scenario/test_qos.py b/neutron/tests/tempest/scenario/test_qos.py index 97f6842cb8c..591799f549d 100644 --- a/neutron/tests/tempest/scenario/test_qos.py +++ b/neutron/tests/tempest/scenario/test_qos.py @@ -16,13 +16,13 @@ import errno import socket import time +from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging from tempest.common import utils as tutils from tempest.lib import decorators from tempest.lib import exceptions from neutron.common import utils -from neutron.services.qos import qos_consts from neutron.tests.tempest.api import base as base_api from neutron.tests.tempest.common import ssh from neutron.tests.tempest import config diff --git a/neutron/tests/unit/agent/l2/extensions/test_qos.py b/neutron/tests/unit/agent/l2/extensions/test_qos.py index f164d905896..b0369b4b5b1 100644 --- a/neutron/tests/unit/agent/l2/extensions/test_qos.py +++ b/neutron/tests/unit/agent/l2/extensions/test_qos.py @@ -17,6 +17,7 @@ import mock from neutron_lib import constants as common_constants from neutron_lib import context from neutron_lib.db import constants as db_consts +from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils from neutron.agent.l2.extensions import qos @@ -33,7 +34,6 @@ from neutron.plugins.ml2.drivers.openvswitch.agent import ( from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl import ( ovs_bridge) -from neutron.services.qos import qos_consts from neutron.tests import base BASE_TEST_POLICY = {'context': None, diff --git a/neutron/tests/unit/agent/linux/test_tc_lib.py b/neutron/tests/unit/agent/linux/test_tc_lib.py index 851d276ea42..2d04776409d 100644 --- a/neutron/tests/unit/agent/linux/test_tc_lib.py +++ b/neutron/tests/unit/agent/linux/test_tc_lib.py @@ -14,9 +14,9 @@ # under the License. import mock +from neutron_lib.services.qos import constants as qos_consts from neutron.agent.linux import tc_lib -from neutron.services.qos import qos_consts from neutron.tests import base DEVICE_NAME = "tap_device" diff --git a/neutron/tests/unit/core_extensions/test_qos.py b/neutron/tests/unit/core_extensions/test_qos.py index 6f86c83f704..02e6d773b4f 100644 --- a/neutron/tests/unit/core_extensions/test_qos.py +++ b/neutron/tests/unit/core_extensions/test_qos.py @@ -16,13 +16,13 @@ import mock from neutron_lib import context from neutron_lib.plugins import constants as plugin_constants +from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils from neutron.common import exceptions as n_exc from neutron.core_extensions import base as base_core from neutron.core_extensions import qos as qos_core from neutron.objects.qos import policy -from neutron.services.qos import qos_consts from neutron.tests import base diff --git a/neutron/tests/unit/objects/qos/test_policy.py b/neutron/tests/unit/objects/qos/test_policy.py index 7838178562d..c3b42b0b979 100644 --- a/neutron/tests/unit/objects/qos/test_policy.py +++ b/neutron/tests/unit/objects/qos/test_policy.py @@ -12,6 +12,7 @@ import mock from neutron_lib import constants as n_const +from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils from oslo_versionedobjects import exception import testtools @@ -22,7 +23,6 @@ from neutron.objects.db import api as db_api from neutron.objects import network as net_obj from neutron.objects.qos import policy from neutron.objects.qos import rule -from neutron.services.qos import qos_consts from neutron.tests.unit.objects import test_base from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/objects/qos/test_rule.py b/neutron/tests/unit/objects/qos/test_rule.py index b7f8fd62bf3..e816baa250d 100644 --- a/neutron/tests/unit/objects/qos/test_rule.py +++ b/neutron/tests/unit/objects/qos/test_rule.py @@ -11,13 +11,13 @@ # under the License. from neutron_lib import constants +from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils from oslo_versionedobjects import exception from neutron.objects.qos import policy from neutron.objects.qos import rule -from neutron.services.qos import qos_consts from neutron.tests import base as neutron_test_base from neutron.tests.unit.objects import test_base from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/objects/qos/test_rule_type.py b/neutron/tests/unit/objects/qos/test_rule_type.py index 378e16643ee..f01f3287ed4 100644 --- a/neutron/tests/unit/objects/qos/test_rule_type.py +++ b/neutron/tests/unit/objects/qos/test_rule_type.py @@ -16,12 +16,12 @@ import mock from neutron_lib import constants as lib_consts from neutron_lib.db import constants as db_consts +from neutron_lib.services.qos import constants as qos_consts from oslo_config import cfg from neutron.common import constants from neutron import manager from neutron.objects.qos import rule_type -from neutron.services.qos import qos_consts from neutron.services.qos import qos_plugin from neutron.tests import base as test_base diff --git a/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/test_qos_driver.py b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/test_qos_driver.py index e08533f98a6..efca2d57c03 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/test_qos_driver.py +++ b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/test_qos_driver.py @@ -16,6 +16,7 @@ import mock from neutron_lib import constants from neutron_lib import context +from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils from neutron.objects.qos import policy @@ -23,7 +24,6 @@ from neutron.objects.qos import rule from neutron.plugins.ml2.drivers.mech_sriov.agent.common import exceptions from neutron.plugins.ml2.drivers.mech_sriov.agent.extension_drivers import ( qos_driver) -from neutron.services.qos import qos_consts from neutron.tests import base diff --git a/neutron/tests/unit/plugins/ml2/test_rpc.py b/neutron/tests/unit/plugins/ml2/test_rpc.py index 37ff61d5e34..61a2422fe00 100644 --- a/neutron/tests/unit/plugins/ml2/test_rpc.py +++ b/neutron/tests/unit/plugins/ml2/test_rpc.py @@ -24,6 +24,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory +from neutron_lib.services.qos import constants as qos_consts from oslo_config import cfg from oslo_context import context as oslo_context from sqlalchemy.orm import exc @@ -35,7 +36,6 @@ from neutron.plugins.ml2 import db as ml2_db from neutron.plugins.ml2.drivers import type_tunnel from neutron.plugins.ml2 import managers from neutron.plugins.ml2 import rpc as plugin_rpc -from neutron.services.qos import qos_consts from neutron.tests import base diff --git a/neutron/tests/unit/services/qos/drivers/test_manager.py b/neutron/tests/unit/services/qos/drivers/test_manager.py index 5f77994b740..e239793d231 100644 --- a/neutron/tests/unit/services/qos/drivers/test_manager.py +++ b/neutron/tests/unit/services/qos/drivers/test_manager.py @@ -15,6 +15,7 @@ from neutron_lib.api.definitions import portbindings from neutron_lib import constants as lib_consts from neutron_lib import context from neutron_lib.services.qos import base as qos_driver_base +from neutron_lib.services.qos import constants as qos_consts from oslo_utils import uuidutils from neutron.common import constants @@ -22,7 +23,6 @@ from neutron.common import exceptions from neutron.objects import ports as ports_object from neutron.objects.qos import rule as rule_object from neutron.services.qos.drivers import manager as driver_mgr -from neutron.services.qos import qos_consts from neutron.tests.unit.services.qos import base diff --git a/neutron/tests/unit/services/qos/test_qos_plugin.py b/neutron/tests/unit/services/qos/test_qos_plugin.py index 02e6673b3da..509e7e0ce11 100644 --- a/neutron/tests/unit/services/qos/test_qos_plugin.py +++ b/neutron/tests/unit/services/qos/test_qos_plugin.py @@ -15,6 +15,7 @@ from neutron_lib import context from neutron_lib import exceptions as lib_exc from neutron_lib.plugins import constants as plugins_constants from neutron_lib.plugins import directory +from neutron_lib.services.qos import constants as qos_consts from oslo_config import cfg from oslo_utils import uuidutils @@ -24,7 +25,6 @@ from neutron import manager from neutron.objects import base as base_object from neutron.objects.qos import policy as policy_object from neutron.objects.qos import rule as rule_object -from neutron.services.qos import qos_consts from neutron.services.qos import qos_plugin from neutron.tests.unit.services.qos import base