3067584f71
In some situations, JS's naturalSort sorts hypervisor_hostname in an unusual order. For example, this is a usually ordered list: east-01, east-02, west-01, west-02 while the result made by naturalSort is: east-01, west-01, east-02, west-02 Also, this is inconsistent with the other tables as they are using datatable's default sort. Actually, the default sort does natural ordering to numbers in text. So we can use the default sort instead of naturalSort without a problem. As the hypervisor table is the only user of naturalSort, all stuff for naturalSort were removed. Change-Id: I8df3ff72a33d194a5b6bc1692aac7878a611ae44 Closes-Bug: #1480563
81 lines
3.0 KiB
Python
81 lines
3.0 KiB
Python
# Copyright 2013 B1 Systems GmbH
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from django.utils.translation import ugettext_lazy as _
|
|
|
|
from horizon import tables
|
|
from horizon.templatetags import sizeformat
|
|
|
|
|
|
class AdminHypervisorsTable(tables.DataTable):
|
|
hostname = tables.Column("hypervisor_hostname",
|
|
link="horizon:admin:hypervisors:detail",
|
|
verbose_name=_("Hostname"))
|
|
|
|
hypervisor_type = tables.Column("hypervisor_type",
|
|
verbose_name=_("Type"))
|
|
|
|
vcpus_used = tables.Column("vcpus_used",
|
|
verbose_name=_("VCPUs (used)"))
|
|
|
|
vcpus = tables.Column("vcpus",
|
|
verbose_name=_("VCPUs (total)"))
|
|
|
|
memory_used = tables.Column('memory_mb_used',
|
|
verbose_name=_("RAM (used)"),
|
|
attrs={'data-type': 'size'},
|
|
filters=(sizeformat.mb_float_format,))
|
|
|
|
memory = tables.Column('memory_mb',
|
|
verbose_name=_("RAM (total)"),
|
|
attrs={'data-type': 'size'},
|
|
filters=(sizeformat.mb_float_format,))
|
|
|
|
local_used = tables.Column('local_gb_used',
|
|
verbose_name=_("Local Storage (used)"),
|
|
attrs={'data-type': 'size'},
|
|
filters=(sizeformat.diskgbformat,))
|
|
|
|
local = tables.Column('local_gb',
|
|
verbose_name=_("Local Storage (total)"),
|
|
attrs={'data-type': 'size'},
|
|
filters=(sizeformat.diskgbformat,))
|
|
|
|
running_vms = tables.Column("running_vms",
|
|
verbose_name=_("Instances"))
|
|
|
|
def get_object_id(self, hypervisor):
|
|
return "%s_%s" % (hypervisor.id,
|
|
hypervisor.hypervisor_hostname)
|
|
|
|
class Meta(object):
|
|
name = "hypervisors"
|
|
verbose_name = _("Hypervisors")
|
|
|
|
|
|
class AdminHypervisorInstancesTable(tables.DataTable):
|
|
name = tables.Column("name",
|
|
link="horizon:admin:instances:detail",
|
|
verbose_name=_("Instance Name"))
|
|
|
|
instance_id = tables.Column("uuid",
|
|
verbose_name=_("Instance ID"))
|
|
|
|
def get_object_id(self, server):
|
|
return server['uuid']
|
|
|
|
class Meta(object):
|
|
name = "hypervisor_instances"
|
|
verbose_name = _("Hypervisor Instances")
|