openstack
/
nova
Code Issues Proposed changes

Merge "[Stable Only] Remove soft-deleted instances from quota_usages" into stable/ocata

This commit is contained in:
Zuul 2018-10-02 08:57:26 +00:00 committed by Gerrit Code Review
parent ab1182c8aa b465901793
commit a0b74ff12a
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/db/sqlalchemy/api.py
View File

@ -1824,11 +1824,15 @@ def instance_create(context, values):
def _instance_data_get_for_user(context, project_id, user_id):
not_soft_deleted = or_(
models.Instance.vm_state != vm_states.SOFT_DELETED,
models.Instance.vm_state == null()
)
result = model_query(context, models.Instance, (
func.count(models.Instance.id),
func.sum(models.Instance.vcpus),
func.sum(models.Instance.memory_mb))).\
filter_by(project_id=project_id)
filter_by(project_id=project_id).filter(not_soft_deleted)
if user_id:
result = result.filter_by(user_id=user_id).first()
else:

18
nova/tests/unit/db/test_db_api.py
View File

@ -1346,6 +1346,24 @@ class SqlAlchemyDbApiTestCase(DbTestCase):
filters={},
sort_keys=keys)
def test_instance_data_get_for_user(self):
ctxt = context.get_admin_context()
instance_1 = self.create_instance_with_args(project_id='project-HHD')
self.create_instance_with_args(project_id='project-HHD')
@sqlalchemy_api.pick_context_manager_reader
def test(context):
return sqlalchemy_api._instance_data_get_for_user(
context, 'project-HHD', None)
inst_num, _, _ = test(ctxt)
self.assertEqual(2, inst_num)
db.instance_update(ctxt, instance_1['uuid'],
{"vm_state": vm_states.SOFT_DELETED})
inst_num_2, _, _ = test(ctxt)
self.assertEqual(1, inst_num_2)
class ProcessSortParamTestCase(test.TestCase):