From c8a8a1b35bad2880c347b62ed5175928f3026c70 Mon Sep 17 00:00:00 2001
From: Steve Leon <kokhang@gmail.com>
Date: Thu, 7 May 2015 18:02:54 -0700
Subject: [PATCH] Fixed cluster view

cluster.uri was changed to cluster.endpoints

Change-Id: I3a1fe569c0fb808bd2362ea9c7ab659bed91333f
---
 cuedashboard/api.py                           | 19 ++-----------------
 cuedashboard/queues/tables.py                 |  5 +++--
 .../templates/queues/_detail_overview.html    |  2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/cuedashboard/api.py b/cuedashboard/api.py
index c0c94a9..4e5a016 100644
--- a/cuedashboard/api.py
+++ b/cuedashboard/api.py
@@ -20,7 +20,6 @@ from django.conf import settings
 from cueclient.v1 import client
 from keystoneclient import session as ksc_session
 from keystoneclient.auth.identity import v2
-from collections import namedtuple
 from openstack_dashboard import api
 from horizon.utils.memoized import memoized  # noqa
 
@@ -37,16 +36,12 @@ def cueclient(request):
 
 
 def clusters_list(request, marker=None):
-    clusters = []
-    clusters_dict = cueclient(request).clusters.list()
-    for cluster_dict in clusters_dict:
-        clusters.append(_to_cluster_object(cluster_dict))
+    clusters = cueclient(request).clusters.list()
     return clusters
 
 
 def cluster_get(request, cluster_id):
-    cluster_dict = cueclient(request).clusters.get(cluster_id)
-    cluster = _to_cluster_object(cluster_dict['cluster'])
+    cluster = cueclient(request).clusters.get(cluster_id)
     return cluster
 
 
@@ -61,13 +56,3 @@ def delete_cluster(request, cluster_id):
 
 def flavor(request, flavor_id):
     return api.nova.flavor_get(request, flavor_id)
-
-
-# todo
-# This is needed because the cue client returns a dict
-# instead of a cluster object.
-def _to_cluster_object(cluster_dict):
-    endpoints = ["".join((endpoint['type'], '://', endpoint['uri']))
-                 for endpoint in cluster_dict['end_points']]
-    cluster_dict['url'] = endpoints
-    return namedtuple('Cluster', cluster_dict)(**cluster_dict)
diff --git a/cuedashboard/queues/tables.py b/cuedashboard/queues/tables.py
index f3d5c98..f78fd1f 100644
--- a/cuedashboard/queues/tables.py
+++ b/cuedashboard/queues/tables.py
@@ -63,8 +63,9 @@ class UpdateRow(tables.Row):
 
 
 def format_endpoints(cluster):
-    if hasattr(cluster, "url"):
-        return ', '.join(cluster.url)
+    if hasattr(cluster, "end_points"):
+        return ', '.join("%s://%s" % (endpoint['type'], endpoint['uri'])
+                         for endpoint in cluster.end_points)
     return "-"
 
 
diff --git a/cuedashboard/templates/queues/_detail_overview.html b/cuedashboard/templates/queues/_detail_overview.html
index e82682f..3e9749f 100644
--- a/cuedashboard/templates/queues/_detail_overview.html
+++ b/cuedashboard/templates/queues/_detail_overview.html
@@ -17,6 +17,6 @@
     <dt>{% trans "Cluster Size" %}</dt>
     <dd>{{ cluster.size|default:_("-") }}</dd>
     <dt>{% trans "Endpoint" %}</dt>
-    <dd>{{ cluster.url|join:", " |default:_("-") }}</dd>
+    <dd>{{ cluster.end_points|join:", " |default:_("-") }}</dd>
   </dl>
 </div>