Merge "Fix port group network metadata generation"
This commit is contained in:
commit
78ae23807c
@ -2785,8 +2785,8 @@ class IronicDriverGenerateConfigDriveTestCase(test.NoDBTestCase):
|
|||||||
node_id=self.node.id,
|
node_id=self.node.id,
|
||||||
address='00:00:00:00:00:02',
|
address='00:00:00:00:00:02',
|
||||||
port_group_id=portgroup.id)
|
port_group_id=portgroup.id)
|
||||||
self.mock_conn.ports.return_value = [port1, port2]
|
self.mock_conn.ports.return_value = iter([port1, port2])
|
||||||
self.mock_conn.port_groups.return_value = [portgroup]
|
self.mock_conn.port_groups.return_value = iter([portgroup])
|
||||||
|
|
||||||
metadata = self.driver._get_network_metadata(self.node,
|
metadata = self.driver._get_network_metadata(self.node,
|
||||||
self.network_info)
|
self.network_info)
|
||||||
|
@ -1050,10 +1050,10 @@ class IronicDriver(virt_driver.ComputeDriver):
|
|||||||
:param network_info: Instance network information.
|
:param network_info: Instance network information.
|
||||||
"""
|
"""
|
||||||
base_metadata = netutils.get_network_metadata(network_info)
|
base_metadata = netutils.get_network_metadata(network_info)
|
||||||
ports = self.ironic_connection.ports(node=node.id, details=True)
|
ports = list(self.ironic_connection.ports(node=node.id, details=True))
|
||||||
port_groups = self.ironic_connection.port_groups(
|
port_groups = list(self.ironic_connection.port_groups(
|
||||||
node=node.id, details=True,
|
node=node.id, details=True,
|
||||||
)
|
))
|
||||||
vif_id_to_objects = {'ports': {}, 'portgroups': {}}
|
vif_id_to_objects = {'ports': {}, 'portgroups': {}}
|
||||||
for collection, name in ((ports, 'ports'),
|
for collection, name in ((ports, 'ports'),
|
||||||
(port_groups, 'portgroups')):
|
(port_groups, 'portgroups')):
|
||||||
|
Loading…
Reference in New Issue
Block a user