Skip to content

Synchronise 2025.1 with upstream#306

Merged
priteau merged 2 commits into
stackhpc/2025.1from
upstream/2025.1-2026-06-29
Jun 29, 2026
Merged

Synchronise 2025.1 with upstream#306
priteau merged 2 commits into
stackhpc/2025.1from
upstream/2025.1-2026-06-29

Conversation

@github-actions

Copy link
Copy Markdown

This PR contains a snapshot of 2025.1 from upstream stable/2025.1.

ralonsoh added 2 commits June 12, 2026 16:36
When a service plugin package (e.g. neutron-fwaas, neutron-vpnaas,
networking-sfc) is installed but its service plugin is not configured
in ``service_plugins``, the quota details API endpoint
(GET /v2.0/quotas/{project_id}/details) returns a 500 Server Error.

The installed package registers quota resources (e.g. firewall_group,
firewall_policy, firewall_rule) at import time via
``resource_helper.build_resource_info(register_quota=True)``. When the
quota details endpoint iterates over all registered resources to
count usage, it calls ``_count_resource()`` which looks for a plugin
that provides ``get_<collection>_count`` or ``get_<collection>``.
Since the service plugin is not loaded, no plugin supports counting
those resources, and a ``NotImplementedError`` is raised.

Catch the ``NotImplementedError`` in
``DbQuotaDriver.get_detailed_project_quotas()`` and skip the resource
instead of letting the exception propagate as a 500 error. Also
guard the project-specific limit update loop against skipped
resources.

Closes-Bug: #2155846
Assisted-By: Claude Opus 4.6
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Change-Id: I923e90279edf3de3fa85c83fd46e1b5dec0468de
Increased ``allowed_network_downtime`` to 7.0 in the
``neutron-ovs-tempest-slow`` CI job. That will improve the stability of
test ``test_server_connectivity_live_migration``.

Closes-Bug: #2157882
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Change-Id: Idad087b2a0abd76d1297882011bc7deb6924c8ca
(cherry picked from commit 4aabb3e)
@github-actions github-actions Bot added the automated Automated action performed by GitHub Actions label Jun 29, 2026
@github-actions github-actions Bot requested a review from a team as a code owner June 29, 2026 08:06
@github-actions github-actions Bot added synchronisation automated Automated action performed by GitHub Actions labels Jun 29, 2026
@priteau priteau merged commit 414723b into stackhpc/2025.1 Jun 29, 2026
@priteau priteau deleted the upstream/2025.1-2026-06-29 branch June 29, 2026 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants