Skip to content

Commit 9ba7b33

Browse files
priteaupriteau
committed
Revert "Use Placement API along with the hypervisor stats"
This reverts commit f3225e5.
1 parent 3a85dde commit 9ba7b33

7 files changed

Lines changed: 23 additions & 226 deletions

File tree

‎openstack_dashboard/api/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
from openstack_dashboard.api import network
3939
from openstack_dashboard.api import neutron
4040
from openstack_dashboard.api import nova
41-
from openstack_dashboard.api import placement
4241
from openstack_dashboard.api import swift
4342

4443

@@ -50,6 +49,5 @@
5049
"network",
5150
"neutron",
5251
"nova",
53-
"placement",
5452
"swift",
5553
]

‎openstack_dashboard/api/placement.py‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

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

Lines changed: 12 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,36 @@ class AdminHypervisorsTable(tables.DataTable):
2222
hostname = tables.WrappingColumn("hypervisor_hostname",
2323
link="horizon:admin:hypervisors:detail",
2424
verbose_name=_("Hostname"))
25+
2526
hypervisor_type = tables.Column("hypervisor_type",
2627
verbose_name=_("Type"))
28+
29+
vcpus_used = tables.Column("vcpus_used",
30+
verbose_name=_("VCPUs (used)"))
31+
32+
vcpus = tables.Column("vcpus",
33+
verbose_name=_("VCPUs (total)"))
34+
2735
memory_used = tables.Column('memory_mb_used',
2836
verbose_name=_("RAM (used)"),
2937
attrs={'data-type': 'size'},
3038
filters=(sizeformat.mb_float_format,))
39+
3140
memory = tables.Column('memory_mb',
3241
verbose_name=_("RAM (total)"),
3342
attrs={'data-type': 'size'},
3443
filters=(sizeformat.mb_float_format,))
44+
3545
local_used = tables.Column('local_gb_used',
3646
verbose_name=_("Local Storage (used)"),
3747
attrs={'data-type': 'size'},
3848
filters=(sizeformat.diskgbformat,))
49+
3950
local = tables.Column('local_gb',
4051
verbose_name=_("Local Storage (total)"),
4152
attrs={'data-type': 'size'},
4253
filters=(sizeformat.diskgbformat,))
54+
4355
running_vms = tables.Column("running_vms",
4456
verbose_name=_("Instances"))
4557

@@ -66,51 +78,3 @@ def get_object_id(self, server):
6678
class Meta(object):
6779
name = "hypervisor_instances"
6880
verbose_name = _("Hypervisor Instances")
69-
70-
71-
class AdminProvidersTable(tables.DataTable):
72-
name = tables.WrappingColumn("name",
73-
verbose_name=_("Resource Provider Name"))
74-
vcpus_used = tables.Column("vcpus_used",
75-
verbose_name=_("VCPUs (used)"))
76-
vcpus_reserved = tables.Column("vcpus_reserved",
77-
verbose_name=_("VCPUs (reserved)"))
78-
vcpus = tables.Column("vcpus",
79-
verbose_name=_("VCPUs (total)"))
80-
pcpus_used = tables.Column("pcpus_used",
81-
verbose_name=_("PCPUs (used)"))
82-
pcpus_reserved = tables.Column("pcpus_reserved",
83-
verbose_name=_("PCPUs (reserved)"))
84-
pcpus = tables.Column("pcpus",
85-
verbose_name=_("PCPUs (total)"))
86-
memory_used = tables.Column('memory_mb_used',
87-
verbose_name=_("RAM (used)"),
88-
attrs={'data-type': 'size'},
89-
filters=(sizeformat.mb_float_format,))
90-
memory_reserved = tables.Column('memory_mb_reserved',
91-
verbose_name=_("RAM (reserved)"),
92-
attrs={'data-type': 'size'},
93-
filters=(sizeformat.mb_float_format,))
94-
memory = tables.Column('memory_mb',
95-
verbose_name=_("RAM (total)"),
96-
attrs={'data-type': 'size'},
97-
filters=(sizeformat.mb_float_format,))
98-
disk_used = tables.Column('disk_gb_used',
99-
verbose_name=_("Storage (used)"),
100-
attrs={'data-type': 'size'},
101-
filters=(sizeformat.diskgbformat,))
102-
disk_reserved = tables.Column('disk_gb_reserved',
103-
verbose_name=_("Storage (reserved)"),
104-
attrs={'data-type': 'size'},
105-
filters=(sizeformat.diskgbformat,))
106-
disk = tables.Column('disk_gb',
107-
verbose_name=_("Storage (total)"),
108-
attrs={'data-type': 'size'},
109-
filters=(sizeformat.diskgbformat,))
110-
111-
def get_object_id(self, provider):
112-
return provider['uuid']
113-
114-
class Meta(object):
115-
name = "providers"
116-
verbose_name = _("Resource Providers")

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from horizon.utils import functions as utils
1818

1919
from openstack_dashboard.api import nova
20-
from openstack_dashboard.api import placement
2120
from openstack_dashboard.dashboards.admin.hypervisors.compute \
2221
import tabs as cmp_tabs
2322
from openstack_dashboard.dashboards.admin.hypervisors import tables
@@ -41,24 +40,7 @@ def get_hypervisors_data(self):
4140
return hypervisors
4241

4342

44-
class ProviderTab(tabs.TableTab):
45-
table_classes = (tables.AdminProvidersTable,)
46-
name = _("Resource Provider")
47-
slug = "provider"
48-
template_name = "horizon/common/_detail_table.html"
49-
50-
def get_providers_data(self):
51-
providers = []
52-
try:
53-
providers = placement.get_providers(self.request)
54-
except Exception:
55-
exceptions.handle(self.request,
56-
_('Unable to retrieve providers information.'))
57-
58-
return providers
59-
60-
6143
class HypervisorHostTabs(tabs.TabGroup):
6244
slug = "hypervisor_info"
63-
tabs = (HypervisorTab, cmp_tabs.ComputeHostTab, ProviderTab)
45+
tabs = (HypervisorTab, cmp_tabs.ComputeHostTab)
6446
sticky = True

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

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,28 @@
77
<div class="quota-dynamic">
88
<h3>{% trans "Hypervisor Summary" %}</h3>
99
<div class="col-sm-4 d3_quota_bar">
10-
<div class="pie-chart-usage" data-used="{% widthratio stats.memory_mb_used stats.memory_mb 100 %}"></div>
11-
<div class="h5">{% trans "Memory Usage" %}</div>
12-
<div class="h6">
13-
{% blocktrans with used=stats.memory_mb_used|mb_float_format available=stats.memory_mb|mb_float_format %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
14-
</div>
15-
</div>
16-
17-
<div class="col-sm-4 d3_quota_bar">
18-
<div class="pie-chart-usage" data-used="{% widthratio stats.local_gb_used stats.local_gb 100 %}"></div>
19-
<div class="h5">{% trans "Local Disk Usage" %}</div>
20-
<div class="h6">
21-
{% blocktrans with used=stats.local_gb_used|diskgbformat available=stats.local_gb|diskgbformat %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
22-
</div>
23-
</div>
24-
</div>
25-
<div class="quota-dynamic">
26-
<h3>{% trans "Resource Providers Summary" %}</h3>
27-
{% for provider in providers %}
28-
<h4>{{ provider.name }}</h4>
29-
<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.usages.VCPU provider.inventories.VCPU.total 100 %}"></div>
10+
<div class="pie-chart-usage" data-used="{% widthratio stats.vcpus_used stats.vcpus 100 %}"></div>
3111
<div class="h5">{% trans "VCPU Usage" %}</div>
32-
{% if provider.inventories.VCPU != None %}
33-
<div class="h6">
34-
{% blocktrans with used=provider.usages.VCPU|intcomma available=provider.inventories.VCPU.total|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
35-
</div>
36-
{% endif %}
37-
</div>
38-
39-
<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.usages.PCPU provider.inventories.PCPU.total 100 %}"></div>
41-
<div class="h5">{% trans "PCPU Usage" %}</div>
42-
{% if provider.inventories.PCPU != None %}
4312
<div class="h6">
44-
{% blocktrans with used=provider.usages.PCPU|intcomma available=provider.inventories.PCPU.total|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
13+
{% blocktrans with used=stats.vcpus_used|intcomma available=stats.vcpus|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
4514
</div>
46-
{% endif %}
4715
</div>
4816

49-
<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.usages.MEMORY_MB provider.inventories.MEMORY_MB.total 100 %}"></div>
17+
<div class="col-sm-4 d3_quota_bar">
18+
<div class="pie-chart-usage" data-used="{% widthratio stats.memory_mb_used stats.memory_mb 100 %}"></div>
5119
<div class="h5">{% trans "Memory Usage" %}</div>
5220
<div class="h6">
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 %}
21+
{% blocktrans with used=stats.memory_mb_used|mb_float_format available=stats.memory_mb|mb_float_format %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
5422
</div>
5523
</div>
5624

57-
<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.usages.DISK_GB provider.inventories.DISK_GB.total 100 %}"></div>
25+
<div class="col-sm-4 d3_quota_bar">
26+
<div class="pie-chart-usage" data-used="{% widthratio stats.local_gb_used stats.local_gb 100 %}"></div>
5927
<div class="h5">{% trans "Local Disk Usage" %}</div>
6028
<div class="h6">
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 %}
29+
{% blocktrans with used=stats.local_gb_used|diskgbformat available=stats.local_gb|diskgbformat %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}
6230
</div>
6331
</div>
64-
{% endfor %}
6532
</div>
6633
<div class="row-fluid">
6734
<div class="col-sm-12">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_service_list_unavailable(self):
7676
self.mock_service_list.side_effect = self.exceptions.nova
7777

7878
resp = self.client.get(reverse('horizon:admin:hypervisors:index'))
79-
self.assertMessageCount(resp, error=2, warning=0)
79+
self.assertMessageCount(resp, error=1, warning=0)
8080

8181
self.mock_hypervisor_list.assert_called_once_with(
8282
test.IsHttpRequest())

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ def get_context_data(self, **kwargs):
3737
except Exception:
3838
exceptions.handle(self.request,
3939
_('Unable to retrieve hypervisor statistics.'))
40-
try:
41-
context["providers"] = api.placement.get_providers(self.request)
42-
except Exception:
43-
exceptions.handle(self.request,
44-
_('Unable to retrieve providers statistics.'))
40+
4541
return context
4642

4743

0 commit comments

Comments
 (0)