x
/
tobiko
Code Issues Proposed changes

Update nova quota APIs 

Change-Id: Idc447e42f6bd09b581c51e79511055ba9e893cd1
This commit is contained in:
Federico Ressi 2021-07-05 11:34:07 +02:00
parent 06038db65b
commit 623d0fe553
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tobiko/openstack/nova/_quota_set.py
View File

@ -27,10 +27,10 @@ def get_nova_quota_set(project: keystone.ProjectType = None,
client: _client.NovaClientType = None,
**params):
client = _client.nova_client(client)
project_id = keystone.get_project_id(project=project,
session=client.client.session)
user_id = user and keystone.get_user_id(user=user) or None
return client.quotas.get(project_id, user_id=user_id, **params)
project = keystone.get_project_id(project=project,
session=client.client.session)
user = user and keystone.get_user_id(user=user) or None
return client.quotas.get(project, user_id=user, **params)
def set_nova_quota_set(project: keystone.ProjectType = None,
@ -38,16 +38,16 @@ def set_nova_quota_set(project: keystone.ProjectType = None,
client: _client.NovaClientType = None,
**params):
client = _client.nova_client(client)
project_id = keystone.get_project_id(project=project,
session=client.client.session)
user_id = user and keystone.get_user_id(user=user) or None
return client.quotas.update(project_id, user_id=user_id, **params)
project = keystone.get_project_id(project=project,
session=client.client.session)
user = user and keystone.get_user_id(user=user) or None
return client.quotas.update(project, user_id=user, **params)
def ensure_nova_quota_limits(project: keystone.ProjectType = None,
user: keystone.UserType = None,
client: _client.NovaClientType = None,
**required):
**required: int):
client = _client.nova_client(client)
project = keystone.get_project_id(project=project,
session=client.client.session)
@ -66,22 +66,30 @@ def ensure_nova_quota_limits(project: keystone.ProjectType = None,
limit: int = quota['limit']
if limit > 0:
in_use: int = max(0, quota['in_use']) + max(0, quota['reserved'])
if in_use + needed >= limit:
required_limit = in_use + needed
if required_limit >= limit:
actual_limits[name] = limit
increment_limits[name] = max(10, limit * 2)
increment_limits[name] = required_limit + 5
if increment_limits:
LOG.info(f"Increment Nova quota limits (project={project}, "
LOG.info(f"Increment Nova quota limit(s) (project={project}, "
f"user={user}): {actual_limits} -> {increment_limits}...")
set_nova_quota_set(project=project, user=user, client=client,
**increment_limits)
try:
set_nova_quota_set(project=project, user=user, client=client,
**increment_limits)
except Exception:
LOG.exception("Unable to ensure nova quota set limits: "
f"{increment_limits}")
quota_set = get_nova_quota_set(project=project, user=user,
client=client, detail=True)
new_limits = {
name: getattr(quota_set, name)['limit']
for name in increment_limits.keys()}
new_limits = {name: getattr(quota_set, name)['limit']
for name in increment_limits.keys()}
LOG.info(f"Nova quota limit increased (project={project}, "
f"user={user}): {actual_limits} -> {new_limits}...")
if new_limits == actual_limits:
LOG.error(f"Nova quota limit(s) not changed (project={project}, "
f"user={user}")
else:
LOG.info(f"Nova quota limit(s) changed (project={project}, "
f"user={user}): {actual_limits} -> {new_limits}...")
return quota_set