Remove chassis from node creation

Ironic will remove the chassis requirement
for a node in the Icehouse timeframe.  Tuskar
does not currently use chassis functionality,
so it can be removed.

Change-Id: Ic4b6e8e3a263d6726fae610fbf106f353a71ff32
This commit is contained in:
Tzu-Mainn Chen 2014-01-08 10:10:43 -05:00
parent 32c4793ffb
commit 2b1d93168f
2 changed files with 1 additions and 36 deletions

View File

@ -119,16 +119,13 @@ class Node(base.APIResourceWrapper):
# * ipmi_username, ipmi_password
# Side Effects:
# * call out to Ironic to registers a Node with the given
# parameters. Use a default chassis and create ports
# as needed
# parameters. Create ports as needed.
# Return:
# * the registered Node
# TODO(Tzu-Mainn Chen): remove test data when possible
# TODO(Tzu-Mainn Chen): transactionality?
# chassis = Node.default_chassis
# node = ironicclient(request).node.create(
# chassis_uuid=chassis.uuid,
# driver='pxe_ipmitool',
# driver_info={'ipmi_address': ipmi_address,
# 'ipmi_username': ipmi_username,
@ -192,26 +189,6 @@ class Node(base.APIResourceWrapper):
# ironicclient(request).nodes.delete(uuid)
return
@classmethod
def default_chassis(cls, request):
# Return:
# * the default chassis uses for all nodes in Tuskar
# Side Effects:
# * if a chassis doesn't exist, creates it in Ironic
# first
# TODO(Tzu-Mainn Chen): uncomment when possible
# TODO(Tzu-Mainn Chen): possible race condition
#chassis_list = ironicclient(request).chassis.list()
#if not chassis_list:
# chassis = ironicclient(request).chassis.create(
# description='Default Chassis')
#else:
# chassis = chassis_list[0]
chassis = test_data().ironicclient_chassis.list()[0]
return chassis
@cached_property
def resource(self, stack):
# Questions:

View File

@ -14,7 +14,6 @@ from openstack_dashboard.test.test_data import utils as test_data_utils
from heatclient.v1 import resources
from heatclient.v1 import stacks
from ironicclient.v1 import chassis
from ironicclient.v1 import node
from ironicclient.v1 import port
@ -35,7 +34,6 @@ def data(TEST):
node_1 = node.Node(
node.NodeManager(None),
{'uuid': 'aa-11',
'chassis_id': 'chassis-id-1',
'instance_uuid': 'aa',
'driver': 'pxe_ipmitool',
'driver_info': {
@ -52,7 +50,6 @@ def data(TEST):
node_2 = node.Node(
node.NodeManager(None),
{'uuid': 'bb-22',
'chassis_id': 'chassis-id-1',
'instance_uuid': 'bb',
'driver': 'pxe_ipmitool',
'driver_info': {
@ -69,7 +66,6 @@ def data(TEST):
node_3 = node.Node(
node.NodeManager(None),
{'uuid': 'cc-33',
'chassis_id': 'chassis-id-1',
'instance_uuid': None,
'driver': 'pxe_ipmitool',
'driver_info': {
@ -85,14 +81,6 @@ def data(TEST):
'power_state': 'rebooting'})
TEST.ironicclient_nodes.add(node_1, node_2, node_3)
# Chassis
TEST.ironicclient_chassis = test_data_utils.TestDataContainer()
chassis_1 = chassis.Chassis(
chassis.ChassisManager(None),
{'uuid': 'chassis-id-1',
'description': 'default chassis'})
TEST.ironicclient_chassis.add(chassis_1)
# Ports
TEST.ironicclient_ports = test_data_utils.TestDataContainer()
port_1 = port.Port(