x/vmware-nsx
Code Issues Proposed changes

Merge "use qos constants from neutron-lib"

Browse Source
This commit is contained in:
Jenkins 2017-07-26 21:41:26 +00:00 committed by Gerrit Code Review
commit 35b63f498c
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -35,6 +35,7 @@ from neutron_lib import exceptions as n_exc
from neutron_lib.exceptions import port_security as psec_exc
from neutron_lib.plugins import constants as plugin_const
from neutron_lib.plugins import directory
from neutron_lib.services.qos import constants as qos_consts
from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils
@ -84,7 +85,6 @@ from neutron.objects import securitygroup
from neutron.plugins.common import utils
from neutron.quota import resource_registry
from neutron.services.flavors import flavors_plugin
from neutron.services.qos import qos_consts
from vmware_nsx.dvs import dvs
from vmware_nsx.services.qos.common import utils as qos_com_utils
from vmware_nsx.services.qos.nsx_v import driver as qos_driver

2
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -17,6 +17,7 @@ import netaddr
from neutron_lib.api.definitions import network as net_def
from neutron_lib.api.definitions import port_security as psec
from neutron_lib.exceptions import port_security as psec_exc
from neutron_lib.services.qos import constants as qos_consts
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.api.rpc.handlers import dhcp_rpc
@ -52,7 +53,6 @@ from neutron.extensions import providernet
from neutron.extensions import securitygroup as ext_sg
from neutron.plugins.common import utils as n_utils
from neutron.quota import resource_registry
from neutron.services.qos import qos_consts
from neutron_lib.api.definitions import extra_dhcp_opt as ext_edo
from neutron_lib.api.definitions import portbindings as pbin
from neutron_lib.api.definitions import provider_net as pnet

2
vmware_nsx/services/qos/common/utils.py
View File

@ -15,7 +15,7 @@
# under the License.
from neutron.objects.qos import policy as qos_policy
from neutron.services.qos import qos_consts
from neutron_lib.services.qos import constants as qos_consts
def update_network_policy_binding(context, net_id, new_policy_id):

2
vmware_nsx/services/qos/nsx_v/driver.py
View File

@ -15,10 +15,10 @@
# under the License.
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.common import constants as n_consts
from neutron.services.qos import qos_consts
LOG = logging.getLogger(__name__)
DRIVER = None

2
vmware_nsx/services/qos/nsx_v/utils.py
View File

@ -15,9 +15,9 @@
# under the License.
from neutron.common import constants as n_consts
from neutron.services.qos import qos_consts
from neutron_lib.plugins import constants as plugin_const
from neutron_lib.plugins import directory
from neutron_lib.services.qos import constants as qos_consts
from oslo_config import cfg
from oslo_log import log as logging

2
vmware_nsx/services/qos/nsx_v3/driver.py
View File

@ -15,10 +15,10 @@
# under the License.
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.common import constants as n_consts
from neutron.services.qos import qos_consts
from vmware_nsx.services.qos.nsx_v3 import utils as qos_utils

2
vmware_nsx/services/qos/nsx_v3/utils.py
View File

@ -18,10 +18,10 @@ from oslo_config import cfg
from oslo_log import log as logging
from neutron.common import constants as n_consts
from neutron.services.qos import qos_consts
from neutron_lib.api import validators
from neutron_lib import exceptions as n_exc
from neutron_lib.plugins import directory
from neutron_lib.services.qos import constants as qos_consts
from vmware_nsx._i18n import _
from vmware_nsx.common import exceptions as nsx_exc

2
vmware_nsx/tests/unit/nsx_v/test_plugin.py
View File

@ -30,7 +30,6 @@ from neutron.extensions import l3_flavors
from neutron.extensions import router_availability_zone
from neutron.extensions import securitygroup as secgrp
from neutron.plugins.common import utils
from neutron.services.qos import qos_consts
from neutron.tests.unit import _test_extension_portbindings as test_bindings
import neutron.tests.unit.db.test_allowedaddresspairs_db as test_addr_pair
import neutron.tests.unit.db.test_db_base_plugin_v2 as test_plugin
@ -51,6 +50,7 @@ from neutron_lib import context
from neutron_lib import exceptions as n_exc
from neutron_lib.plugins import constants as plugin_const
from neutron_lib.plugins import directory
from neutron_lib.services.qos import constants as qos_consts
from neutron_lib.utils import helpers
from neutron_lib.utils import net
from oslo_config import cfg

2
vmware_nsx/tests/unit/services/qos/test_nsxv_notification.py
View File

@ -17,11 +17,11 @@ import copy
import mock
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
from neutron_lib import context
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