Skip to content

Commit 3a85dde

Browse files
priteaupriteau
committed
Revert "Add allocation ratios to Placement stats"
This reverts commit 01968e3.
1 parent b901436 commit 3a85dde

3 files changed

Lines changed: 26 additions & 52 deletions

File tree

‎openstack_dashboard/api/placement.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,34 +95,16 @@ def get_providers(request):
9595
p['usages'] = usages
9696
p['aggregates'] = resource_provider_aggregates(request, p['uuid'])
9797
p['traits'] = resource_provider_traits(request, p['uuid'])
98-
9998
p['vcpus_used'] = usages.get('VCPU')
10099
p['vcpus_reserved'] = vcpus['reserved'] if vcpus is not None else None
101-
# The actual amount of the resource that the provider can accommodate
102100
p['vcpus'] = vcpus['total'] if vcpus is not None else None
103-
# Overall capacity
104-
p['vcpus_ar'] = vcpus['allocation_ratio'] \
105-
if vcpus is not None else None
106-
p['vcpus_capacity'] = int(vcpus['allocation_ratio'] * vcpus['total']) \
107-
if vcpus is not None else None
108-
109101
p['pcpus_used'] = usages.get('PCPU')
110102
p['pcpus_reserved'] = pcpus['reserved'] if pcpus is not None else None
111103
p['pcpus'] = pcpus['total'] if pcpus is not None else None
112-
p['pcpus_ar'] = pcpus['allocation_ratio'] \
113-
if pcpus is not None else None
114-
p['pcpus_capacity'] = int(pcpus['allocation_ratio'] * pcpus['total']) \
115-
if pcpus is not None else None
116-
117104
p['memory_mb_used'] = usages['MEMORY_MB']
118105
p['memory_mb_reserved'] = inventories['MEMORY_MB']['reserved']
119106
p['memory_mb'] = inventories['MEMORY_MB']['total']
120-
p['memory_mb_ar'] = inventories['MEMORY_MB']['allocation_ratio']
121-
p['memory_mb_capacity'] = p['memory_mb_ar'] * p['memory_mb']
122-
123107
p['disk_gb_used'] = usages['DISK_GB']
124108
p['disk_gb_reserved'] = inventories['DISK_GB']['reserved']
125109
p['disk_gb'] = inventories['DISK_GB']['total']
126-
p['disk_gb_ar'] = inventories['DISK_GB']['allocation_ratio']
127-
p['disk_gb_capacity'] = p['disk_gb_ar'] * p['disk_gb']
128110
return providers

‎openstack_dashboard/dashboards/admin/hypervisors/tables.py‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -72,49 +72,41 @@ class AdminProvidersTable(tables.DataTable):
7272
name = tables.WrappingColumn("name",
7373
verbose_name=_("Resource Provider Name"))
7474
vcpus_used = tables.Column("vcpus_used",
75-
verbose_name=_("VCPUs used"))
75+
verbose_name=_("VCPUs (used)"))
7676
vcpus_reserved = tables.Column("vcpus_reserved",
77-
verbose_name=_("VCPUs reserved"))
77+
verbose_name=_("VCPUs (reserved)"))
7878
vcpus = tables.Column("vcpus",
79-
verbose_name=_("VCPUs total"))
80-
vcpus_ar = tables.Column("vcpus_ar",
81-
verbose_name=_("VCPUs allocation ratio"))
79+
verbose_name=_("VCPUs (total)"))
8280
pcpus_used = tables.Column("pcpus_used",
83-
verbose_name=_("PCPUs used"))
81+
verbose_name=_("PCPUs (used)"))
8482
pcpus_reserved = tables.Column("pcpus_reserved",
85-
verbose_name=_("PCPUs reserved"))
83+
verbose_name=_("PCPUs (reserved)"))
8684
pcpus = tables.Column("pcpus",
87-
verbose_name=_("PCPUs total"))
88-
pcpus_ar = tables.Column("pcpus_ar",
89-
verbose_name=_("PCPUs allocation ratio"))
90-
memory_used = tables.Column("memory_mb_used",
91-
verbose_name=_("RAM used"),
85+
verbose_name=_("PCPUs (total)"))
86+
memory_used = tables.Column('memory_mb_used',
87+
verbose_name=_("RAM (used)"),
9288
attrs={'data-type': 'size'},
9389
filters=(sizeformat.mb_float_format,))
94-
memory_reserved = tables.Column("memory_mb_reserved",
95-
verbose_name=_("RAM reserved"),
90+
memory_reserved = tables.Column('memory_mb_reserved',
91+
verbose_name=_("RAM (reserved)"),
9692
attrs={'data-type': 'size'},
9793
filters=(sizeformat.mb_float_format,))
98-
memory = tables.Column("memory_mb",
99-
verbose_name=_("RAM total"),
94+
memory = tables.Column('memory_mb',
95+
verbose_name=_("RAM (total)"),
10096
attrs={'data-type': 'size'},
10197
filters=(sizeformat.mb_float_format,))
102-
memory_ar = tables.Column("memory_mb_ar",
103-
verbose_name=_("RAM allocation ratio"))
104-
disk_used = tables.Column("disk_gb_used",
105-
verbose_name=_("Storage used"),
98+
disk_used = tables.Column('disk_gb_used',
99+
verbose_name=_("Storage (used)"),
106100
attrs={'data-type': 'size'},
107101
filters=(sizeformat.diskgbformat,))
108-
disk_reserved = tables.Column("disk_gb_reserved",
109-
verbose_name=_("Storage reserved"),
102+
disk_reserved = tables.Column('disk_gb_reserved',
103+
verbose_name=_("Storage (reserved)"),
110104
attrs={'data-type': 'size'},
111105
filters=(sizeformat.diskgbformat,))
112-
disk = tables.Column("disk_gb",
113-
verbose_name=_("Storage total"),
106+
disk = tables.Column('disk_gb',
107+
verbose_name=_("Storage (total)"),
114108
attrs={'data-type': 'size'},
115109
filters=(sizeformat.diskgbformat,))
116-
disk_ar = tables.Column("disk_gb_ar",
117-
verbose_name=_("Storage allocation ratio"))
118110

119111
def get_object_id(self, provider):
120112
return provider['uuid']

‎openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,38 @@ <h3>{% trans "Resource Providers Summary" %}</h3>
2727
{% for provider in providers %}
2828
<h4>{{ provider.name }}</h4>
2929
<div class="col-sm-4 d3_quota_bar col-lg-3 col-md-2 col-xs-4">
30-
<div class="pie-chart-usage" data-used="{% widthratio provider.vcpus_used provider.vcpus_capacity 100 %}"></div>
30+
<div class="pie-chart-usage" data-used="{% widthratio provider.usages.VCPU provider.inventories.VCPU.total 100 %}"></div>
3131
<div class="h5">{% trans "VCPU Usage" %}</div>
3232
{% if provider.inventories.VCPU != None %}
3333
<div class="h6">
34-
{% blocktrans with used=provider.vcpus_used|intcomma available=provider.vcpus_capacity|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
34+
{% blocktrans with used=provider.usages.VCPU|intcomma available=provider.inventories.VCPU.total|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
3535
</div>
3636
{% endif %}
3737
</div>
3838

3939
<div class="col-sm-4 d3_quota_bar col-lg-3 col-md-2 col-xs-4">
40-
<div class="pie-chart-usage" data-used="{% widthratio provider.pcpus_used provider.pcpus_capacity 100 %}"></div>
40+
<div class="pie-chart-usage" data-used="{% widthratio provider.usages.PCPU provider.inventories.PCPU.total 100 %}"></div>
4141
<div class="h5">{% trans "PCPU Usage" %}</div>
4242
{% if provider.inventories.PCPU != None %}
4343
<div class="h6">
44-
{% blocktrans with used=provider.pcpus_used|intcomma available=provider.pcpus_capacity|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
44+
{% blocktrans with used=provider.usages.PCPU|intcomma available=provider.inventories.PCPU.total|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
4545
</div>
4646
{% endif %}
4747
</div>
4848

4949
<div class="col-sm-4 d3_quota_bar col-lg-3 col-md-2 col-xs-4">
50-
<div class="pie-chart-usage" data-used="{% widthratio provider.memory_mb_used provider.memory_mb_capacity 100 %}"></div>
50+
<div class="pie-chart-usage" data-used="{% widthratio provider.usages.MEMORY_MB provider.inventories.MEMORY_MB.total 100 %}"></div>
5151
<div class="h5">{% trans "Memory Usage" %}</div>
5252
<div class="h6">
53-
{% blocktrans with used=provider.memory_mb_used|mb_float_format available=provider.memory_mb_capacity|mb_float_format %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
53+
{% blocktrans with used=provider.usages.MEMORY_MB|mb_float_format available=provider.inventories.MEMORY_MB.total|mb_float_format %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
5454
</div>
5555
</div>
5656

5757
<div class="col-sm-4 d3_quota_bar col-lg-3 col-md-2 col-xs-4">
58-
<div class="pie-chart-usage" data-used="{% widthratio provider.disk_gb_used provider.disk_gb_capacity 100 %}"></div>
58+
<div class="pie-chart-usage" data-used="{% widthratio provider.usages.DISK_GB provider.inventories.DISK_GB.total 100 %}"></div>
5959
<div class="h5">{% trans "Local Disk Usage" %}</div>
6060
<div class="h6">
61-
{% blocktrans with used=provider.disk_gb_used|diskgbformat available=provider.disk_gb_capacity|diskgbformat %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
61+
{% blocktrans with used=provider.usages.DISK_GB|diskgbformat available=provider.inventories.DISK_GB.total|diskgbformat %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
6262
</div>
6363
</div>
6464
{% endfor %}

0 commit comments

Comments
 (0)