openstack/neutron
Code Issues Proposed changes

Move dns-integration extension to the ML2_SUPPORTED_API_EXTENSIONS list

Browse Source 
dns-integration extension is actually implemented as ML2 extension
driver, so has nothing to do with the L3 plugin.
In OVN it was listed in the ML2_SUPPORTED_API_EXTENSIONS_OVN_L3 but it
should be in ML2_SUPPORTED_API_EXTENSIONS. This patch moves it to the
correct list.
This patch also removes disable_dns_extension_by_extension_drivers
method from the OVN L3 plugin class as there is no need to disable this
extension by L3 agent.

Related-Bug: #1929676
Change-Id: I456afcc9054627e74b18460d169052f262451c22
This commit is contained in:
Slawek Kaplonski 2021-06-11 12:12:07 +02:00
parent 2692953017
commit bc82a664b6
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/common/ovn/extensions.py
View File

@ -88,6 +88,7 @@ ML2_SUPPORTED_API_EXTENSIONS = [
az_def.ALIAS,
portbindings.ALIAS,
default_subnetpools.ALIAS,
dns.ALIAS,
external_net.ALIAS,
extra_dhcp_opt.ALIAS,
filter_validation.ALIAS,

12
neutron/services/ovn_l3/plugin.py
View File

@ -12,12 +12,9 @@
# under the License.
#
from neutron_lib.api.definitions import dns as dns_apidef
from neutron_lib.api.definitions import dns_domain_keywords
from neutron_lib.api.definitions import external_net
from neutron_lib.api.definitions import portbindings
from neutron_lib.api.definitions import provider_net as pnet
from neutron_lib.api import extensions as api_extensions
from neutron_lib.callbacks import events
from neutron_lib.callbacks import registry
from neutron_lib.callbacks import resources
@ -102,20 +99,11 @@ class OVNL3RouterPlugin(service_base.ServicePluginBase,
if not qos_service_plugin and qos_aliases:
aliases.remove(qos_fip_api.FIP_QOS_ALIAS)
@staticmethod
def disable_dns_extension_by_extension_drivers(aliases):
core_plugin = directory.get_plugin()
if not api_extensions.is_extension_supported(
core_plugin, dns_apidef.ALIAS):
aliases.remove(dns_apidef.ALIAS)
aliases.remove(dns_domain_keywords.ALIAS)
@property
def supported_extension_aliases(self):
if not hasattr(self, '_aliases'):
self._aliases = self._supported_extension_aliases[:]
self.disable_qos_fip_extension_by_extension_drivers(self._aliases)
self.disable_dns_extension_by_extension_drivers(self._aliases)
return self._aliases
@property