From 4a8736cf07e9baf34cf0014774b4a726f75ad7c7 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Thu, 23 Oct 2014 15:35:54 +0200 Subject: [PATCH] Adding maintenance state to pie chart Adding maintenance state to nodes overview page pie chart. Change-Id: I398ac65f7cfefd9681ceac95af7da91c292d701c --- tuskar_ui/infrastructure/nodes/tabs.py | 25 ++++++++++++++++--- .../nodes/templates/nodes/_overview.html | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/tuskar_ui/infrastructure/nodes/tabs.py b/tuskar_ui/infrastructure/nodes/tabs.py index f0b9b21bc..f490949b9 100644 --- a/tuskar_ui/infrastructure/nodes/tabs.py +++ b/tuskar_ui/infrastructure/nodes/tabs.py @@ -42,6 +42,22 @@ class OverviewTab(tabs.Tab): nodes_provisioned = api.node.Node.list(request, associated=True) nodes_free = api.node.Node.list(request, associated=False) + nodes_all_count = (utils.length(nodes_provisioned) + + utils.length(nodes_free)) + + nodes_provisioned_maintenance = list(utils.filter_items( + nodes_provisioned, maintenance=True)) + nodes_provisioned_not_maintenance = list( + set(nodes_provisioned) - set(nodes_provisioned_maintenance)) + + nodes_free_maintenance = list(utils.filter_items( + nodes_free, maintenance=True)) + nodes_free_not_maintenance = list( + set(nodes_free) - set(nodes_free_maintenance)) + + nodes_maintenance = ( + nodes_provisioned_maintenance + nodes_free_maintenance) + nodes_provisioned_down = utils.filter_items( nodes_provisioned, power_state__not_in=api.node.POWER_ON_STATES) nodes_free_down = utils.filter_items( @@ -57,10 +73,11 @@ class OverviewTab(tabs.Tab): 'local_gb': local_gb, 'nodes_up_count': utils.length(nodes_up), 'nodes_down_count': utils.length(nodes_down), - 'nodes_provisioned_count': utils.length(nodes_provisioned), - 'nodes_free_count': utils.length(nodes_free), - 'nodes_all_count': (utils.length(nodes_provisioned) + - utils.length(nodes_free)) + 'nodes_provisioned_count': utils.length( + nodes_provisioned_not_maintenance), + 'nodes_free_count': utils.length(nodes_free_not_maintenance), + 'nodes_maintenance_count': utils.length(nodes_maintenance), + 'nodes_all_count': nodes_all_count } if api_base.is_service_enabled(self.request, 'metering'): diff --git a/tuskar_ui/infrastructure/nodes/templates/nodes/_overview.html b/tuskar_ui/infrastructure/nodes/templates/nodes/_overview.html index efaf86957..3a4c13fc9 100644 --- a/tuskar_ui/infrastructure/nodes/templates/nodes/_overview.html +++ b/tuskar_ui/infrastructure/nodes/templates/nodes/_overview.html @@ -17,7 +17,7 @@

{% trans 'Nodes Status' %}

-
+

{% trans 'Power Status' %}