openstack/neutron-lib
Code Issues Proposed changes

remove CORE and L3 from neutron_lib.constants

Browse Source 
The CORE and L3 service type name constants are defined in both
neutron_lib.constants and neutron_lib.plugin.constants. The later is
the desired location for them and this patch formalizes that by
removing them from the former.

Change-Id: I5cbe779b401e5214f414ab1c732867fdd4d75651
This commit is contained in:
Boden R 2018-01-08 09:56:31 -07:00
parent c3fcdeb0f9
commit ec829f9384
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron_lib/constants.py
View File

@ -367,14 +367,3 @@ VHOST_USER_DEVICE_PREFIX = 'vhu'
VETH_DEVICE_PREFIX = 'qvo' VETH_DEVICE_PREFIX = 'qvo'
# prefix for SNAT interface in DVR # prefix for SNAT interface in DVR
SNAT_INT_DEV_PREFIX = 'sg-' SNAT_INT_DEV_PREFIX = 'sg-'
##########################
# Plugin related constants
##########################
# Plugin constants that are universally used across all neutron repos.
# The alias for the core plugin.
# TODO(boden): remove and replace consumer usage with plugins/constants.py
CORE = 'CORE'
# The alias for the L3 plugin.
L3 = 'L3_ROUTER_NAT'

2
neutron_lib/plugins/directory.py
View File

@ -16,7 +16,7 @@ import weakref
from oslo_concurrency import lockutils from oslo_concurrency import lockutils
from neutron_lib import constants from neutron_lib.plugins import constants
_synchronized = lockutils.synchronized_with_prefix("neutron-") _synchronized = lockutils.synchronized_with_prefix("neutron-")

5
releasenotes/notes/rm-dup-pluginconst-085d0fcee4e931b8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- The ``CORE`` and ``L3`` service type name constants have been removed
from ``neutron_lib.constants``. These constants are duplicates of those
in ``neutron_lib.plugin.constants`` and consumers should use the latter.