openstack/nova
Code Issues Proposed changes

Merge "Fix port group network metadata generation"

Browse Source
This commit is contained in:
Zuul 2024-07-09 00:18:52 +00:00 committed by Gerrit Code Review
commit 78ae23807c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2785,8 +2785,8 @@ class IronicDriverGenerateConfigDriveTestCase(test.NoDBTestCase):
node_id=self.node.id,
address='00:00:00:00:00:02',
port_group_id=portgroup.id)
self.mock_conn.ports.return_value = [port1, port2]
self.mock_conn.port_groups.return_value = [portgroup]
self.mock_conn.ports.return_value = iter([port1, port2])
self.mock_conn.port_groups.return_value = iter([portgroup])
metadata = self.driver._get_network_metadata(self.node,
self.network_info)

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

@ -1050,10 +1050,10 @@ class IronicDriver(virt_driver.ComputeDriver):
:param network_info: Instance network information.
"""
base_metadata = netutils.get_network_metadata(network_info)
ports = self.ironic_connection.ports(node=node.id, details=True)
port_groups = self.ironic_connection.port_groups(
ports = list(self.ironic_connection.ports(node=node.id, details=True))
port_groups = list(self.ironic_connection.port_groups(
node=node.id, details=True,
)
))
vif_id_to_objects = {'ports': {}, 'portgroups': {}}
for collection, name in ((ports, 'ports'),
(port_groups, 'portgroups')):