openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Add XClarity in the list of supported hw types"

This commit is contained in:
Zuul 2018-06-20 03:57:12 +00:00 committed by Gerrit Code Review
parent b15faea5a1 a70bf70153
commit dcc95d37f5
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tripleo_common/tests/utils/test_nodes.py
View File

@ -577,6 +577,9 @@ class NodesTest(base.TestCase):
def test_update_node_ironic_pxe_irmc(self):
self._update_by_type('pxe_irmc')
def test_update_node_ironic_xclarity(self):
self._update_by_type('xclarity')
def test_update_node_ironic_redfish(self):
ironic = mock.MagicMock()
node_map = {'mac': {}, 'pm_addr': {}}
@ -891,6 +894,25 @@ class NodesTest(base.TestCase):
'pm_addr': {'foo.bar': 'id'}}
self.assertEqual('id', nodes._get_node_id(node, handler, node_map))
def test_register_ironic_node_xclarity(self):
node_properties = {"cpus": "1",
"memory_mb": "2048",
"local_gb": "30",
"cpu_arch": "amd64",
"capabilities": "num_nics:6"}
node = self._get_node()
node['pm_type'] = 'xclarity'
node['pm_port'] = '4444'
client = mock.MagicMock()
nodes.register_ironic_node(node, client=client)
client.node.create.assert_called_once_with(
driver='xclarity', name='node1', properties=node_properties,
resource_class='baremetal',
driver_info={'xclarity_password': 'random',
'xclarity_address': 'foo.bar',
'xclarity_username': 'test',
'xclarity_port': '4444'})
class TestPopulateNodeMapping(base.TestCase):
def test_populate_node_mapping_ironic(self):

1
tripleo_common/utils/nodes.py
View File

@ -277,6 +277,7 @@ DRIVER_INFO = {
'(irmc|.*_irmc)': PrefixedDriverInfo('irmc', has_port=True,
hardware_type='irmc'),
'redfish': RedfishDriverInfo(),
'xclarity': PrefixedDriverInfo('xclarity', has_port=True),
# test drivers
'staging\-ovirt': oVirtDriverInfo(),
'(staging\-iboot|.*_iboot)': iBootDriverInfo(),