diff --git a/openstack_dashboard/api/management.py b/openstack_dashboard/api/management.py index 5784b7fc9..a22395dc0 100644 --- a/openstack_dashboard/api/management.py +++ b/openstack_dashboard/api/management.py @@ -538,8 +538,8 @@ class ResourceClass(StringIdAPIResourceWrapper): return self.__dict__['_running_virtual_machines'] @property - def total_cpu(self): - if "_total_cpu" not in self.__dict__: + def cpu(self): + if "_cpu" not in self.__dict__: try: attrs = dummymodels.Capacity.objects\ .filter(node__rack__resource_class=self._apiresource)\ @@ -550,15 +550,15 @@ class ResourceClass(StringIdAPIResourceWrapper): 'value': _('Unable to retrieve ' '(Are the nodes configured properly?)'), 'unit': ''} - total_cpu = dummymodels.Capacity(name=attrs['name'], + cpu = dummymodels.Capacity(name=attrs['name'], value=attrs['value'], unit=attrs['unit']) - self._total_cpu = Capacity(total_cpu) - return self.__dict__['_total_cpu'] + self._cpu = Capacity(cpu) + return self.__dict__['_cpu'] @property - def total_ram(self): - if "_total_ram" not in self.__dict__: + def ram(self): + if "_ram" not in self.__dict__: try: attrs = dummymodels.Capacity.objects\ .filter(node__rack__resource_class=self._apiresource)\ @@ -569,15 +569,15 @@ class ResourceClass(StringIdAPIResourceWrapper): 'value': _('Unable to retrieve ' '(Are the nodes configured properly?)'), 'unit': ''} - total_ram = dummymodels.Capacity(name=attrs['name'], + ram = dummymodels.Capacity(name=attrs['name'], value=attrs['value'], unit=attrs['unit']) - self._total_ram = Capacity(total_ram) - return self.__dict__['_total_ram'] + self._ram = Capacity(ram) + return self.__dict__['_ram'] @property - def total_storage(self): - if "_total_storage" not in self.__dict__: + def storage(self): + if "_storage" not in self.__dict__: try: attrs = dummymodels.Capacity.objects\ .filter(node__rack__resource_class=self._apiresource)\ @@ -588,11 +588,46 @@ class ResourceClass(StringIdAPIResourceWrapper): 'value': _('Unable to retrieve ' '(Are the nodes configured properly?)'), 'unit': ''} - total_storage = dummymodels.Capacity(name=attrs['name'], + storage = dummymodels.Capacity(name=attrs['name'], value=attrs['value'], unit=attrs['unit']) - self._total_storage = Capacity(total_storage) - return self.__dict__['_total_storage'] + self._storage = Capacity(storage) + return self.__dict__['_storage'] + + @property + def network(self): + if "_network" not in self.__dict__: + try: + attrs = dummymodels.Capacity.objects\ + .filter(node__rack__resource_class=self._apiresource)\ + .values('name', 'unit').annotate(value=Sum('value'))\ + .filter(name='network')[0] + except: + attrs = {'name': 'network', + 'value': _('Unable to retrieve ' + '(Are the nodes configured properly?)'), + 'unit': ''} + network = dummymodels.Capacity(name=attrs['name'], + value=attrs['value'], + unit=attrs['unit']) + self._network = Capacity(network) + return self.__dict__['_network'] + + @property + def vm_capacity(self): + if "_vm_capacity" not in self.__dict__: + try: + value = dummymodels.ResourceClassFlavor.objects\ + .filter(resource_class=self._apiresource)\ + .aggregate(Max("max_vms"))['max_vms__max'] + except: + value = _("Unable to retrieve vm capacity") + + vm_capacity = dummymodels.Capacity(name=_("Max VMs"), + value=value, + unit=_("VMs")) + self._vm_capacity = Capacity(vm_capacity) + return self.__dict__['_vm_capacity'] ########################################################################## # ResourceClass Instance methods diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/resource_classes/tables.py b/openstack_dashboard/dashboards/infrastructure/resource_management/resource_classes/tables.py index 2ad0ba2c9..9bf9eb9f5 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/resource_classes/tables.py +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/resource_classes/tables.py @@ -162,14 +162,18 @@ class UpdateFlavorsClass(tables.LinkAction): class ResourceClassDetailResourcesTable(racks_tables.RacksTable): - total_cpu = tables.Column("total_cpu", - verbose_name=_("Total CPU")) - total_ram = tables.Column("total_ram", - verbose_name=_("Total RAM")) - total_disk = tables.Column("total_disk", - verbose_name=_("Total DISK")) - usage = tables.Column("usage", - verbose_name=_("Usage")) + cpu = tables.Column("cpu", + verbose_name=_("Total CPU"), + filters=(lambda x: getattr(x, 'value', ''),)) + ram = tables.Column("ram", + verbose_name=_("Total RAM"), + filters=(lambda x: getattr(x, 'value', ''),)) + storage = tables.Column("storage", + verbose_name=_("Total Disk"), + filters=(lambda x: getattr(x, 'value', ''),)) + vm_capacity = tables.Column("vm_capacity", + verbose_name=_("VM Capacity"), + filters=(lambda x: getattr(x, 'value', ''),)) class Meta: name = "resources" @@ -177,7 +181,7 @@ class ResourceClassDetailResourcesTable(racks_tables.RacksTable): table_actions = (ResourcesFilterAction, UpdateResourcesClass) columns = ( 'name', 'subnet', 'location', 'node_count', - 'total_cpu', 'total_ram', 'total_disk', 'usage') + 'cpu', 'ram', 'storage', 'vm_capacity') class ResourceClassDetailFlavorsTable(flavors_tables.FlavorsTable): diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_overview.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_overview.html index c9cd421b4..5b5da70a8 100644 --- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_overview.html +++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_overview.html @@ -4,68 +4,127 @@

{% trans "Resource Class Overview" %}

-

{% trans "Info" %}

-
-
-
{% trans "Name" %}
-
{{ resource_class.name }}
-
{% trans "Service Type" %}
-
{{ resource_class.service_type }}
-
{% trans "Status" %}
-
{{ resource_class.status|default:_("normal") }}
-
-
- -
-

{% trans "Compute Power" %}

-
-
-
{% trans "Racks" %}
-
{{ resource_class.racks|length }}
-
{% trans "Nodes" %}
-
{{ resource_class.nodes|length }}
-
{% trans "Total CPU" %}
-
{{ resource_class.total_cpu.value }} {{ resource_class.total_cpu.unit }}
-
{% trans "Total RAM" %}
-
{{ resource_class.total_ram.value }} {{ resource_class.total_ram.unit }}
-
{% trans "Total Storage" %}
-
{{ resource_class.total_storage.value }} {{ resource_class.total_storage.unit }}
-
-
- -
-

{% trans "Running Virtual Machines" %}

-
-
- {% for flavor_count in resource_class.running_virtual_machines %} -
{{ flavor_count.flavor.name }}
-
{{ flavor_count.max_vms }}
- {% endfor %} -
-
- -
-

{% trans "Virtual Capacity" %}

-
-
- {% for flavor_count in resource_class.resource_class_flavors %} -
{{ flavor_count.flavor.name }}
-
{{ flavor_count.max_vms }}
- {% endfor %} -
-
- -
-
-
-

Summary of instances and usage

-
+
+

{% trans "About" %}

+
+
+
{% trans "Racks" %}
+
{{ resource_class.racks|length }}
+
{% trans "Nodes" %}
+
{{ resource_class.nodes|length }}
+
+ +
+

{% trans "Provided Service" %}

+
+
+
{% trans "Type" %}
+
{{ resource_class.service_type }}
+
{% trans "Flavors" %}
+
{{ resource_class.flavors|length }}
+
{% trans "Active Instances" %}
+
{{ resource_class.running_virtual_machines|length }}
+
+ +
+ +
+

{% trans "Capacities" %}

+
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "CPU" %}: +
+
+ 		+ {{ resource_class.cpu.usage }}/{{ resource_class.cpu.value }} {{ resource_class.cpu.unit }} +
{% trans "RAM" %}: +
+
+ 		+ {{ resource_class.ram.usage }}/{{ resource_class.ram.value }} {{ resource_class.ram.unit }} +
{% trans "Storage" %}: +
+
+ 		+ {{ resource_class.storage.usage }}/{{ resource_class.storage.value }} {{ resource_class.storage.unit }} +
{% trans "Network" %}: +
+
+ 		+ {{ resource_class.network.usage }}/{{ resource_class.network.value }} {{ resource_class.network.unit }} +
+
+
+ +
-
-

Rack health

-
-
+

{% trans "Running Virtual Machines" %}

+
+
+ {% for flavor_count in resource_class.running_virtual_machines %} +
{{ flavor_count.flavor.name }}
+
{{ flavor_count.max_vms }}
+ {% endfor %} +
+
+ +
+

{% trans "Virtual Capacity" %}

+
+
+ {% for flavor_count in resource_class.resource_class_flavors %} +
{{ flavor_count.flavor.name }}
+
{{ flavor_count.max_vms }}
+ {% endfor %} +
+
+
+ +
+
+

Summary of instances and usage

+
+
+ +
+
+

Rack health

+
    {{ resource_class.name }} +
    - {{ tab_group.render }} +
    + + + + + +
    {% trans "Usage" %}: +
    +
    +
    +
    + + {{ tab_group.render }}
    + + {% endblock %}