summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzu-Mainn Chen <tzumainn@redhat.com>2013-10-07 03:02:22 -0400
committerTzu-Mainn Chen <tzumainn@redhat.com>2013-10-07 09:35:37 -0400
commit385b07a47b6aa411420b1a2f838b6e2da3f10fa5 (patch)
treee0f902ad779dd0e525c75e495d67cf972d666b83
parentab4a6733f5046ca1e23cc38a20a0b1f7bbc9b099 (diff)
downloadtuskar-ui-385b07a47b6aa411420b1a2f838b6e2da3f10fa5.tar.gz
Creates BaremetalNode class
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
-rw-r--r--tuskar_ui/api.py5
-rw-r--r--tuskar_ui/infrastructure/resource_management/nodes/tests.py6
-rw-r--r--tuskar_ui/infrastructure/resource_management/nodes/views.py2
-rw-r--r--tuskar_ui/infrastructure/resource_management/racks/tests.py4
-rw-r--r--tuskar_ui/infrastructure/resource_management/racks/workflows.py2
5 files changed, 12 insertions, 7 deletions
diff --git a/tuskar_ui/api.py b/tuskar_ui/api.py
index 350a05aa..63bade25 100644
--- a/tuskar_ui/api.py
+++ b/tuskar_ui/api.py
@@ -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.
diff --git a/tuskar_ui/infrastructure/resource_management/nodes/tests.py b/tuskar_ui/infrastructure/resource_management/nodes/tests.py
index b6a53f55..b4176682 100644
--- a/tuskar_ui/infrastructure/resource_management/nodes/tests.py
+++ b/tuskar_ui/infrastructure/resource_management/nodes/tests.py
@@ -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()
diff --git a/tuskar_ui/infrastructure/resource_management/nodes/views.py b/tuskar_ui/infrastructure/resource_management/nodes/views.py
index 7fb51b7a..a4f79a8a 100644
--- a/tuskar_ui/infrastructure/resource_management/nodes/views.py
+++ b/tuskar_ui/infrastructure/resource_management/nodes/views.py
@@ -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,
diff --git a/tuskar_ui/infrastructure/resource_management/racks/tests.py b/tuskar_ui/infrastructure/resource_management/racks/tests.py
index 39bfc47c..6ae7debb 100644
--- a/tuskar_ui/infrastructure/resource_management/racks/tests.py
+++ b/tuskar_ui/infrastructure/resource_management/racks/tests.py
@@ -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',
diff --git a/tuskar_ui/infrastructure/resource_management/racks/workflows.py b/tuskar_ui/infrastructure/resource_management/racks/workflows.py
index a13ee8ac..c004d751 100644
--- a/tuskar_ui/infrastructure/resource_management/racks/workflows.py
+++ b/tuskar_ui/infrastructure/resource_management/racks/workflows.py
@@ -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'],