x/tuskar-ui
Code Issues Proposed changes

Creates BaremetalNode class

Browse Source 
This commit creates the BaremetalNode class and updates
the usage within the UI.

Later commits will separate out the attributes and methods of
BaremetalNode and Node

Change-Id: Ib3a6fc4f78fd904ba40da7f83b58d97c12a47a2b
Partial-Bug: #1236192
This commit is contained in:
Tzu-Mainn Chen 2013-10-07 03:02:22 -04:00
parent ab4a6733f5
commit 385b07a47b
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tuskar_ui/api.py
View File

@ -322,6 +322,11 @@ class Node(StringIdAPIResourceWrapper):
return self._running_virtual_machines
class BaremetalNode(Node):
_attrs = ['id', 'pm_address', 'cpus', 'memory_mb', 'service_host',
'local_gb', 'pm_user']
class Rack(StringIdAPIResourceWrapper):
"""Wrapper for the Rack object returned by the
dummy model.

6
tuskar_ui/infrastructure/resource_management/nodes/tests.py
View File

@ -21,15 +21,15 @@ from tuskar_ui import api as tuskar
from tuskar_ui.test import helpers as test
class ResourceViewTests(test.BaseAdminViewTests):
class NodeViewTests(test.BaseAdminViewTests):
unracked_page = urlresolvers.reverse(
'horizon:infrastructure:resource_management:nodes:unracked')
@test.create_stubs({tuskar.Node: ('list_unracked',), })
@test.create_stubs({tuskar.BaremetalNode: ('list_unracked',), })
def test_unracked(self):
unracked_nodes = self.baremetal_unracked_nodes.list()
tuskar.Node.list_unracked(
tuskar.BaremetalNode.list_unracked(
mox.IsA(http.HttpRequest)).AndReturn(unracked_nodes)
self.mox.ReplayAll()

2
tuskar_ui/infrastructure/resource_management/nodes/views.py
View File

@ -30,7 +30,7 @@ class UnrackedView(horizon_tables.DataTableView):
def get_data(self):
try:
nodes = tuskar.Node.list_unracked(self.request)
nodes = tuskar.BaremetalNode.list_unracked(self.request)
except Exception:
nodes = []
exceptions.handle(self.request,

4
tuskar_ui/infrastructure/resource_management/racks/tests.py
View File

@ -47,14 +47,14 @@ class RackViewTests(test.BaseAdminViewTests):
#
@test.create_stubs({tuskar.Rack: ('list', 'create',),
tuskar.ResourceClass: ('list',),
tuskar.Node: ('create',)})
tuskar.BaremetalNode: ('create',)})
def test_create_rack_post(self):
node = self.baremetal_nodes.first()
tuskar.Rack.list(
mox.IsA(http.request.HttpRequest)).AndReturn(
self.tuskar_racks.list())
tuskar.Node.create(
tuskar.BaremetalNode.create(
mox.IsA(http.request.HttpRequest),
name='New Node',
cpus=u'1',

2
tuskar_ui/infrastructure/resource_management/racks/workflows.py
View File

@ -165,7 +165,7 @@ class CreateRack(workflows.Workflow):
def handle(self, request, data):
try:
if data['node_name'] is not None:
node = tuskar.Node.create(
node = tuskar.BaremetalNode.create(
request,
name=data['node_name'],
cpus=data['cpus'],