Synchronise master with upstream

.pylintrc

@@ -83,7 +83,6 @@ disable=
  invalid-name,
  missing-docstring,
  singleton-comparison,
- superfluous-parens,
  ungrouped-imports,
  wrong-import-order,
  consider-using-f-string,

devstack/etc/frr_with_evpn/daemons

@@ -0,0 +1,42 @@
+bgpd=yes
+ospfd=no
+ospf6d=no
+ripd=no
+ripngd=no
+isisd=no
+pimd=no
+ldpd=no
+nhrpd=no
+eigrpd=no
+babeld=no
+sharpd=no
+pbrd=no
+bfdd=no
+fabricd=no
+vrrpd=no
+pathd=no
+
+#
+# If this option is set the /etc/init.d/frr script automatically loads
+# the config via "vtysh -b" when the servers are started.
+# Check /etc/pam.d/frr if you intend to use "vtysh"!
+#
+vtysh_enable=yes
+zebra_options="  -A 127.0.0.1 -s 90000000"
+bgpd_options="   -A 127.0.0.1"
+ospfd_options="  -A 127.0.0.1"
+ospf6d_options=" -A ::1"
+ripd_options="   -A 127.0.0.1"
+ripngd_options=" -A ::1"
+isisd_options="  -A 127.0.0.1"
+pimd_options="   -A 127.0.0.1"
+ldpd_options="   -A 127.0.0.1"
+nhrpd_options="  -A 127.0.0.1"
+eigrpd_options=" -A 127.0.0.1"
+babeld_options=" -A 127.0.0.1"
+sharpd_options=" -A 127.0.0.1"
+pbrd_options="   -A 127.0.0.1"
+staticd_options="-A 127.0.0.1"
+bfdd_options="   -A 127.0.0.1"
+fabricd_options="-A 127.0.0.1"
+vrrpd_options="  -A 127.0.0.1"

devstack/etc/frr_with_evpn/frr.conf

@@ -0,0 +1,4 @@
+frr defaults traditional
+hostname devstack
+log file /var/log/frr/frr.log informational
+log timestamp precision 3

devstack/lib/dns_forwarder_ovs_ext

@@ -0,0 +1,6 @@
+function configure_ovs_dns_forwarder {
+    plugin_agent_add_l2_agent_extension "dns_forwarder"
+    iniset /$NEUTRON_CORE_PLUGIN_CONF dns_forwarder upstream_dns_server_ports $UPSTREAM_DNS_SERVER_PORTS
+    iniset /$NEUTRON_CORE_PLUGIN_CONF dns_forwarder upstream_dns_query_timeout $UPSTREAM_DNS_QUERY_TIMEOUT
+    iniset /$NEUTRON_CORE_PLUGIN_CONF dns_forwarder client_dns_server_ports $CLIENT_DNS_SERVER_PORTS
+}

devstack/lib/frr

@@ -20,14 +20,26 @@ function install_frr {
     install_package frr
 }
 
+function install_frr_vrf_modules {
+    if is_ubuntu; then
+        install_package linux-modules-extra-$(uname -r)
+    elif is_fedora; then
+        install_package kernel-modules-extra-$(uname -r)
+    fi
+    sudo modprobe vrf
+}
+
 function configure_frr {
     echo_summary "Configuring FRR"
 
     # Create the configuration dir
     sudo install -d -o $STACK_USER $FRR_CONF_DIR
 
     # Configure frr daemons
-    if [[ "$FRR_USE_BFD" == "True" ]]; then
+    if [[ "$FRR_USE_EVPN" == "True" ]]; then
+        sudo install -o root -g root -m 644 $FRR_ETC_SRC_DIR/frr_with_evpn/* $FRR_CONF_DIR/
+        install_frr_vrf_modules
+    elif [[ "$FRR_USE_BFD" == "True" ]]; then
         sudo install -o root -g root -m 644 $FRR_ETC_SRC_DIR/frr_with_bfd/* $FRR_CONF_DIR/
     else
         sudo install -o root -g root -m 644 $FRR_ETC_SRC_DIR/frr/* $FRR_CONF_DIR/
@@ -69,4 +81,3 @@ function cleanup_frr {
     # Clean the FRRt configuration dir
     sudo rm -rf $FRR_CONF_DIR
 }
-

devstack/lib/pvlan

@@ -0,0 +1,3 @@
+function configure_pvlan {
+    neutron_service_plugin_class_add "pvlan"
+}

devstack/ovn-local.conf.sample

@@ -48,6 +48,7 @@ enable_service q-dns
 enable_service q-port-forwarding
 enable_service q-qos
 enable_service neutron-segments
+enable_service neutron-pvlan
 enable_service q-log
 
 # Enable neutron tempest plugin tests

devstack/plugin.sh

@@ -19,8 +19,10 @@ source $LIBDIR/tag_ports_during_bulk_creation
 source $LIBDIR/octavia
 source $LIBDIR/loki
 source $LIBDIR/local_ip
+source $LIBDIR/pvlan
 source $LIBDIR/port_trusted_vif
 source $LIBDIR/frr
+source $LIBDIR/dns_forwarder_ovs_ext
 
 # source the OVS/OVN compilation helper methods
 source $TOP_DIR/lib/neutron_plugins/ovs_source
@@ -72,6 +74,9 @@ if [[ "$1" == "stack" ]]; then
             if is_service_enabled neutron-segments; then
                 configure_segments_extension
             fi
+            if is_service_enabled neutron-pvlan; then
+                configure_pvlan
+            fi
             if is_service_enabled neutron-network-segment-range; then
                 configure_network_segment_range
             fi
@@ -85,6 +90,11 @@ if [[ "$1" == "stack" ]]; then
                     configure_ovs_metadata_path
                 fi
             fi
+            if is_service_enabled q-dns-forwarder neutron-dns-forwarder; then
+                if [ $Q_AGENT = openvswitch ]; then
+                    configure_ovs_dns_forwarder
+                fi
+            fi
             if is_service_enabled neutron-local-ip; then
                 configure_local_ip
             fi

doc/source/admin/config-neutron-server-processes.rst

@@ -35,7 +35,7 @@ The following table summarizes the Neutron server-side processes:
      - ``neutron-rpc-server`` (spawns ``rpc worker`` and
        ``rpc reports worker`` child processes)
      - When agents require RPC
-     - ``api_workers``, ``rpc_workers``, ``rpc_state_report_workers``
+     - uWSGI ``processes``; Neutron ``rpc_workers`` and ``rpc_state_report_workers``
    * - Periodic
      - ``neutron-periodic-workers`` (runs plugin periodic tasks as threads)
      - With any ML2 mechanism driver and WSGI API

doc/source/admin/config-subnet-pools.rst

@@ -67,7 +67,9 @@ like a router, network, or a port, it uses one from your total quota.
 With subnets, the resource is the IP address space. Some subnets take
 more of it than others. For example, 203.0.113.0/24 uses 256 addresses
 in one subnet but 198.51.100.224/28 uses only 16. If address space is
-limited, the quota system can encourage efficient use of the space.
+limited, the quota system can encourage efficient use of the space. If
+the quota value is set as zero, it means that no quota will be
+enforced when allocating a subnet from a subnet pool.
 
 With IPv4, the default_quota can be set to the number of absolute
 addresses any given project is allowed to consume from the pool. For

doc/source/admin/config-wsgi.rst

@@ -58,6 +58,19 @@ Start neutron-api:
 
 .. end
 
+uWSGI Python API
+~~~~~~~~~~~~~~~~
+
+When Neutron API workers run under uWSGI with the ``python3`` plugin, the
+server injects a Python ``uwsgi`` module into each worker process at runtime.
+This module is not a Neutron dependency and cannot be installed separately
+with ``pip``; it exists only inside uWSGI-managed workers.
+
+Neutron uses this module (via ``neutron.common.wsgi_utils``) to read uWSGI
+configuration options such as ``start-time`` and to obtain the worker ID
+(``uwsgi.worker_id()``). For the full list of available functions, see the
+`uWSGI API documentation <https://uwsgi-docs.readthedocs.io/en/latest/API.html>`_.
+
 
 Start Neutron RPC server
 ------------------------
@@ -140,10 +153,11 @@ further limited by available memory, and the number of RPC workers is set to
 half that number.
 
 It is strongly recommended that all deployers set these values themselves,
-via the api_workers and rpc_workers configuration parameters.
+via the uWSGI ``processes`` and Neutron ``rpc_workers`` configuration
+parameters.
 
 For a cloud with a high load to a relatively small number of objects,
-a smaller value for api_workers will provide better performance than
+a smaller value for API workers will provide better performance than
 many (somewhere around 4-8.) For a cloud with a high load to lots of
 different objects, then the more the better. Budget neutron-server
 using about 2GB of RAM in steady-state.
@@ -167,5 +181,7 @@ in processing agents heartbeats.
 .. note::
    ML2/OVN uses the ``[uwsgi]start-time = %t`` parameter to create the OVN hash
    ring registers during the initialization process. This value is populated
-   by the uWSGi process with the start time. For more information, check
+   by the uWSGi process with the start time and read via the runtime ``uwsgi``
+   Python module (see the uWSGI Python API subsection above). For more
+   information, check
    `Configuring uWSGI <https://uwsgi-docs.readthedocs.io/en/latest/Configuration.html>`_.

etc/neutron/rootwrap.d/rootwrap.filters

@@ -56,6 +56,11 @@ keepalived_state_change_env: EnvFilter, env, root, PROCESS_TAG=, neutron-keepali
 conntrackd: CommandFilter, conntrackd, root
 conntrackd_env: EnvFilter, env, root, PROCESS_TAG=, conntrackd
 
+# FRR
+vtysh_cmd: RegExpFilter, vtysh, root, vtysh, --vty_socket, /[a-z/]+, -c, .*
+vtysh_dryrun: RegExpFilter, vtysh, root, vtysh, --vty_socket, /[a-z/]+, --dryrun, -f, .*
+vtysh_apply: RegExpFilter, vtysh, root, vtysh, --vty_socket, /[a-z/]+, -f, .*
+
 # OPEN VSWITCH
 ovs-ofctl: CommandFilter, ovs-ofctl, root
 ovsdb-client: CommandFilter, ovsdb-client, root

neutron/agent/l2/extensions/dhcp/ipv6.py

@@ -231,7 +231,7 @@ def get_dhcp_options(self, mac, ip_info, req_options, req_type):
         # Client FQDN: host-<ip-v6-address>
         fqdn_bin = struct.pack('!%ds' % len(fqdn), bytes(str(fqdn).encode()))
         fqdn_str_len = struct.pack('!b', len(fqdn_bin))
-        dns_data = (dns_tag + fqdn_str_len + fqdn_bin)
+        dns_data = dns_tag + fqdn_str_len + fqdn_bin
         option_list.append(
             dhcp6.option(code=DHCPV6_OPTION_FQDN,
                          data=dns_data, length=len(dns_data)))