Merge "Ensure 'port' is up2date after binding:host_id"
This commit is contained in:
commit
fc4702439a
|
@ -345,7 +345,8 @@ def add_ports_to_network(task, network_uuid, security_groups=None):
|
|||
wait_for_host_agent(
|
||||
client, update_port_attrs['binding:host_id'])
|
||||
port = client.create_port(**port_attrs)
|
||||
update_neutron_port(task.context, port.id, update_port_attrs)
|
||||
port = update_neutron_port(task.context, port.id,
|
||||
update_port_attrs)
|
||||
if CONF.neutron.dhcpv6_stateful_address_count > 1:
|
||||
_add_ip_addresses_for_ipv6_stateful(task.context, port, client)
|
||||
if is_smart_nic:
|
||||
|
|
|
@ -290,11 +290,13 @@ class TestNeutronNetworkActions(db_base.DbTestCase):
|
|||
fixed_ips=[])
|
||||
self.client_mock.create_port.side_effect = [self.neutron_port,
|
||||
neutron_port2]
|
||||
update_mock.side_effect = [self.neutron_port, neutron_port2]
|
||||
expected = {port.uuid: self.neutron_port.id,
|
||||
port2.uuid: neutron_port2.id}
|
||||
|
||||
else:
|
||||
self.client_mock.create_port.return_value = self.neutron_port
|
||||
update_mock.return_value = self.neutron_port
|
||||
expected = {port.uuid: self.neutron_port['id']}
|
||||
|
||||
with task_manager.acquire(self.context, self.node.uuid) as task:
|
||||
|
@ -458,6 +460,7 @@ class TestNeutronNetworkActions(db_base.DbTestCase):
|
|||
vpi_mock.return_value = True
|
||||
# Ensure we can create ports
|
||||
self.client_mock.create_port.return_value = self.neutron_port
|
||||
update_mock.return_value = self.neutron_port
|
||||
expected = {port.uuid: self.neutron_port.id}
|
||||
with task_manager.acquire(self.context, self.node.uuid) as task:
|
||||
ports = neutron.add_ports_to_network(task, self.network_uuid)
|
||||
|
@ -492,6 +495,7 @@ class TestNeutronNetworkActions(db_base.DbTestCase):
|
|||
)
|
||||
self.client_mock.create_port.side_effect = [
|
||||
self.neutron_port, openstack_exc.OpenStackCloudException]
|
||||
update_mock.return_value = self.neutron_port
|
||||
with task_manager.acquire(self.context, self.node.uuid) as task:
|
||||
neutron.add_ports_to_network(task, self.network_uuid)
|
||||
self.assertIn("Could not create neutron port for node's",
|
||||
|
@ -999,6 +1003,7 @@ class TestNeutronNetworkActions(db_base.DbTestCase):
|
|||
|
||||
# Ensure we can create ports
|
||||
self.client_mock.create_port.return_value = self.neutron_port
|
||||
update_mock.return_value = self.neutron_port
|
||||
expected = {port.uuid: self.neutron_port.id}
|
||||
with task_manager.acquire(self.context, self.node.uuid) as task:
|
||||
ports = neutron.add_ports_to_network(task, self.network_uuid)
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Fixed an issue where provisioning/cleaning would fail on IPv6 routed provider
|
||||
networks. See bug:
|
||||
`2009773 <https://storyboard.openstack.org/#!/story/2009773>`_.
|
Loading…
Reference in New Issue