Merge pull request #294 from stackhpc/upstream/master-2026-06-08

Synchronise master with upstream

Author: priteau

bindep.txt

@@ -19,6 +19,7 @@ mariadb-server [platform:rpm platform:redhat platform:debian test]
 mysql-client [platform:dpkg !platform:debian test]
 mysql-server [platform:dpkg !platform:debian test]
 
+frr
 haproxy
 keepalived
 conntrackd [platform:dpkg test conntrackd]

doc/source/admin/ovn/bgp.rst

@@ -145,9 +145,6 @@ section:
    * - Option
      - Default
      - Description
-   * - ``main_router_name``
-     - ``bgp-lr-main``
-     - Name of the main BGP logical router created in OVN.
    * - ``main_router_vrf_id``
      - ``42``
      - VRF ID attached to the main BGP logical router.

doc/source/admin/ovn/features.rst

@@ -39,6 +39,11 @@ services:
   The OVN driver does support VLAN project networks when used
   with OVN version 2.11 (or higher).
 
+* VLAN transparent networks
+
+  The OVN driver supports VLAN transparent networks, allowing tenant
+  traffic to carry VLAN tags end-to-end without being stripped by OVN.
+
 * DNS
 
   Native implementation. Since the version 2.8 OVN contains a built-in
@@ -61,86 +66,266 @@ services:
   Allows for Network segments ranges to be used with OVN. Requires OVN
   version 20.06 or higher.
 
-.. TODO What about project networks?
-
 * Routed provider networks
 
   Allows for multiple localnet ports to be attached to a single Logical
   Switch entry. This work also assumes that only a single localnet
   port (of the same Logical Switch) is actually mapped to a given
   hypervisor. Requires OVN version 20.06 or higher.
 
+* VPN as a Service (VPNaaS)
+
+  The OVN driver supports VPN as a Service. Enable the 'vpnaas'
+  service plugin in neutron configuration files to use this feature.
+
+* Firewall as a Service v2 (FWaaS v2)
+
+  The OVN driver supports Firewall as a Service v2. Enable the 'firewall_v2'
+  service plugin in neutron configuration files to use this feature.
+
+* BGP Dynamic Routing
+
+  The OVN driver supports BGP dynamic routing. Enable the
+  'bgp' service plugin in neutron configuration files to use this feature.
+
+* Tap Mirror
+
+  The OVN driver supports traffic mirroring using port mirroring (tap as a
+  service). Enable the 'tap_mirror' service plugin in neutron configuration
+  files to use this feature.
+
+* External Gateway Multihoming
+
+  The OVN driver supports external gateway multihoming, allowing routers to
+  be connected to multiple external networks for redundancy and load
+  distribution.
+
+* QinQ
+
+  The OVN driver supports QinQ (802.1ad) encapsulation for provider networks.
+
+* Private VLAN (PVLAN)
+
+  The OVN driver supports private VLAN (PVLAN) networks.
+
 
 The following Neutron API extensions are supported with OVN:
 
-+----------------------------------+---------------------------------+
-| Extension Name                   | Extension Alias                 |
-+==================================+=================================+
-| Allowed Address Pairs            | allowed-address-pairs           |
-+----------------------------------+---------------------------------+
-| Auto Allocated Topology Services | auto-allocated-topology         |
-+----------------------------------+---------------------------------+
-| Availability Zone                | availability_zone               |
-+----------------------------------+---------------------------------+
-| Default Subnetpools              | default-subnetpools             |
-+----------------------------------+---------------------------------+
-| DNS Integration                  | dns-integration                 |
-+----------------------------------+---------------------------------+
-| DNS domain for ports             | dns-domain-ports                |
-+----------------------------------+---------------------------------+
-| DNS domain names with keywords   | dns-integration-domain-keywords |
-+----------------------------------+---------------------------------+
-| Subnet DNS publish fixed IP      | subnet-dns-publish-fixed-ip     |
-+----------------------------------+---------------------------------+
-| Multi Provider Network           | multi-provider                  |
-+----------------------------------+---------------------------------+
-| Network IP Availability          | network-ip-availability         |
-+----------------------------------+---------------------------------+
-| Network Segment                  | segment                         |
-+----------------------------------+---------------------------------+
-| Neutron external network         | external-net                    |
-+----------------------------------+---------------------------------+
-| Neutron Extra DHCP opts          | extra_dhcp_opt                  |
-+----------------------------------+---------------------------------+
-| Neutron Extra Route              | extraroute                      |
-+----------------------------------+---------------------------------+
-| Neutron L3 external gateway      | ext-gw-mode                     |
-+----------------------------------+---------------------------------+
-| Neutron L3 Router                | router                          |
-+----------------------------------+---------------------------------+
-| Network MTU                      | net-mtu                         |
-+----------------------------------+---------------------------------+
-| Packet Logging                   | logging                         |
-+----------------------------------+---------------------------------+
-| Port Binding                     | binding                         |
-+----------------------------------+---------------------------------+
-| Port Bindings Extended           | binding-extended                |
-+----------------------------------+---------------------------------+
-| Port Forwarding                  | port_forwarding                 |
-+----------------------------------+---------------------------------+
-| Port MAC address Regenerate      | port-mac-address-regenerate     |
-+----------------------------------+---------------------------------+
-| Port Security                    | port-security                   |
-+----------------------------------+---------------------------------+
-| Provider Network                 | provider                        |
-+----------------------------------+---------------------------------+
-| Quality of Service               | qos                             |
-+----------------------------------+---------------------------------+
-| Quota management support         | quotas                          |
-+----------------------------------+---------------------------------+
-| RBAC Policies                    | rbac-policies                   |
-+----------------------------------+---------------------------------+
-| Resource revision numbers        | standard-attr-revisions         |
-+----------------------------------+---------------------------------+
-| security-group                   | security-group                  |
-+----------------------------------+---------------------------------+
-| standard-attr-description        | standard-attr-description       |
-+----------------------------------+---------------------------------+
-| Subnet Allocation                | subnet_allocation               |
-+----------------------------------+---------------------------------+
-| Subnet service types             | subnet-service-types            |
-+----------------------------------+---------------------------------+
-| Tag support                      | standard-attr-tag               |
-+----------------------------------+---------------------------------+
-| Time Stamp Fields                | standard-attr-timestamp         |
-+----------------------------------+---------------------------------+
+.. list-table::
+   :header-rows: 1
+   :widths: 50 50
+
+   * - Extension Name
+     - Extension Alias
+   * - Address Group
+     - address-group
+   * - Address Scope
+     - address-scope
+   * - Agent
+     - agent
+   * - Allowed Address Pairs
+     - allowed-address-pairs
+   * - Auto Allocated Topology Services
+     - auto-allocated-topology
+   * - Availability Zone
+     - availability_zone
+   * - BGP
+     - bgp
+   * - BGP 4-byte ASN
+     - bgp_4byte_asn
+   * - BGP DR Agent Scheduler
+     - bgp_dragent_scheduler
+   * - Default Subnetpools
+     - default-subnetpools
+   * - DHCP Agent Scheduler
+     - dhcp_agent_scheduler
+   * - DNS Domain for Ports
+     - dns-domain-ports
+   * - DNS Domain Names with Keywords
+     - dns-integration-domain-keywords
+   * - DNS Integration
+     - dns-integration
+   * - Empty String Filtering
+     - empty-string-filtering
+   * - Enable Default Route BFD
+     - enable-default-route-bfd
+   * - Enable Default Route ECMP
+     - enable-default-route-ecmp
+   * - Expose Port Forwarding in FIP
+     - expose-port-forwarding-in-fip
+   * - External Gateway Multihoming
+     - external-gateway-multihoming
+   * - Extra Route
+     - extraroute
+   * - Extra Route Atomic
+     - extraroute-atomic
+   * - Filter Validation
+     - filter-validation
+   * - FIP Port Details
+     - fip-port-details
+   * - FIP Port Forwarding Description
+     - floating-ip-port-forwarding-description
+   * - FIP Port Forwarding Detail
+     - floating-ip-port-forwarding-detail
+   * - FIP Port Forwarding Port Ranges
+     - floating-ip-port-forwarding-port-ranges
+   * - Flavors
+     - flavors
+   * - Floating IP Port Forwarding
+     - floating-ip-port-forwarding
+   * - Floating IP Pools
+     - floatingip-pools
+   * - Firewall as a Service v2
+     - fwaas_v2
+   * - IP Allocation
+     - ip_allocation
+   * - L3 External Gateway Mode
+     - ext-gw-mode
+   * - L3 Flavors
+     - l3-flavors
+   * - L3 HA
+     - l3-ha
+   * - L3 Router
+     - router
+   * - Multi Provider Network
+     - multi-provider
+   * - Network Availability Zone
+     - network_availability_zone
+   * - Network External
+     - external-net
+   * - Network HA
+     - network_ha
+   * - Network IP Availability
+     - network-ip-availability
+   * - Network MTU
+     - net-mtu
+   * - Network MTU Writable
+     - net-mtu-writable
+   * - Network Segment
+     - segment
+   * - Neutron Extra DHCP Opts
+     - extra_dhcp_opt
+   * - Packet Logging
+     - logging
+   * - Pagination
+     - pagination
+   * - Port Binding
+     - binding
+   * - Port Bindings Extended
+     - binding-extended
+   * - Port Device Profile
+     - port-device-profile
+   * - Port Hardware Offload Type
+     - port-hardware-offload-type
+   * - Port MAC Address Regenerate
+     - port-mac-address-regenerate
+   * - Port NUMA Affinity Policy
+     - port-numa-affinity-policy
+   * - Port NUMA Affinity Policy Socket
+     - port-numa-affinity-policy-socket
+   * - Port Resource Request
+     - port-resource-request
+   * - Port Security
+     - port-security
+   * - Port Trusted VIF
+     - port-trusted-vif
+   * - Private VLAN
+     - pvlan
+   * - Project ID
+     - project-id
+   * - Provider Network
+     - provider
+   * - QinQ
+     - qinq
+   * - Quality of Service
+     - qos
+   * - QoS Bandwidth Limit Direction
+     - qos-bw-limit-direction
+   * - QoS Bandwidth Minimum Ingress
+     - qos-bw-minimum-ingress
+   * - QoS Default
+     - qos-default
+   * - QoS for Floating IPs
+     - qos-fip
+   * - QoS Gateway IP
+     - qos-gateway-ip
+   * - QoS Rule Type Details
+     - qos-rule-type-details
+   * - QoS Rule Type Filter
+     - qos-rule-type-filter
+   * - QoS Rules Alias
+     - qos-rules-alias
+   * - Quota Check Limit
+     - quota-check-limit
+   * - Quota Check Limit Default
+     - quota-check-limit-default
+   * - Quota Details
+     - quota_details
+   * - Quota Management Support
+     - quotas
+   * - RBAC Address Scope
+     - rbac-address-scope
+   * - RBAC Policies
+     - rbac-policies
+   * - RBAC Security Groups
+     - rbac-security-groups
+   * - Resource Revision Numbers
+     - standard-attr-revisions
+   * - Router Availability Zone
+     - router_availability_zone
+   * - Router Enable SNAT
+     - router-enable-snat
+   * - Security Group
+     - security-group
+   * - Security Groups Default Rules
+     - security-groups-default-rules
+   * - Security Groups Normalized CIDR
+     - security-groups-normalized-cidr
+   * - Security Groups Remote Address Group
+     - security-groups-remote-address-group
+   * - Security Groups Rules Belongs to Default SG
+     - security-groups-rules-belongs-to-default-sg
+   * - Security Groups Shared Filtering
+     - security-groups-shared-filtering
+   * - Sorting
+     - sorting
+   * - Standard Attr Description
+     - standard-attr-description
+   * - Standard Attr FWaaS v2
+     - standard-attr-fwaas-v2
+   * - Standard Attr Tag
+     - standard-attr-tag
+   * - Standard Attr Timestamp
+     - standard-attr-timestamp
+   * - Stateful Security Group
+     - stateful-security-group
+   * - Subnet Allocation
+     - subnet_allocation
+   * - Subnet DNS Publish Fixed IP
+     - subnet-dns-publish-fixed-ip
+   * - Subnet External Network
+     - subnet-external-network
+   * - Subnet Onboard
+     - subnet_onboard
+   * - Subnet Service Types
+     - subnet-service-types
+   * - Subnetpool Prefix Ops
+     - subnetpool-prefix-ops
+   * - Tag Creation
+     - tag-creation
+   * - Tap Mirror
+     - tap-mirror
+   * - Tap Mirror Both Direction
+     - tap-mirror-both-direction
+   * - Trunk
+     - trunk
+   * - Uplink Status Propagation
+     - uplink-status-propagation
+   * - Uplink Status Propagation Updatable
+     - uplink-status-propagation-updatable
+   * - VLAN Transparent
+     - vlan-transparent
+   * - VPN as a Service
+     - vpnaas
+   * - VPN Endpoint Groups
+     - vpn-endpoint-groups

doc/source/contributor/upgrade_checks.rst

@@ -53,7 +53,7 @@ The recommended entry point name is a repository name: For example,
         neutron-fwaas = neutron_fwaas.upgrade.checks:Checks
 
 Entrypoint should be class which inherits from
-``neutron.cmd.upgrade_checks.base.BaseChecks``.
+``neutron_lib.utils.upgrade_checks.BaseChecks``.
 
 An example of a checks class can be found in
 ``neutron.cmd.upgrade_checks.checks.CoreChecks``.

doc/source/ovn/ovn_agent.rst

@@ -64,7 +64,9 @@ for an OVN agent extension. The extensions are loaded in two steps:
 Each extension should define a set of OVS, OVN Northbound and OVN Southbound
 tables to monitor, and a set of events related to these databases. The OVN
 agent will create the corresponding IDL connections using the conjunction of
-these tables and events.
+these tables and events. OVSDB RowEvents can be passed as a class, in which
+case they will be instantiated with the extension as their only argument, or
+passed already instantiated with user-defined arguments.
 
 
 Event-driven service