From e2989db7dc1c0fb9f5375dd849e5fec6126f36a8 Mon Sep 17 00:00:00 2001 From: Boden R Date: Fri, 5 Jan 2018 14:45:44 -0700 Subject: [PATCH] use service aliases from plugin constants Today neutron-lib defines the CORE and L3 service plugin aliases in neutron_lib.constants as well as neutron_lib.plugins.constants. The later is preferred and the former will be removed. This patch switches the code to use the plugin constants from neutron-lib. Change-Id: Ic41b180cb0e084f271d715d7433e22e1688c6498 --- .../tests/unit/nsx_v/housekeeper/test_error_backup_edge.py | 2 +- vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_dhcp_edge.py | 2 +- vmware_nsx/tests/unit/shell/test_admin_utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_backup_edge.py b/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_backup_edge.py index beba17ee65..ff90956726 100644 --- a/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_backup_edge.py +++ b/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_backup_edge.py @@ -15,7 +15,7 @@ import mock from neutron.tests import base -from neutron_lib import constants +from neutron_lib.plugins import constants from vmware_nsx.plugins.nsx_v.housekeeper import error_backup_edge diff --git a/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_dhcp_edge.py b/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_dhcp_edge.py index fa2ddf918a..0854aa32ef 100644 --- a/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_dhcp_edge.py +++ b/vmware_nsx/tests/unit/nsx_v/housekeeper/test_error_dhcp_edge.py @@ -18,7 +18,7 @@ import datetime import mock from neutron.tests import base -from neutron_lib import constants +from neutron_lib.plugins import constants from vmware_nsx.plugins.nsx_v.housekeeper import error_dhcp_edge diff --git a/vmware_nsx/tests/unit/shell/test_admin_utils.py b/vmware_nsx/tests/unit/shell/test_admin_utils.py index 6d410e30b3..6de733a3d1 100644 --- a/vmware_nsx/tests/unit/shell/test_admin_utils.py +++ b/vmware_nsx/tests/unit/shell/test_admin_utils.py @@ -21,7 +21,7 @@ from neutron.db import servicetype_db # noqa from neutron.quota import resource_registry from neutron.tests import base from neutron_lib.callbacks import registry -from neutron_lib import constants +from neutron_lib.plugins import constants from oslo_config import cfg from oslo_log import _options from oslo_log import log as logging