From 8cdd8b24337a2e4843a51d6968a4cf6dab822136 Mon Sep 17 00:00:00 2001
From: Imre Farkas <ifarkas@redhat.com>
Date: Thu, 25 Jul 2013 16:01:37 +0200
Subject: Add charts to provisioned node details page

Change-Id: If138e9e7896c358de7b788f6f3cdeff2346c7414
---
 openstack_dashboard/api/tuskar.py                  | 34 ++++++++-
 .../nodes/_detail_overview.html                    | 83 ++++++++++++++++++++--
 .../resource_management/nodes/detail.html          |  7 ++
 3 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/openstack_dashboard/api/tuskar.py b/openstack_dashboard/api/tuskar.py
index 08bd304c..2ebdeb45 100644
--- a/openstack_dashboard/api/tuskar.py
+++ b/openstack_dashboard/api/tuskar.py
@@ -156,6 +156,27 @@ class Node(StringIdAPIResourceWrapper):
                                 usage=usage, rack=rack)
         node.save()
 
+    @property
+    def list_flavors(self):
+        if not hasattr(self, '_flavors'):
+            # FIXME: just a mock of used instances, add real values
+            used_instances = 0
+
+            resource_class = self.rack.resource_class
+            added_flavors = tuskarclient(self.request).flavors\
+                                                      .list(resource_class.id)
+            self._flavors = []
+            for f in added_flavors:
+                flavor_obj = Flavor(f)
+                #flavor_obj.max_vms = f.max_vms
+
+                # FIXME just a mock of used instances, add real values
+                used_instances += 5
+                flavor_obj.used_instances = used_instances
+                self._flavors.append(flavor_obj)
+
+        return self._flavors
+
     @property
     def capacities(self):
         if not hasattr(self, '_capacities'):
@@ -251,8 +272,19 @@ class Node(StringIdAPIResourceWrapper):
         return self._vm_capacity
 
     @property
+    # FIXME: just mock implementation, add proper one
+    def running_instances(self):
+        return 4
+
+    @property
+    # FIXME: just mock implementation, add proper one
+    def remaining_capacity(self):
+        return 100 - self.running_instances
+
+    @property
+    # FIXME: just mock implementation, add proper one
     def is_provisioned(self):
-        return False
+        return self.rack is not None
 
     @property
     def alerts(self):
diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/_detail_overview.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/_detail_overview.html
index e6823ed0..032e4477 100644
--- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/_detail_overview.html
+++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/_detail_overview.html
@@ -1,5 +1,6 @@
 {% load i18n sizeformat %}
 {% load url from future %}
+{% load chart_helpers %}
 
 <div class="info row-fluid detail">
   <div class="span4">
@@ -53,7 +54,7 @@
           </div>
         </td>
         <td>
-          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data">{{ node.cpu.usage }}/{{ node.cpu.value }} {{ node.cpu.unit }}</a>
+          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data" data-series="cpu">{{ node.cpu.usage }}/{{ node.cpu.value }} {{ node.cpu.unit }}</a>
         </td>
         {% else %}
         <td>
@@ -78,7 +79,7 @@
           </div>
         </td>
         <td>
-          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data">{{ node.ram.usage }}/{{ node.ram.value }} {{ node.ram.unit }}</a>
+          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data" data-series="ram">{{ node.ram.usage }}/{{ node.ram.value }} {{ node.ram.unit }}</a>
         </td>
         {% else %}
         <td>
@@ -103,7 +104,7 @@
           </div>
         </td>
         <td>
-          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data">{{ node.storage.usage }}/{{ node.storage.value }} {{ node.storage.unit }}</a>
+          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data" data-series="storage">{{ node.storage.usage }}/{{ node.storage.value }} {{ node.storage.unit }}</a>
         </td>
         {% else %}
         <td>
@@ -128,7 +129,7 @@
           </div>
         </td>
         <td>
-          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data">{{ node.network.usage }}/{{ node.network.value }} {{ node.network.unit }}</a>
+          <a href="#" data-chart-type="modal_line_chart" data-url="/infrastructure/resource_management/racks/usage_data" data-series="network">{{ node.network.usage }}/{{ node.network.value }} {{ node.network.unit }}</a>
         </td>
         {% else %}
         <td>
@@ -149,6 +150,56 @@
     <h4>{% trans "Summary of Instances and Usage" %}</h4>
     <hr class="header_rule">
     {% if node.is_provisioned %}
+    <div>
+      <strong>{{ node.running_instances }}</strong> instances
+      <strong>{{ node.remaining_capacity }}%</strong>  capacity remaining
+    </div>
+    <div class="flavor_usage_bar"
+         data-popup-free='{{ node|remaining_capacity_by_flavors }}'
+         data-single-bar-orientation="horizontal"
+         data-single-bar-height="50"
+         data-single-bar-width="100%"
+         data-single-bar-used="{{ node|all_used_instances }}"
+         data-single-bar-auto-scale-selector=".flavors_scale_selector"
+         data-single-bar-color-scale-range='["#000060", "#99FFFF"]'>
+    </div>
+
+    <table class="flavor_usages">
+      <tr>
+        {% for flavor in node.list_flavors %}
+          <td class="flavor_usage_label">
+            <a href="{% url 'horizon:infrastructure:resource_management:flavors:detail' flavor.id %}">{{ flavor.name }}</a>
+          </td>
+        {% endfor %}
+      </tr>
+      <tr>
+        {% for flavor in node.list_flavors %}
+          <td>
+            <div class="flavor_usage_bar flavors_scale_selector"
+                 data-popup-average='<p>Average capacity consumed by instances of {{flavor.name}} flavor in {{node.name}} class.</p>
+                                     <p>{{ flavor.used_instances }}%, <strong>{{ flavor.used_instances }} instances</strong></p>'
+                 data-single-bar-orientation="vertical"
+                 data-single-bar-height="100%"
+                 data-single-bar-width="40"
+                 data-single-bar-used="{{ flavor.used_instances }}"
+                 data-single-bar-average-used="{{ 50 }}"
+                 data-single-bar-auto-scale-selector=".flavors_scale_selector"
+                 data-single-bar-color-scale-range='["#000060", "#99FFFF"]'>
+            </div>
+          </td>
+        {% endfor %}
+      </tr>
+      <tr>
+        {% for flavor in resource_class.list_flavors %}
+          <td class="modal_chart flavor_usage_text"><a href="{{ "#" }}">{{ flavor.used_instances }}%</a></td>
+        {% endfor %}
+      </tr>
+      <tr>
+        {% for flavor in resource_class.list_flavors %}
+          <td class="flavor_usage_text">{{ flavor.used_instances }} inst.</td>
+        {% endfor %}
+      </tr>
+    </table>
 
     {% else %}
     <p>{% trans "No data available yet." %}</p>
@@ -175,7 +226,29 @@
     <h4>{% trans "Top Communicating Nodes" %}</h4>
     <hr class="header_rule">
     {% if node.is_provisioned %}
-
+    <div class="communication_charts_wrapper">
+      <div class="communication_chart_wrapper">
+        <h5>The most contacting</h5>
+        <div id="most_contacting_racks"
+             class="communication_chart"
+             data-chart-type="circles_chart"
+             data-url="{% url 'horizon:infrastructure:resource_management:racks:top_communicating' node.rack.id %}?cond=from"
+             data-time="now"
+             data-size="22">
+        </div>
+      </div>
+      <div class="communication_chart_connection">-->BG-IMG--></div>
+      <div class="communication_chart_wrapper">
+        <h5>The most contacted</h5>
+        <div id="most_contacted_racks"
+             class="communication_chart"
+             data-chart-type="circles_chart"
+             data-url="{% url 'horizon:infrastructure:resource_management:racks:top_communicating' node.rack.id %}?cond=to"
+             data-time="now"
+             data-size="22">
+        </div>
+      </div>
+    </div>
     {% else %}
     <p>{% trans "No data available yet." %}</p>
     {% endif %}
diff --git a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html
index 42f2f73d..729727e2 100644
--- a/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html
+++ b/openstack_dashboard/dashboards/infrastructure/resource_management/templates/resource_management/nodes/detail.html
@@ -28,6 +28,7 @@
     <tr>
       <td class="capacity_label">{% trans "Usage" %}:</td>
       <td>
+        {% if node.is_provisioned %}
         <div id="node_usage"
              class="capacity_bar"
              data-chart-type="capacity_bar_chart"
@@ -35,6 +36,12 @@
              data-capacity-used="{{ node.vm_capacity.usage }}"
              data-average-capacity-used="{{ 4 }}">
         </div>
+        {% else %}
+        <div id="node_usage"
+             class="capacity_bar"
+             data-chart-type="capacity_bar_chart">
+        </div>
+        {% endif %}
       </td>
     </tr>
   </table>
-- 
cgit v1.2.1