openstack/horizon
Code Issues Proposed changes

Merge "Fix generation of inventory capacities" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-11-12 20:59:35 +00:00 committed by Gerrit Code Review
commit aa0ac544be
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstack_dashboard/api/placement.py
View File

@ -115,8 +115,8 @@ def get_providers(request):
if vcpus is not None: if vcpus is not None:
p.update(vcpus_reserved=vcpus['reserved'], p.update(vcpus_reserved=vcpus['reserved'],
vcpus=vcpus['total'], vcpus=vcpus['total'],
vcpus_ar=vcpus['allocation_ratio'], vcpus_ar=vcpus['allocation_ratio'])
vcpus_capacity=int(p['vcpus_ar'] * p['vcpus'])) p['vcpus_capacity'] = int(p['vcpus_ar'] * p['vcpus'])
else: else:
p.update(vcpus_reserved=None, vcpus=None, p.update(vcpus_reserved=None, vcpus=None,
vcpus_ar=None, vcpus_capacity=None) vcpus_ar=None, vcpus_capacity=None)
@ -125,8 +125,8 @@ def get_providers(request):
if pcpus is not None: if pcpus is not None:
p.update(pcpus_reserved=pcpus['reserved'], p.update(pcpus_reserved=pcpus['reserved'],
pcpus=pcpus['total'], pcpus=pcpus['total'],
pcpus_ar=pcpus['allocation_ratio'], pcpus_ar=pcpus['allocation_ratio'])
pcpus_capacity=int(p['pcpus_ar'] * p['pcpus'])) p['pcpus_capacity'] = int(p['pcpus_ar'] * p['pcpus'])
else: else:
p.update(pcpus_reserved=None, pcpus=None, p.update(pcpus_reserved=None, pcpus=None,
pcpus_ar=None, pcpus_capacity=None) pcpus_ar=None, pcpus_capacity=None)
@ -135,8 +135,8 @@ def get_providers(request):
if memory is not None: if memory is not None:
p.update(memory_mb_reserved=memory['reserved'], p.update(memory_mb_reserved=memory['reserved'],
memory_mb=memory['total'], memory_mb=memory['total'],
memory_mb_ar=memory['allocation_ratio'], memory_mb_ar=memory['allocation_ratio'])
memory_mb_capacity=p['memory_mb_ar'] * p['memory_mb']) p['memory_mb_capacity'] = p['memory_mb_ar'] * p['memory_mb']
else: else:
p.update(memory_mb_reserved=None, memory_mb=None, p.update(memory_mb_reserved=None, memory_mb=None,
memory_mb_ar=None, memory_mb_capacity=None) memory_mb_ar=None, memory_mb_capacity=None)
@ -145,8 +145,8 @@ def get_providers(request):
if disk is not None: if disk is not None:
p.update(disk_gb_reserved=disk['reserved'], p.update(disk_gb_reserved=disk['reserved'],
disk_gb=disk['total'], disk_gb=disk['total'],
disk_gb_ar=disk['allocation_ratio'], disk_gb_ar=disk['allocation_ratio'])
disk_gb_capacity=p['disk_gb_ar'] * p['disk_gb']) p['disk_gb_capacity'] = p['disk_gb_ar'] * p['disk_gb']
else: else:
p.update(disk_gb_reserved=None, disk_gb=None, p.update(disk_gb_reserved=None, disk_gb=None,
disk_gb_ar=None, disk_gb_capacity=None) disk_gb_ar=None, disk_gb_capacity=None)