x/tuskar-ui
Code Issues Proposed changes

separated Node and BaremetalNode test data

Browse Source 
The contents of the test data will change in future
patches as attributes and methods are corrected.

Change-Id: Ie00f74773e854ce37592f5c7bf380d27c95a0405
Partial-Bug: #1236192
This commit is contained in:
Tzu-Mainn Chen 2013-10-07 12:36:15 -04:00
parent 7f2f5476fe
commit e236d88bd5
3 changed files with 81 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class NodeViewTests(test.BaseAdminViewTests):
@test.create_stubs({tuskar.Node: ('get', 'running_virtual_machines')})
def test_detail_node(self):
node = self.baremetal_nodes.first()
node = self.tuskar_nodes.first()
tuskar.Node.get(mox.IsA(http.HttpRequest),
node.id).AndReturn(node)

63
tuskar_ui/test/api_tests/tuskar_tests.py
View File

@ -65,6 +65,25 @@ class TuskarApiTests(test.APITestCase):
terminal_port=0)
self.assertIsInstance(ret_val, api.Node)
def test_baremetal_node_create_with_empty_pm(self):
"""
Make sure that when pm_address, pm_user and terminal_port are not
provided (empty), their values are set to None, as this is required
by the baremetal VM.
"""
node = self.baremetalclient_nodes.first()
self.mox.StubOutWithMock(baremetal.BareMetalNodeManager, 'create')
baremetal.BareMetalNodeManager.create('node', 1, 1024, 10,
'aa:bb:cc:dd:ee', None, None, '', None).AndReturn(node)
self.mox.ReplayAll()
ret_val = api.BaremetalNode.create(
self.request, name='node', cpus=1,
memory_mb=1024, local_gb=10, prov_mac_address='aa:bb:cc:dd:ee',
pm_address='', pm_user='', pm_password='', terminal_port='')
self.assertIsInstance(ret_val, api.Node)
def test_baremetal_node_list(self):
nodes = self.baremetalclient_nodes_all.list()
@ -77,7 +96,7 @@ class TuskarApiTests(test.APITestCase):
self.assertIsInstance(node, api.Node)
def test_node_get(self):
node = self.baremetalclient_nodes.first()
node = self.tuskarclient_nodes.first()
self.mox.StubOutWithMock(baremetal.BareMetalNodeManager, 'get')
baremetal.BareMetalNodeManager.get(node.id).AndReturn(node)
@ -93,7 +112,7 @@ class TuskarApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.Node)
def test_node_create(self):
node = self.baremetalclient_nodes.first()
node = self.tuskarclient_nodes.first()
self.mox.StubOutWithMock(baremetal.BareMetalNodeManager, 'create')
baremetal.BareMetalNodeManager.create('node', 1, 1024, 10,
@ -106,26 +125,8 @@ class TuskarApiTests(test.APITestCase):
terminal_port=0)
self.assertIsInstance(ret_val, api.Node)
def test_node_create_with_empty_pm(self):
"""
Make sure that when pm_address, pm_user and terminal_port are not
provided (empty), their values are set to None, as this is required
by the baremetal VM.
"""
node = self.baremetalclient_nodes.first()
self.mox.StubOutWithMock(baremetal.BareMetalNodeManager, 'create')
baremetal.BareMetalNodeManager.create('node', 1, 1024, 10,
'aa:bb:cc:dd:ee', None, None, '', None).AndReturn(node)
self.mox.ReplayAll()
ret_val = api.Node.create(self.request, name='node', cpus=1,
memory_mb=1024, local_gb=10, prov_mac_address='aa:bb:cc:dd:ee',
pm_address='', pm_user='', pm_password='', terminal_port='')
self.assertIsInstance(ret_val, api.Node)
def test_node_list(self):
nodes = self.baremetalclient_nodes_all.list()
nodes = self.tuskarclient_nodes_all.list()
self.mox.StubOutWithMock(baremetal.BareMetalNodeManager, 'list')
baremetal.BareMetalNodeManager.list().AndReturn(nodes)
@ -136,8 +137,8 @@ class TuskarApiTests(test.APITestCase):
self.assertIsInstance(node, api.Node)
def test_node_list_unracked(self):
nodes = self.baremetalclient_nodes.list()
all_nodes = self.baremetalclient_nodes_all.list()
nodes = self.tuskarclient_nodes.list()
all_nodes = self.tuskarclient_nodes_all.list()
racks = self.tuskarclient_racks.list()
self.mox.StubOutWithMock(baremetal.BareMetalNodeManager, 'list')
@ -165,8 +166,8 @@ class TuskarApiTests(test.APITestCase):
self.assertEquals(1, len(ret_val))
def test_node_flavors(self):
node = self.baremetal_nodes.first()
nodes = self.baremetalclient_nodes.list()
node = self.tuskar_nodes.first()
nodes = self.tuskarclient_nodes.list()
racks = self.tuskarclient_racks.list()
rc = self.tuskarclient_resource_classes.first()
flavors = self.tuskarclient_flavors.list()
@ -197,8 +198,8 @@ class TuskarApiTests(test.APITestCase):
self.assertEquals(2, len(ret_val))
def test_node_rack(self):
node = self.baremetal_nodes.first()
nodes = self.baremetalclient_nodes.list()
node = self.tuskar_nodes.first()
nodes = self.tuskarclient_nodes.list()
racks = self.tuskarclient_racks.list()
tuskarclient = self.stub_tuskarclient()
@ -222,18 +223,18 @@ class TuskarApiTests(test.APITestCase):
self.assertEquals('1', rack.id)
def test_node_running_instances(self):
node = self.baremetal_nodes.first()
node = self.tuskar_nodes.first()
self.assertEquals(4, node.running_instances)
def test_node_remaining_capacity(self):
node = self.baremetal_nodes.first()
node = self.tuskar_nodes.first()
self.assertEquals(96, node.remaining_capacity)
def test_node_is_provisioned(self):
node = self.baremetal_nodes.first()
nodes = self.baremetalclient_nodes.list()
node = self.tuskar_nodes.first()
nodes = self.tuskarclient_nodes.list()
racks = self.tuskarclient_racks.list()
tuskarclient = self.stub_tuskarclient()

57
tuskar_ui/test/test_data/tuskar_data.py
View File

@ -127,6 +127,45 @@ def data(TEST):
TEST.tuskar_racks.add(api.Rack(rack_1), api.Rack(rack_2), api.Rack(rack_3))
# Nodes
TEST.tuskarclient_nodes = test_data_utils.TestDataContainer()
TEST.tuskar_nodes = test_data_utils.TestDataContainer()
# FIXME this will be removed once Node/BaremetalNode separation is complete
TEST.tuskarclient_nodes_all = test_data_utils.TestDataContainer()
tuskar_node_1 = baremetal.BareMetalNode(
baremetal.BareMetalNodeManager(None),
{'id': '1',
'name': 'node1',
'prov_mac_address': '00-B0-D0-86-AB-F7'})
tuskar_node_2 = baremetal.BareMetalNode(
baremetal.BareMetalNodeManager(None),
{'id': '2',
'name': 'node2',
'prov_mac_address': '00-B0-D0-86-AB-F8'})
tuskar_node_3 = baremetal.BareMetalNode(
baremetal.BareMetalNodeManager(None),
{'id': '3',
'name': 'node3',
'prov_mac_address': '00-B0-D0-86-AB-F9'})
tuskar_node_4 = baremetal.BareMetalNode(
baremetal.BareMetalNodeManager(None),
{'id': '4',
'name': 'node4',
'prov_mac_address': '00-B0-D0-86-AB-F0'})
tuskar_node_5 = baremetal.BareMetalNode(
baremetal.BareMetalNodeManager(None),
{'id': '5',
'name': 'node5',
'prov_mac_address': '00-B0-D0-86-AB-F1'})
TEST.tuskarclient_nodes.add(tuskar_node_1, tuskar_node_2,
tuskar_node_3, tuskar_node_4)
TEST.tuskarclient_nodes_all.add(tuskar_node_1, tuskar_node_2,
tuskar_node_3, tuskar_node_4,
tuskar_node_5)
TEST.tuskar_nodes.add(api.Node(tuskar_node_1), api.Node(tuskar_node_2),
api.Node(tuskar_node_3), api.Node(tuskar_node_4))
TEST.baremetalclient_nodes = test_data_utils.TestDataContainer()
TEST.baremetal_nodes = test_data_utils.TestDataContainer()
TEST.baremetalclient_unracked_nodes = test_data_utils.TestDataContainer()
@ -161,15 +200,15 @@ def data(TEST):
'prov_mac_address': '00-B0-D0-86-AB-F1'})
TEST.baremetalclient_nodes.add(node_1, node_2, node_3, node_4)
TEST.baremetal_nodes.add(api.Node(node_1),
api.Node(node_2),
api.Node(node_3),
api.Node(node_4))
TEST.baremetal_nodes.add(api.BaremetalNode(node_1),
api.BaremetalNode(node_2),
api.BaremetalNode(node_3),
api.BaremetalNode(node_4))
TEST.baremetalclient_unracked_nodes.add(node_5)
TEST.baremetal_unracked_nodes.add(api.Node(node_5))
TEST.baremetalclient_nodes_all.add(node_1, node_2, node_3, node_4, node_5)
TEST.baremetal_nodes_all.add(api.Node(node_1),
api.Node(node_2),
api.Node(node_3),
api.Node(node_4),
api.Node(node_5))
TEST.baremetal_nodes_all.add(api.BaremetalNode(node_1),
api.BaremetalNode(node_2),
api.BaremetalNode(node_3),
api.BaremetalNode(node_4),
api.BaremetalNode(node_5))