openstack
/
nova
Code Issues Proposed changes

Merge "Fix regression breaking Ironic boot-from-volume"

This commit is contained in:
Zuul 2023-12-12 22:41:36 +00:00 committed by Gerrit Code Review
parent 85254256b4 177742ca55
commit 2ee947b45b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/virt/ironic/test_driver.py
View File

@ -2332,7 +2332,8 @@ class IronicDriverTestCase(test.NoDBTestCase):
props = self.driver.get_volume_connector(instance)
self.assertEqual(expected_props, props)
self.mock_conn.get_node.assert_called_once_with(node_uuid)
self.mock_conn.get_node.assert_called_once_with(
node_uuid, fields=mock.ANY)
self.mock_conn.volume_connectors.assert_called_once_with(
node=node_uuid, details=True,
)
@ -2392,7 +2393,8 @@ class IronicDriverTestCase(test.NoDBTestCase):
props = self.driver.get_volume_connector(instance)
self.assertEqual(expected_props, props)
self.mock_conn.get_node.assert_called_once_with(node_uuid)
self.mock_conn.get_node.assert_called_once_with(
node_uuid, fields=mock.ANY)
self.mock_conn.volume_connectors.assert_called_once_with(
node=node_uuid, details=True,
)

2
nova/virt/ironic/driver.py
View File

@ -2003,7 +2003,7 @@ class IronicDriver(virt_driver.ComputeDriver):
:param instance: nova instance
:return: A connector information dictionary
"""
node = self.ironic_connection.get_node(instance.node)
node = self._get_node(instance.node)
properties = self._parse_node_properties(node)
connectors = self.ironic_connection.volume_connectors(
details=True,