Remove nodes method from Overcloud object

This method was judged extraneous and distracting.

Change-Id: I750987c76db6108e09f53f7e1c693ae52b1e7b68
This commit is contained in:
Tzu-Mainn Chen
2014-01-30 10:49:25 -05:00
parent 1ad8b34db4
commit 17f8899de2
4 changed files with 10 additions and 30 deletions

View File

@@ -197,22 +197,6 @@ class Overcloud(base.APIDictWrapper):
node=node))
return joined_resources
@memoized.memoized
def nodes(self, resource_category):
"""Return a list of Nodes in the Overcloud that match a
Resource Category
:param resource_category: category of resources to retrieve
nodes from
:type resource_category: tuskar_ui.api.ResourceCategory
:return: list of Nodes in the Overcloud that match a Resource
Category, or an empty list if there are none
:rtype: list of tuskar_ui.api.Node
"""
resources = self.resources(resource_category, with_joins=True)
return [r.node for r in resources]
class Node(base.APIResourceWrapper):
_attrs = ('uuid', 'instance_uuid', 'driver', 'driver_info',

View File

@@ -49,7 +49,9 @@ class OverviewTab(tabs.Tab):
return context
def _get_category_data(self, overcloud, category):
nodes = overcloud.nodes(category)
resources = overcloud.resources(category, with_joins=True)
nodes = [r.node for r in resources]
category.node_count = len(nodes)
if category.node_count > 0:
category.running_node_count = len(

View File

@@ -72,7 +72,7 @@ class ResourceCategoryView(horizon_tables.DataTableView):
overcloud = self._get_overcloud()
category = self._get_category(overcloud)
return overcloud.nodes(category)
return self._get_nodes(overcloud, category)
def get_context_data(self, **kwargs):
context = super(ResourceCategoryView, self).get_context_data(**kwargs)
@@ -82,10 +82,15 @@ class ResourceCategoryView(horizon_tables.DataTableView):
context['category'] = category
context['image'] = category.image
context['nodes'] = overcloud.nodes(category)
context['nodes'] = self._get_nodes(overcloud, category)
return context
@memoized.memoized
def _get_nodes(self, overcloud, category):
resources = overcloud.resources(category, with_joins=True)
return [r.node for r in resources]
@memoized.memoized
def _get_overcloud(self):
overcloud_id = self.kwargs['overcloud_id']

View File

@@ -85,17 +85,6 @@ class TuskarAPITests(test.APITestCase):
self.assertIsInstance(i, api.Resource)
self.assertEqual(1, len(ret_val))
def test_overcloud_nodes(self):
overcloud = self.tuskarclient_overclouds.first()
category = self.tuskarclient_resource_categories.first()
ret_val = api.Overcloud(overcloud).nodes(
api.ResourceCategory(category))
for n in ret_val:
self.assertIsInstance(n, api.Node)
self.assertIsInstance(n.instance, servers.Server)
self.assertEqual(1, len(ret_val))
def test_node_create(self):
node = self.ironicclient_nodes.first()