openstack
/
neutron
Code Issues Proposed changes

Merge "Fix invalid JSON generated by quota details" into stable/rocky

This commit is contained in:
Zuul 2021-03-23 12:22:03 +00:00 committed by Gerrit Code Review
parent ab2e93ffd4 9af46f4688
commit 6961ac137b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/objects/quota.py
View File

@ -15,6 +15,7 @@
from oslo_versionedobjects import fields as obj_fields from oslo_versionedobjects import fields as obj_fields
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import sql from sqlalchemy import sql
from sqlalchemy import types as sqltypes
from neutron.db.quota import models from neutron.db.quota import models
from neutron.objects import base from neutron.objects import base
@ -90,7 +91,9 @@ class Reservation(base.NeutronDbObject):
resv_query = context.session.query( resv_query = context.session.query(
models.ResourceDelta.resource, models.ResourceDelta.resource,
models.Reservation.expiration, models.Reservation.expiration,
sql.func.sum(models.ResourceDelta.amount)).join( sql.func.cast(
sql.func.sum(models.ResourceDelta.amount),
sqltypes.Integer)).join(
models.Reservation) models.Reservation)
if expired: if expired:
exp_expr = (models.Reservation.expiration < now) exp_expr = (models.Reservation.expiration < now)