Fix list of DNS extensions supported by OVN

The OVN driver needs to announce all DNS extensions as supported,
otherwise the neutron server will reject them.

Conflicts:
      neutron/common/ovn/extensions.py

NOTE(zhhuabj): The conflict is due to having change 666562a258 in stable/Xena.

Closes-Bug: 1947127
Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: Ic269902ef7a16893c4ea624b04347d04db4f52d9
(cherry picked from commit 8a890ed29c)
Signed-off-by: Zhang Hua <joshua.zhang@canonical.com>
This commit is contained in:
Dr. Jens Harbott 2021-10-14 11:19:41 +02:00 committed by Zhang Hua
parent a640909f56
commit 8fe19f1ba4
3 changed files with 81 additions and 65 deletions

View File

@ -73,68 +73,74 @@ services:
The following Neutron API extensions are supported with OVN: The following Neutron API extensions are supported with OVN:
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Extension Name | Extension Alias | | Extension Name | Extension Alias |
+==================================+=============================+ +==================================+=================================+
| Allowed Address Pairs | allowed-address-pairs | | Allowed Address Pairs | allowed-address-pairs |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Auto Allocated Topology Services | auto-allocated-topology | | Auto Allocated Topology Services | auto-allocated-topology |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Availability Zone | availability_zone | | Availability Zone | availability_zone |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Default Subnetpools | default-subnetpools | | Default Subnetpools | default-subnetpools |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Domain Name System (DNS) | dns_integration | | DNS Integration | dns-integration |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Multi Provider Network | multi-provider | | DNS domain for ports | dns-domain-ports |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Network IP Availability | network-ip-availability | | DNS domain names with keywords | dns-integration-domain-keywords |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Network Segment | segment | | Subnet DNS publish fixed IP | subnet-dns-publish-fixed-ip |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Neutron external network | external-net | | Multi Provider Network | multi-provider |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Neutron Extra DHCP opts | extra_dhcp_opt | | Network IP Availability | network-ip-availability |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Neutron Extra Route | extraroute | | Network Segment | segment |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Neutron L3 external gateway | ext-gw-mode | | Neutron external network | external-net |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Neutron L3 Router | router | | Neutron Extra DHCP opts | extra_dhcp_opt |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Network MTU | net-mtu | | Neutron Extra Route | extraroute |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Packet Logging | logging | | Neutron L3 external gateway | ext-gw-mode |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Port Binding | binding | | Neutron L3 Router | router |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Port Bindings Extended | binding-extended | | Network MTU | net-mtu |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Port Forwarding | port_forwarding | | Packet Logging | logging |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Port MAC address Regenerate | port-mac-address-regenerate | | Port Binding | binding |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Port Security | port-security | | Port Bindings Extended | binding-extended |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Provider Network | provider | | Port Forwarding | port_forwarding |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Quality of Service | qos | | Port MAC address Regenerate | port-mac-address-regenerate |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Quota management support | quotas | | Port Security | port-security |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| RBAC Policies | rbac-policies | | Provider Network | provider |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Resource revision numbers | standard-attr-revisions | | Quality of Service | qos |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| security-group | security-group | | Quota management support | quotas |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| standard-attr-description | standard-attr-description | | RBAC Policies | rbac-policies |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Subnet Allocation | subnet_allocation | | Resource revision numbers | standard-attr-revisions |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Subnet service types | subnet-service-types | | security-group | security-group |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Tag support | standard-attr-tag | | standard-attr-description | standard-attr-description |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Time Stamp Fields | standard-attr-timestamp | | Subnet Allocation | subnet_allocation |
+----------------------------------+-----------------------------+ +----------------------------------+---------------------------------+
| Subnet service types | subnet-service-types |
+----------------------------------+---------------------------------+
| Tag support | standard-attr-tag |
+----------------------------------+---------------------------------+
| Time Stamp Fields | standard-attr-timestamp |
+----------------------------------+---------------------------------+

View File

@ -20,6 +20,7 @@ from neutron_lib.api.definitions import availability_zone as az_def
from neutron_lib.api.definitions import default_subnetpools from neutron_lib.api.definitions import default_subnetpools
from neutron_lib.api.definitions import dns from neutron_lib.api.definitions import dns
from neutron_lib.api.definitions import dns_domain_keywords from neutron_lib.api.definitions import dns_domain_keywords
from neutron_lib.api.definitions import dns_domain_ports
from neutron_lib.api.definitions import expose_port_forwarding_in_fip from neutron_lib.api.definitions import expose_port_forwarding_in_fip
from neutron_lib.api.definitions import external_net from neutron_lib.api.definitions import external_net
from neutron_lib.api.definitions import extra_dhcp_opt from neutron_lib.api.definitions import extra_dhcp_opt
@ -58,6 +59,7 @@ from neutron_lib.api.definitions import security_groups_remote_address_group
from neutron_lib.api.definitions import segment as seg_def from neutron_lib.api.definitions import segment as seg_def
from neutron_lib.api.definitions import sorting from neutron_lib.api.definitions import sorting
from neutron_lib.api.definitions import stateful_security_group from neutron_lib.api.definitions import stateful_security_group
from neutron_lib.api.definitions import subnet_dns_publish_fixed_ip
from neutron_lib.api.definitions import subnet_service_types from neutron_lib.api.definitions import subnet_service_types
from neutron_lib.api.definitions import trunk from neutron_lib.api.definitions import trunk
from neutron_lib.api.definitions import vlantransparent from neutron_lib.api.definitions import vlantransparent
@ -80,6 +82,8 @@ ML2_SUPPORTED_API_EXTENSIONS_OVN_L3 = [
project_id.ALIAS, project_id.ALIAS,
dns.ALIAS, dns.ALIAS,
dns_domain_keywords.ALIAS, dns_domain_keywords.ALIAS,
dns_domain_ports.ALIAS,
subnet_dns_publish_fixed_ip.ALIAS,
agent_def.ALIAS, agent_def.ALIAS,
az_def.ALIAS, az_def.ALIAS,
raz_def.ALIAS, raz_def.ALIAS,

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Support for the extensions ``dns_domain_ports`` and ``subnet_dns_publish_fixed_ip``
belonging to the DNS integration is now properly announced by the OVN driver.
See bug `1947127 <https://bugs.launchpad.net/neutron/+bug/1947127>`_