openstack/nova
Code Issues Proposed changes

Merge "Assume neutron port_binding extensions enabled"

Browse Source
This commit is contained in:
Jenkins 2017-08-23 16:58:08 +00:00 committed by Gerrit Code Review
commit f1f55d48cc
4 changed files with 102 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nova/network/neutronv2/api.py
View File

@ -291,8 +291,6 @@ class API(base_api.NetworkAPI):
def setup_networks_on_host(self, context, instance, host=None, def setup_networks_on_host(self, context, instance, host=None,
teardown=False): teardown=False):
"""Setup or teardown the network structures.""" """Setup or teardown the network structures."""
if not self._has_port_binding_extension(context, refresh_cache=True):
return
# Check if the instance is migrating to a new host. # Check if the instance is migrating to a new host.
port_migrating = host and (instance.host != host) port_migrating = host and (instance.host != host)
# If the port is migrating to a new host or if it is a # If the port is migrating to a new host or if it is a
@ -484,21 +482,17 @@ class API(base_api.NetworkAPI):
:param port_client: The client with appropriate karma for :param port_client: The client with appropriate karma for
updating the ports. updating the ports.
""" """
port_binding = self._has_port_binding_extension(context,
refresh_cache=True, neutron=neutron)
if port_client is None: if port_client is None:
# Requires admin creds to set port bindings # Requires admin creds to set port bindings
port_client = (neutron if not port_binding else port_client = get_client(context, admin=True)
get_client(context, admin=True))
for port_id in ports: for port_id in ports:
# A port_id is optional in the NetworkRequest object so check here # A port_id is optional in the NetworkRequest object so check here
# in case the caller forgot to filter the list. # in case the caller forgot to filter the list.
if port_id is None: if port_id is None:
continue continue
port_req_body = {'port': {'device_id': '', 'device_owner': ''}} port_req_body = {'port': {'device_id': '', 'device_owner': ''}}
if port_binding: port_req_body['port'][BINDING_HOST_ID] = None
port_req_body['port'][BINDING_HOST_ID] = None port_req_body['port'][BINDING_PROFILE] = {}
port_req_body['port'][BINDING_PROFILE] = {}
if constants.DNS_INTEGRATION in self.extensions: if constants.DNS_INTEGRATION in self.extensions:
port_req_body['port']['dns_name'] = '' port_req_body['port']['dns_name'] = ''
try: try:
@ -917,14 +911,8 @@ class API(base_api.NetworkAPI):
:param available_macs: a list of available mac addresses :param available_macs: a list of available mac addresses
""" """
# The neutron client and port_client (either the admin context or # We currently require admin creds to set port bindings.
# tenant context) are read here. The reason for this is that there are port_client = admin_client
# a number of different calls for the instance allocation.
# We require admin creds to set port bindings.
port_client = (neutron if not
self._has_port_binding_extension(context,
refresh_cache=True, neutron=neutron) else
admin_client)
preexisting_port_ids = [] preexisting_port_ids = []
created_port_ids = [] created_port_ids = []
@ -1015,12 +1003,6 @@ class API(base_api.NetworkAPI):
self.extensions.clear() self.extensions.clear()
self.extensions = {ext['name']: ext for ext in extensions_list} self.extensions = {ext['name']: ext for ext in extensions_list}
def _has_port_binding_extension(self, context, refresh_cache=False,
neutron=None):
if refresh_cache:
self._refresh_neutron_extensions_cache(context, neutron=neutron)
return constants.PORTBINDING_EXT in self.extensions
def _has_auto_allocate_extension(self, context, refresh_cache=False, def _has_auto_allocate_extension(self, context, refresh_cache=False,
neutron=None): neutron=None):
if refresh_cache or not self.extensions: if refresh_cache or not self.extensions:
@ -1099,13 +1081,11 @@ class API(base_api.NetworkAPI):
flavor = instance.get_flavor() flavor = instance.get_flavor()
rxtx_factor = flavor.get('rxtx_factor') rxtx_factor = flavor.get('rxtx_factor')
port_req_body['port']['rxtx_factor'] = rxtx_factor port_req_body['port']['rxtx_factor'] = rxtx_factor
has_port_binding_extension = ( port_req_body['port'][BINDING_HOST_ID] = bind_host_id
self._has_port_binding_extension(context, neutron=neutron)) self._populate_neutron_binding_profile(instance,
if has_port_binding_extension: pci_request_id,
port_req_body['port'][BINDING_HOST_ID] = bind_host_id port_req_body)
self._populate_neutron_binding_profile(instance,
pci_request_id,
port_req_body)
if constants.DNS_INTEGRATION in self.extensions: if constants.DNS_INTEGRATION in self.extensions:
# If the DNS integration extension is enabled in Neutron, most # If the DNS integration extension is enabled in Neutron, most
# ports will get their dns_name attribute set in the port create or # ports will get their dns_name attribute set in the port create or
@ -1115,8 +1095,7 @@ class API(base_api.NetworkAPI):
# Neutron and the port is on a network that has a non-blank # Neutron and the port is on a network that has a non-blank
# dns_domain attribute. This case requires to be processed by # dns_domain attribute. This case requires to be processed by
# method _update_port_dns_name # method _update_port_dns_name
if (not has_port_binding_extension if (not network.get('dns_domain')):
or not network.get('dns_domain')):
port_req_body['port']['dns_name'] = instance.hostname port_req_body['port']['dns_name'] = instance.hostname
def _update_port_dns_name(self, context, instance, network, port_id, def _update_port_dns_name(self, context, instance, network, port_id,
@ -1134,7 +1113,6 @@ class API(base_api.NetworkAPI):
require this additional update request. require this additional update request.
""" """
if (constants.DNS_INTEGRATION in self.extensions and if (constants.DNS_INTEGRATION in self.extensions and
self._has_port_binding_extension(context) and
network.get('dns_domain')): network.get('dns_domain')):
try: try:
port_req_body = {'port': {'dns_name': instance.hostname}} port_req_body = {'port': {'dns_name': instance.hostname}}
@ -2481,8 +2459,6 @@ class API(base_api.NetworkAPI):
def _update_port_binding_for_instance(self, context, instance, host, def _update_port_binding_for_instance(self, context, instance, host,
migration=None): migration=None):
if not self._has_port_binding_extension(context, refresh_cache=True):
return
neutron = get_client(context, admin=True) neutron = get_client(context, admin=True)
search_opts = {'device_id': instance.uuid, search_opts = {'device_id': instance.uuid,
'tenant_id': instance.project_id} 'tenant_id': instance.project_id}

1
nova/network/neutronv2/constants.py
View File

@ -15,7 +15,6 @@
QOS_QUEUE = 'QoS Queue' QOS_QUEUE = 'QoS Queue'
NET_EXTERNAL = 'router:external' NET_EXTERNAL = 'router:external'
PORTBINDING_EXT = 'Port Binding'
VNIC_INDEX_EXT = 'VNIC Index' VNIC_INDEX_EXT = 'VNIC Index'
DNS_INTEGRATION = 'DNS Integration' DNS_INTEGRATION = 'DNS Integration'
AUTO_ALLOCATE_TOPO_EXT = 'Auto Allocated Topology Services' AUTO_ALLOCATE_TOPO_EXT = 'Auto Allocated Topology Services'

261
nova/tests/unit/network/test_neutronv2.py
View File

@ -453,6 +453,10 @@ class TestNeutronv2Base(test.TestCase):
api = neutronapi.API() api = neutronapi.API()
self.mox.StubOutWithMock(api, 'get_instance_nw_info') self.mox.StubOutWithMock(api, 'get_instance_nw_info')
self.mox.StubOutWithMock(api, '_refresh_neutron_extensions_cache')
self.mox.StubOutWithMock(api, '_populate_neutron_extension_values')
bind_host_id = kwargs.get('bind_host_id') or None
has_extra_dhcp_opts = False has_extra_dhcp_opts = False
dhcp_options = kwargs.get('dhcp_options') dhcp_options = kwargs.get('dhcp_options')
@ -468,9 +472,11 @@ class TestNeutronv2Base(test.TestCase):
nets = self.nets[net_idx - 1] nets = self.nets[net_idx - 1]
ports = {} ports = {}
fixed_ips = {} fixed_ips = {}
macs = kwargs.pop('macs', None) macs = kwargs.pop('macs', None)
if macs: if macs:
macs = set(macs) macs = set(macs)
req_net_ids = [] req_net_ids = []
ordered_networks = [] ordered_networks = []
self._stub_allocate_for_instance_show_port(nets, ports, fixed_ips, self._stub_allocate_for_instance_show_port(nets, ports, fixed_ips,
@ -499,8 +505,9 @@ class TestNeutronv2Base(test.TestCase):
self._stub_allocate_for_instance_create_port( self._stub_allocate_for_instance_create_port(
ordered_networks, fixed_ips, nets) ordered_networks, fixed_ips, nets)
has_portbinding = self._stub_allocate_for_instance_port_binding( neutronapi.get_client(
api, kwargs.get('portbinding'), has_dns_extension) mox.IgnoreArg(), admin=True).AndReturn(
self.moxed_client)
preexisting_port_ids = [] preexisting_port_ids = []
ports_in_requested_net_order = [] ports_in_requested_net_order = []
@ -524,26 +531,16 @@ class TestNeutronv2Base(test.TestCase):
# here then skip it safely not continuing with a None Network # here then skip it safely not continuing with a None Network
else: else:
continue continue
if has_portbinding:
port_req_body['port'][neutronapi.BINDING_HOST_ID] = ( api._populate_neutron_extension_values(mox.IgnoreArg(),
self.instance.get('host')) self.instance,
if has_dns_extension and not network.get('dns_domain'): mox.IgnoreArg(),
port_req_body['port']['dns_name'] = self.instance.hostname mox.IgnoreArg(),
if not has_portbinding and not has_dns_extension: network=network,
api._populate_neutron_extension_values(mox.IgnoreArg(), neutron=self.moxed_client,
self.instance, mox.IgnoreArg(), bind_host_id=bind_host_id).\
mox.IgnoreArg(), network=network, AndReturn(None)
neutron=self.moxed_client,
bind_host_id=None).AndReturn(None)
elif has_portbinding:
# since _populate_neutron_extension_values() will call
# _has_port_binding_extension()
api._has_port_binding_extension(mox.IgnoreArg(),
neutron=self.moxed_client).\
AndReturn(has_portbinding)
else:
api._refresh_neutron_extensions_cache(mox.IgnoreArg(),
neutron=self.moxed_client)
if macs: if macs:
port_req_body['port']['mac_address'] = macs.pop() port_req_body['port']['mac_address'] = macs.pop()
if has_extra_dhcp_opts: if has_extra_dhcp_opts:
@ -567,13 +564,12 @@ class TestNeutronv2Base(test.TestCase):
new_mac = port_req_body['port'].get('mac_address') new_mac = port_req_body['port'].get('mac_address')
if new_mac: if new_mac:
update_port_res['port']['mac_address'] = new_mac update_port_res['port']['mac_address'] = new_mac
self.moxed_client.update_port(port_id, self.moxed_client.update_port(port_id,
MyComparator(port_req_body) MyComparator(port_req_body)
).AndReturn(update_port_res) ).AndReturn(update_port_res)
if has_portbinding and has_dns_extension: if has_dns_extension:
api._has_port_binding_extension(mox.IgnoreArg()).\
AndReturn(has_portbinding)
if net_idx == 11: if net_idx == 11:
port_req_body_dns = { port_req_body_dns = {
'port': { 'port': {
@ -602,36 +598,6 @@ class TestNeutronv2Base(test.TestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
return api return api
def _stub_allocate_for_instance_port_binding(self, api, portbinding,
has_dns_extension):
if portbinding:
neutronapi.get_client(mox.IgnoreArg()).AndReturn(
self.moxed_client)
neutronapi.get_client(
mox.IgnoreArg(), admin=True).AndReturn(
self.moxed_client)
has_portbinding = False
if portbinding:
has_portbinding = True
api.extensions[constants.PORTBINDING_EXT] = 1
self.mox.StubOutWithMock(api, '_refresh_neutron_extensions_cache')
api._refresh_neutron_extensions_cache(mox.IgnoreArg(),
neutron=self.moxed_client)
self.mox.StubOutWithMock(api, '_has_port_binding_extension')
api._has_port_binding_extension(mox.IgnoreArg(),
neutron=self.moxed_client,
refresh_cache=True).AndReturn(has_portbinding)
elif has_dns_extension:
self.mox.StubOutWithMock(api, '_refresh_neutron_extensions_cache')
api._refresh_neutron_extensions_cache(mox.IgnoreArg(),
neutron=self.moxed_client)
else:
self.mox.StubOutWithMock(api, '_refresh_neutron_extensions_cache')
api._refresh_neutron_extensions_cache(mox.IgnoreArg(),
neutron=self.moxed_client)
self.mox.StubOutWithMock(api, '_populate_neutron_extension_values')
return has_portbinding
def _stub_allocate_for_instance_show_port(self, nets, ports, fixed_ips, def _stub_allocate_for_instance_show_port(self, nets, ports, fixed_ips,
macs, req_net_ids, ordered_networks, **kwargs): macs, req_net_ids, ordered_networks, **kwargs):
if 'requested_networks' in kwargs: if 'requested_networks' in kwargs:
@ -1319,11 +1285,10 @@ class TestNeutronv2(TestNeutronv2Base):
@mock.patch( @mock.patch(
'nova.network.neutronv2.api.API._populate_neutron_extension_values') 'nova.network.neutronv2.api.API._populate_neutron_extension_values')
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.API._create_ports_for_instance') @mock.patch('nova.network.neutronv2.api.API._create_ports_for_instance')
@mock.patch('nova.network.neutronv2.api.API._unbind_ports') @mock.patch('nova.network.neutronv2.api.API._unbind_ports')
def test_allocate_for_instance_ex1(self, mock_unbind, mock_create_ports, def test_allocate_for_instance_ex1(self, mock_unbind, mock_create_ports,
mock_has_port_binding, mock_populate): mock_populate):
"""verify we will delete created ports """verify we will delete created ports
if we fail to allocate all net resources. if we fail to allocate all net resources.
@ -1340,7 +1305,6 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.list_networks( self.moxed_client.list_networks(
id=[uuids.my_netid1, uuids.my_netid2]).AndReturn( id=[uuids.my_netid1, uuids.my_netid2]).AndReturn(
{'networks': self.nets2}) {'networks': self.nets2})
mock_has_port_binding.return_value = False
mock_create_ports.return_value = [ mock_create_ports.return_value = [
(request, (getattr(uuids, 'portid_%s' % request.network_id))) (request, (getattr(uuids, 'portid_%s' % request.network_id)))
for request in requested_networks for request in requested_networks
@ -1577,7 +1541,10 @@ class TestNeutronv2(TestNeutronv2Base):
self.moxed_client.list_ports( self.moxed_client.list_ports(
device_id=self.instance.uuid).AndReturn( device_id=self.instance.uuid).AndReturn(
{'ports': ret_data}) {'ports': ret_data})
self.moxed_client.list_extensions().AndReturn({'extensions': []})
neutronapi.get_client(
mox.IgnoreArg(), admin=True).AndReturn(
self.moxed_client)
if requested_networks: if requested_networks:
for net, fip, port, request_id in requested_networks: for net, fip, port, request_id in requested_networks:
self.moxed_client.update_port(port) self.moxed_client.update_port(port)
@ -1637,11 +1604,12 @@ class TestNeutronv2(TestNeutronv2Base):
mock_preexisting.return_value = [] mock_preexisting.return_value = []
port_data = self.port_data1 port_data = self.port_data1
neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client) neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
self.moxed_client)
self.moxed_client.list_ports( self.moxed_client.list_ports(
device_id=self.instance.uuid).AndReturn( device_id=self.instance.uuid).AndReturn(
{'ports': port_data}) {'ports': port_data})
self.moxed_client.list_extensions().AndReturn({'extensions': []})
NeutronNotFound = exceptions.NeutronClientException(status_code=404) NeutronNotFound = exceptions.NeutronClientException(status_code=404)
for port in reversed(port_data): for port in reversed(port_data):
self.moxed_client.delete_port(port['id']).AndRaise( self.moxed_client.delete_port(port['id']).AndRaise(
@ -3926,7 +3894,6 @@ class TestNeutronv2WithMock(test.TestCase):
def test_update_port_bindings_for_instance_same_host(self, def test_update_port_bindings_for_instance_same_host(self,
get_client_mock): get_client_mock):
instance = fake_instance.fake_instance_obj(self.context) instance = fake_instance.fake_instance_obj(self.context)
self.api._has_port_binding_extension = mock.Mock(return_value=True)
# We test two ports, one with the same host as the host passed in and # We test two ports, one with the same host as the host passed in and
# one where binding:host_id isn't set, so we update that port. # one where binding:host_id isn't set, so we update that port.
@ -3951,7 +3918,6 @@ class TestNeutronv2WithMock(test.TestCase):
def test_update_port_bindings_for_instance_with_pci(self, def test_update_port_bindings_for_instance_with_pci(self,
get_client_mock, get_client_mock,
get_pci_device_devspec_mock): get_pci_device_devspec_mock):
self.api._has_port_binding_extension = mock.Mock(return_value=True)
devspec = mock.Mock() devspec = mock.Mock()
devspec.get_tags.return_value = {'physical_network': 'physnet1'} devspec.get_tags.return_value = {'physical_network': 'physnet1'}
@ -4009,7 +3975,6 @@ class TestNeutronv2WithMock(test.TestCase):
def test_update_port_bindings_for_instance_with_pci_fail(self, def test_update_port_bindings_for_instance_with_pci_fail(self,
get_client_mock, get_client_mock,
get_pci_device_devspec_mock): get_pci_device_devspec_mock):
self.api._has_port_binding_extension = mock.Mock(return_value=True)
devspec = mock.Mock() devspec = mock.Mock()
devspec.get_tags.return_value = {'physical_network': 'physnet1'} devspec.get_tags.return_value = {'physical_network': 'physnet1'}
@ -4282,43 +4247,32 @@ class TestNeutronv2WithMock(test.TestCase):
result = self.api._get_preexisting_port_ids(instance) result = self.api._get_preexisting_port_ids(instance)
self.assertEqual(['2', '3'], result, "Invalid preexisting ports") self.assertEqual(['2', '3'], result, "Invalid preexisting ports")
def _test_unbind_ports_get_client(self, mock_neutron, def _test_unbind_ports_get_client(self, mock_neutron):
mock_has_ext, has_ext=False):
mock_ctx = mock.Mock(is_admin=False) mock_ctx = mock.Mock(is_admin=False)
mock_has_ext.return_value = has_ext
ports = ["1", "2", "3"] ports = ["1", "2", "3"]
self.api._unbind_ports(mock_ctx, ports, mock_neutron) self.api._unbind_ports(mock_ctx, ports, mock_neutron)
get_client_calls = [] get_client_calls = []
get_client_calls.append(mock.call(mock_ctx) get_client_calls.append(mock.call(mock_ctx, admin=True))
if not has_ext else
mock.call(mock_ctx, admin=True))
if has_ext: self.assertEqual(1, mock_neutron.call_count)
self.assertEqual(1, mock_neutron.call_count) mock_neutron.assert_has_calls(get_client_calls, True)
mock_neutron.assert_has_calls(get_client_calls, True)
else:
self.assertEqual(0, mock_neutron.call_count)
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.get_client') @mock.patch('nova.network.neutronv2.api.get_client')
def test_unbind_ports_get_client_binding_extension(self, def test_unbind_ports_get_client_binding_extension(self,
mock_neutron, mock_neutron):
mock_has_ext): self._test_unbind_ports_get_client(mock_neutron)
self._test_unbind_ports_get_client(mock_neutron, mock_has_ext, True)
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.get_client') @mock.patch('nova.network.neutronv2.api.get_client')
def test_unbind_ports_get_client(self, mock_neutron, mock_has_ext): def test_unbind_ports_get_client(self, mock_neutron):
self._test_unbind_ports_get_client(mock_neutron, mock_has_ext) self._test_unbind_ports_get_client(mock_neutron)
def _test_unbind_ports(self, mock_neutron, mock_has_ext, has_ext=False): def _test_unbind_ports(self, mock_neutron):
mock_client = mock.Mock() mock_client = mock.Mock()
mock_update_port = mock.Mock() mock_update_port = mock.Mock()
mock_client.update_port = mock_update_port mock_client.update_port = mock_update_port
mock_ctx = mock.Mock(is_admin=False) mock_ctx = mock.Mock(is_admin=False)
mock_has_ext.return_value = has_ext
mock_neutron.return_value = mock_client mock_neutron.return_value = mock_client
ports = ["1", "2", "3"] ports = ["1", "2", "3"]
@ -4326,9 +4280,8 @@ class TestNeutronv2WithMock(test.TestCase):
api._unbind_ports(mock_ctx, ports, mock_client) api._unbind_ports(mock_ctx, ports, mock_client)
body = {'port': {'device_id': '', 'device_owner': ''}} body = {'port': {'device_id': '', 'device_owner': ''}}
if has_ext: body['port'][neutronapi.BINDING_HOST_ID] = None
body['port'][neutronapi.BINDING_HOST_ID] = None body['port'][neutronapi.BINDING_PROFILE] = {}
body['port'][neutronapi.BINDING_PROFILE] = {}
update_port_calls = [] update_port_calls = []
for p in ports: for p in ports:
update_port_calls.append(mock.call(p, body)) update_port_calls.append(mock.call(p, body))
@ -4336,24 +4289,20 @@ class TestNeutronv2WithMock(test.TestCase):
self.assertEqual(3, mock_update_port.call_count) self.assertEqual(3, mock_update_port.call_count)
mock_update_port.assert_has_calls(update_port_calls) mock_update_port.assert_has_calls(update_port_calls)
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.get_client') @mock.patch('nova.network.neutronv2.api.get_client')
def test_unbind_ports_binding_ext(self, mock_neutron, mock_has_ext): def test_unbind_ports_binding_ext(self, mock_neutron):
self._test_unbind_ports(mock_neutron, mock_has_ext, True) self._test_unbind_ports(mock_neutron)
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.get_client') @mock.patch('nova.network.neutronv2.api.get_client')
def test_unbind_ports(self, mock_neutron, mock_has_ext): def test_unbind_ports(self, mock_neutron):
self._test_unbind_ports(mock_neutron, mock_has_ext, False) self._test_unbind_ports(mock_neutron)
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension') def test_unbind_ports_no_port_ids(self):
def test_unbind_ports_no_port_ids(self, mock_has_ext):
# Tests that None entries in the ports list are filtered out. # Tests that None entries in the ports list are filtered out.
mock_client = mock.Mock() mock_client = mock.Mock()
mock_update_port = mock.Mock() mock_update_port = mock.Mock()
mock_client.update_port = mock_update_port mock_client.update_port = mock_update_port
mock_ctx = mock.Mock(is_admin=False) mock_ctx = mock.Mock(is_admin=False)
mock_has_ext.return_value = True
api = neutronapi.API() api = neutronapi.API()
api._unbind_ports(mock_ctx, [None], mock_client, mock_client) api._unbind_ports(mock_ctx, [None], mock_client, mock_client)
@ -4366,7 +4315,6 @@ class TestNeutronv2WithMock(test.TestCase):
'_check_external_network_attach') '_check_external_network_attach')
@mock.patch('nova.network.neutronv2.api.LOG') @mock.patch('nova.network.neutronv2.api.LOG')
@mock.patch('nova.network.neutronv2.api.API._unbind_ports') @mock.patch('nova.network.neutronv2.api.API._unbind_ports')
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.API.' @mock.patch('nova.network.neutronv2.api.API.'
'_populate_neutron_extension_values') '_populate_neutron_extension_values')
@mock.patch('nova.network.neutronv2.api.API._get_available_networks') @mock.patch('nova.network.neutronv2.api.API._get_available_networks')
@ -4376,7 +4324,6 @@ class TestNeutronv2WithMock(test.TestCase):
mock_ntrn, mock_ntrn,
mock_avail_nets, mock_avail_nets,
mock_ext_vals, mock_ext_vals,
mock_has_pbe,
mock_unbind, mock_unbind,
mock_log, mock_log,
mock_cena, mock_cena,
@ -4402,7 +4349,7 @@ class TestNeutronv2WithMock(test.TestCase):
mock_inst = mock.Mock(project_id="proj-1", mock_inst = mock.Mock(project_id="proj-1",
availability_zone='zone-1', availability_zone='zone-1',
uuid='inst-1') uuid='inst-1')
mock_has_pbe.return_value = False
nw_req = objects.NetworkRequestList( nw_req = objects.NetworkRequestList(
objects = [objects.NetworkRequest(port_id=uuids.portid_1), objects = [objects.NetworkRequest(port_id=uuids.portid_1),
objects.NetworkRequest(port_id=uuids.portid_2), objects.NetworkRequest(port_id=uuids.portid_2),
@ -4420,20 +4367,17 @@ class TestNeutronv2WithMock(test.TestCase):
@mock.patch('nova.network.neutronv2.api._filter_hypervisor_macs') @mock.patch('nova.network.neutronv2.api._filter_hypervisor_macs')
@mock.patch('nova.network.neutronv2.api.API._validate_requested_port_ids') @mock.patch('nova.network.neutronv2.api.API._validate_requested_port_ids')
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.API._get_available_networks') @mock.patch('nova.network.neutronv2.api.API._get_available_networks')
@mock.patch('nova.network.neutronv2.api.get_client') @mock.patch('nova.network.neutronv2.api.get_client')
def test_allocate_port_for_instance_no_networks(self, def test_allocate_port_for_instance_no_networks(self,
mock_getclient, mock_getclient,
mock_avail_nets, mock_avail_nets,
mock_has_pbe,
mock_validate_port_ids, mock_validate_port_ids,
mock_filter_macs): mock_filter_macs):
"""Tests that if no networks are requested and no networks are """Tests that if no networks are requested and no networks are
available, we fail with InterfaceAttachFailedNoNetwork. available, we fail with InterfaceAttachFailedNoNetwork.
""" """
instance = fake_instance.fake_instance_obj(self.context) instance = fake_instance.fake_instance_obj(self.context)
mock_has_pbe.return_value = False
mock_validate_port_ids.return_value = ({}, []) mock_validate_port_ids.return_value = ({}, [])
mock_filter_macs.return_value = None mock_filter_macs.return_value = None
mock_avail_nets.return_value = [] mock_avail_nets.return_value = []
@ -4548,7 +4492,6 @@ class TestNeutronv2WithMock(test.TestCase):
@mock.patch('nova.network.neutronv2.api.API.' @mock.patch('nova.network.neutronv2.api.API.'
'_check_external_network_attach') '_check_external_network_attach')
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.API.' @mock.patch('nova.network.neutronv2.api.API.'
'_populate_neutron_extension_values') '_populate_neutron_extension_values')
@mock.patch('nova.network.neutronv2.api.API._get_available_networks') @mock.patch('nova.network.neutronv2.api.API._get_available_networks')
@ -4556,9 +4499,7 @@ class TestNeutronv2WithMock(test.TestCase):
def test_port_binding_failed_created_port(self, mock_ntrn, def test_port_binding_failed_created_port(self, mock_ntrn,
mock_avail_nets, mock_avail_nets,
mock_ext_vals, mock_ext_vals,
mock_has_pbe,
mock_cena): mock_cena):
mock_has_pbe.return_value = True
mock_nc = mock.Mock() mock_nc = mock.Mock()
mock_ntrn.return_value = mock_nc mock_ntrn.return_value = mock_nc
mock_inst = mock.Mock(project_id="proj-1", mock_inst = mock.Mock(project_id="proj-1",
@ -4579,12 +4520,9 @@ class TestNeutronv2WithMock(test.TestCase):
mock_nc.delete_port.assert_called_once_with(uuids.portid_1) mock_nc.delete_port.assert_called_once_with(uuids.portid_1)
@mock.patch('nova.network.neutronv2.api.API._show_port') @mock.patch('nova.network.neutronv2.api.API._show_port')
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension')
@mock.patch('nova.network.neutronv2.api.get_client') @mock.patch('nova.network.neutronv2.api.get_client')
def test_port_binding_failed_with_request(self, mock_ntrn, def test_port_binding_failed_with_request(self, mock_ntrn,
mock_has_pbe,
mock_show_port): mock_show_port):
mock_has_pbe.return_value = True
mock_nc = mock.Mock() mock_nc = mock.Mock()
mock_ntrn.return_value = mock_nc mock_ntrn.return_value = mock_nc
mock_inst = mock.Mock(project_id="proj-1", mock_inst = mock.Mock(project_id="proj-1",
@ -4657,16 +4595,16 @@ class TestNeutronv2WithMock(test.TestCase):
def test_unbind_ports_reset_dns_name(self): def test_unbind_ports_reset_dns_name(self):
neutron = mock.Mock() neutron = mock.Mock()
port_client = mock.Mock() port_client = mock.Mock()
with mock.patch.object(self.api, '_has_port_binding_extension', self.api.extensions = [constants.DNS_INTEGRATION]
return_value=False): ports = [uuids.port_id]
self.api.extensions = [constants.DNS_INTEGRATION] self.api._unbind_ports(self.context, ports, neutron, port_client)
ports = [uuids.port_id] port_req_body = {'port': {'binding:host_id': None,
self.api._unbind_ports(self.context, ports, neutron, port_client) 'binding:profile': {},
port_req_body = {'port': {'device_id': '', 'device_id': '',
'device_owner': '', 'device_owner': '',
'dns_name': ''}} 'dns_name': ''}}
port_client.update_port.assert_called_once_with( port_client.update_port.assert_called_once_with(
uuids.port_id, port_req_body) uuids.port_id, port_req_body)
def test_make_floating_ip_obj(self): def test_make_floating_ip_obj(self):
self._test_make_floating_ip_obj() self._test_make_floating_ip_obj()
@ -4732,8 +4670,6 @@ class TestNeutronv2WithMock(test.TestCase):
self.assertEqual(expected_floating.obj_to_primitive(), self.assertEqual(expected_floating.obj_to_primitive(),
actual_obj.obj_to_primitive()) actual_obj.obj_to_primitive())
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension',
return_value=True)
@mock.patch('nova.network.neutronv2.api.API.' @mock.patch('nova.network.neutronv2.api.API.'
'_populate_neutron_extension_values') '_populate_neutron_extension_values')
@mock.patch('nova.network.neutronv2.api.API._update_port', @mock.patch('nova.network.neutronv2.api.API._update_port',
@ -4751,8 +4687,7 @@ class TestNeutronv2WithMock(test.TestCase):
mock_vif_destroy, mock_vif_destroy,
mock_vif_create, mock_vif_create,
mock_update_port, mock_update_port,
mock_populate_ext_values, mock_populate_ext_values):
mock_has_port_binding_extension):
"""Makes sure we rollback ports and VIFs if we fail updating ports""" """Makes sure we rollback ports and VIFs if we fail updating ports"""
instance = fake_instance.fake_instance_obj(self.context) instance = fake_instance.fake_instance_obj(self.context)
ntrn = mock.Mock(spec='neutronclient.v2_0.client.Client') ntrn = mock.Mock(spec='neutronclient.v2_0.client.Client')
@ -4801,30 +4736,32 @@ class TestNeutronv2WithMock(test.TestCase):
'172.24.4.227') '172.24.4.227')
self.assertIsNone(fip) self.assertIsNone(fip)
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension',
return_value=False)
@mock.patch.object(neutronapi.LOG, 'exception') @mock.patch.object(neutronapi.LOG, 'exception')
def test_unbind_ports_portnotfound(self, mock_log, mock_ext): def test_unbind_ports_portnotfound(self, mock_log):
api = neutronapi.API() api = neutronapi.API()
neutron_client = mock.Mock() neutron_client = mock.Mock()
neutron_client.update_port = mock.Mock( neutron_client.update_port = mock.Mock(
side_effect=exceptions.PortNotFoundClient) side_effect=exceptions.PortNotFoundClient)
api._unbind_ports(self.context, [uuids.port_id], neutron_client) api._unbind_ports(self.context, [uuids.port_id],
neutron_client, neutron_client)
neutron_client.update_port.assert_called_once_with( neutron_client.update_port.assert_called_once_with(
uuids.port_id, {'port': {'device_id': '', 'device_owner': ''}}) uuids.port_id, {'port': {
'device_id': '', 'device_owner': '',
'binding:profile': {}, 'binding:host_id': None}})
mock_log.assert_not_called() mock_log.assert_not_called()
@mock.patch('nova.network.neutronv2.api.API._has_port_binding_extension',
return_value=False)
@mock.patch.object(neutronapi.LOG, 'exception') @mock.patch.object(neutronapi.LOG, 'exception')
def test_unbind_ports_unexpected_error(self, mock_log, mock_ext): def test_unbind_ports_unexpected_error(self, mock_log):
api = neutronapi.API() api = neutronapi.API()
neutron_client = mock.Mock() neutron_client = mock.Mock()
neutron_client.update_port = mock.Mock( neutron_client.update_port = mock.Mock(
side_effect=test.TestingException) side_effect=test.TestingException)
api._unbind_ports(self.context, [uuids.port_id], neutron_client) api._unbind_ports(self.context, [uuids.port_id],
neutron_client, neutron_client)
neutron_client.update_port.assert_called_once_with( neutron_client.update_port.assert_called_once_with(
uuids.port_id, {'port': {'device_id': '', 'device_owner': ''}}) uuids.port_id, {'port': {
'device_id': '', 'device_owner': '',
'binding:profile': {}, 'binding:host_id': None}})
self.assertTrue(mock_log.called) self.assertTrue(mock_log.called)
@mock.patch.object(neutronapi, 'get_client') @mock.patch.object(neutronapi, 'get_client')
@ -4921,7 +4858,9 @@ class TestNeutronv2ModuleMethods(test.NoDBTestCase):
class TestNeutronv2Portbinding(TestNeutronv2Base): class TestNeutronv2Portbinding(TestNeutronv2Base):
def test_allocate_for_instance_portbinding(self): def test_allocate_for_instance_portbinding(self):
self._allocate_for_instance(1, portbinding=True, neutronapi.get_client(mox.IgnoreArg()).AndReturn(
self.moxed_client)
self._allocate_for_instance(1,
bind_host_id=self.instance.get('host')) bind_host_id=self.instance.get('host'))
def test_populate_neutron_extension_values_binding(self): def test_populate_neutron_extension_values_binding(self):
@ -4929,7 +4868,7 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
neutronapi.get_client(mox.IgnoreArg()).AndReturn( neutronapi.get_client(mox.IgnoreArg()).AndReturn(
self.moxed_client) self.moxed_client)
self.moxed_client.list_extensions().AndReturn( self.moxed_client.list_extensions().AndReturn(
{'extensions': [{'name': constants.PORTBINDING_EXT}]}) {'extensions': []})
self.mox.ReplayAll() self.mox.ReplayAll()
host_id = 'my_host_id' host_id = 'my_host_id'
instance = {'host': host_id} instance = {'host': host_id}
@ -5094,22 +5033,11 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
api._populate_pci_mac_address(instance, 42, port_req_body) api._populate_pci_mac_address(instance, 42, port_req_body)
self.assertEqual(port_req_body, req) self.assertEqual(port_req_body, req)
def _test_update_port_binding_false(self, func_name, *args):
api = neutronapi.API()
func = getattr(api, func_name)
self.mox.StubOutWithMock(api, '_has_port_binding_extension')
api._has_port_binding_extension(mox.IgnoreArg(),
refresh_cache=True).AndReturn(False)
self.mox.ReplayAll()
func(*args)
def _test_update_port_binding_true(self, expected_bind_host, def _test_update_port_binding_true(self, expected_bind_host,
func_name, *args): func_name, *args):
api = neutronapi.API() api = neutronapi.API()
func = getattr(api, func_name) func = getattr(api, func_name)
self.mox.StubOutWithMock(api, '_has_port_binding_extension')
api._has_port_binding_extension(mox.IgnoreArg(),
refresh_cache=True).AndReturn(True)
neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn( neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
self.moxed_client) self.moxed_client)
search_opts = {'device_id': self.instance['uuid'], search_opts = {'device_id': self.instance['uuid'],
@ -5127,9 +5055,7 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
func_name, *args): func_name, *args):
api = neutronapi.API() api = neutronapi.API()
func = getattr(api, func_name) func = getattr(api, func_name)
self.mox.StubOutWithMock(api, '_has_port_binding_extension')
api._has_port_binding_extension(mox.IgnoreArg(),
refresh_cache=True).AndReturn(True)
neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn( neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
self.moxed_client) self.moxed_client)
search_opts = {'device_id': self.instance['uuid'], search_opts = {'device_id': self.instance['uuid'],
@ -5146,12 +5072,6 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
func, func,
*args) *args)
def test_migrate_instance_finish_binding_false(self):
instance = fake_instance.fake_instance_obj(self.context)
self._test_update_port_binding_false('migrate_instance_finish',
self.context, instance,
{'dest_compute': uuids.fake})
def test_migrate_instance_finish_binding_true(self): def test_migrate_instance_finish_binding_true(self):
migration = {'source_compute': self.instance.get('host'), migration = {'source_compute': self.instance.get('host'),
'dest_compute': 'dest_host'} 'dest_compute': 'dest_host'}
@ -5172,12 +5092,6 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
instance, instance,
migration) migration)
def test_setup_instance_network_on_host_false(self):
instance = fake_instance.fake_instance_obj(self.context)
self._test_update_port_binding_false(
'setup_instance_network_on_host', self.context, instance,
'fake_host')
def test_setup_instance_network_on_host_true(self): def test_setup_instance_network_on_host_true(self):
instance = self._fake_instance_object(self.instance) instance = self._fake_instance_object(self.instance)
self._test_update_port_binding_true('fake_host', self._test_update_port_binding_true('fake_host',
@ -5625,7 +5539,7 @@ class TestAllocateForInstance(test.NoDBTestCase):
available_macs = ["mac1", "mac2"] available_macs = ["mac1", "mac2"]
mock_neutron.list_extensions.return_value = {"extensions": [ mock_neutron.list_extensions.return_value = {"extensions": [
{"name": "asdf"}, {"name": constants.PORTBINDING_EXT}]} {"name": "asdf"}]}
port1 = {"port": {"id": uuids.port1, "mac_address": "mac1r"}} port1 = {"port": {"id": uuids.port1, "mac_address": "mac1r"}}
port2 = {"port": {"id": uuids.port2, "mac_address": "mac2r"}} port2 = {"port": {"id": uuids.port2, "mac_address": "mac2r"}}
mock_admin.update_port.side_effect = [port1, port2] mock_admin.update_port.side_effect = [port1, port2]
@ -5697,11 +5611,15 @@ class TestNeutronv2NeutronHostnameDNS(TestNeutronv2Base):
class TestNeutronv2NeutronHostnameDNSPortbinding(TestNeutronv2Base): class TestNeutronv2NeutronHostnameDNSPortbinding(TestNeutronv2Base):
def setUp(self):
super(TestNeutronv2NeutronHostnameDNSPortbinding, self).setUp()
neutronapi.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn(
self.moxed_client)
def test_allocate_for_instance_create_port(self): def test_allocate_for_instance_create_port(self):
# The port's dns_name attribute should be set by the port create # The port's dns_name attribute should be set by the port create
# request in allocate_for_instance # request in allocate_for_instance
self._allocate_for_instance(1, portbinding=True, dns_extension=True, self._allocate_for_instance(1, dns_extension=True,
bind_host_id=self.instance.get('host')) bind_host_id=self.instance.get('host'))
def test_allocate_for_instance_with_requested_port(self): def test_allocate_for_instance_with_requested_port(self):
@ -5710,7 +5628,6 @@ class TestNeutronv2NeutronHostnameDNSPortbinding(TestNeutronv2Base):
requested_networks = objects.NetworkRequestList( requested_networks = objects.NetworkRequestList(
objects=[objects.NetworkRequest(port_id=uuids.portid_1)]) objects=[objects.NetworkRequest(port_id=uuids.portid_1)])
self._allocate_for_instance(net_idx=1, dns_extension=True, self._allocate_for_instance(net_idx=1, dns_extension=True,
portbinding=True,
bind_host_id=self.instance.get('host'), bind_host_id=self.instance.get('host'),
requested_networks=requested_networks) requested_networks=requested_networks)
@ -5719,7 +5636,7 @@ class TestNeutronv2NeutronHostnameDNSPortbinding(TestNeutronv2Base):
# request in _update_port_dns_name. This should happen only when the # request in _update_port_dns_name. This should happen only when the
# port binding extension is enabled and the port's network has a # port binding extension is enabled and the port's network has a
# non-blank dns_domain attribute # non-blank dns_domain attribute
self._allocate_for_instance(11, portbinding=True, dns_extension=True, self._allocate_for_instance(11, dns_extension=True,
bind_host_id=self.instance.get('host')) bind_host_id=self.instance.get('host'))
def test_allocate_for_instance_with_requested_port_with_dns_domain(self): def test_allocate_for_instance_with_requested_port_with_dns_domain(self):
@ -5730,7 +5647,6 @@ class TestNeutronv2NeutronHostnameDNSPortbinding(TestNeutronv2Base):
requested_networks = objects.NetworkRequestList( requested_networks = objects.NetworkRequestList(
objects=[objects.NetworkRequest(port_id=uuids.portid_1)]) objects=[objects.NetworkRequest(port_id=uuids.portid_1)])
self._allocate_for_instance(net_idx=11, dns_extension=True, self._allocate_for_instance(net_idx=11, dns_extension=True,
portbinding=True,
bind_host_id=self.instance.get('host'), bind_host_id=self.instance.get('host'),
requested_networks=requested_networks) requested_networks=requested_networks)
@ -5838,11 +5754,10 @@ class TestNeutronPortSecurity(test.NoDBTestCase):
@mock.patch.object(neutronapi.API, '_get_available_networks') @mock.patch.object(neutronapi.API, '_get_available_networks')
@mock.patch.object(neutronapi, '_filter_hypervisor_macs') @mock.patch.object(neutronapi, '_filter_hypervisor_macs')
@mock.patch.object(neutronapi.API, '_validate_requested_port_ids') @mock.patch.object(neutronapi.API, '_validate_requested_port_ids')
@mock.patch.object(neutronapi.API, '_has_port_binding_extension')
@mock.patch.object(neutronapi, 'get_client') @mock.patch.object(neutronapi, 'get_client')
@mock.patch('nova.objects.VirtualInterface') @mock.patch('nova.objects.VirtualInterface')
def test_no_security_groups_requested( def test_no_security_groups_requested(
self, mock_vif, mock_get_client, mock_has_port_binding_extension, self, mock_vif, mock_get_client,
mock_validate_requested_port_ids, mock_filter_macs, mock_validate_requested_port_ids, mock_filter_macs,
mock_get_available_networks, mock_process_security_groups, mock_get_available_networks, mock_process_security_groups,
mock_check_external_network_attach, mock_check_external_network_attach,
@ -5892,11 +5807,10 @@ class TestNeutronPortSecurity(test.NoDBTestCase):
@mock.patch.object(neutronapi.API, '_get_available_networks') @mock.patch.object(neutronapi.API, '_get_available_networks')
@mock.patch.object(neutronapi, '_filter_hypervisor_macs') @mock.patch.object(neutronapi, '_filter_hypervisor_macs')
@mock.patch.object(neutronapi.API, '_validate_requested_port_ids') @mock.patch.object(neutronapi.API, '_validate_requested_port_ids')
@mock.patch.object(neutronapi.API, '_has_port_binding_extension')
@mock.patch.object(neutronapi, 'get_client') @mock.patch.object(neutronapi, 'get_client')
@mock.patch('nova.objects.VirtualInterface') @mock.patch('nova.objects.VirtualInterface')
def test_security_groups_requested( def test_security_groups_requested(
self, mock_vif, mock_get_client, mock_has_port_binding_extension, self, mock_vif, mock_get_client,
mock_validate_requested_port_ids, mock_filter_macs, mock_validate_requested_port_ids, mock_filter_macs,
mock_get_available_networks, mock_process_security_groups, mock_get_available_networks, mock_process_security_groups,
mock_check_external_network_attach, mock_check_external_network_attach,
@ -5948,11 +5862,10 @@ class TestNeutronPortSecurity(test.NoDBTestCase):
@mock.patch.object(neutronapi.API, '_get_available_networks') @mock.patch.object(neutronapi.API, '_get_available_networks')
@mock.patch.object(neutronapi, '_filter_hypervisor_macs') @mock.patch.object(neutronapi, '_filter_hypervisor_macs')
@mock.patch.object(neutronapi.API, '_validate_requested_port_ids') @mock.patch.object(neutronapi.API, '_validate_requested_port_ids')
@mock.patch.object(neutronapi.API, '_has_port_binding_extension')
@mock.patch.object(neutronapi, 'get_client') @mock.patch.object(neutronapi, 'get_client')
@mock.patch('nova.objects.VirtualInterface') @mock.patch('nova.objects.VirtualInterface')
def test_port_security_disabled_no_security_groups_requested( def test_port_security_disabled_no_security_groups_requested(
self, mock_vif, mock_get_client, mock_has_port_binding_extension, self, mock_vif, mock_get_client,
mock_validate_requested_port_ids, mock_filter_macs, mock_validate_requested_port_ids, mock_filter_macs,
mock_get_available_networks, mock_process_security_groups, mock_get_available_networks, mock_process_security_groups,
mock_check_external_network_attach, mock_check_external_network_attach,
@ -6002,11 +5915,10 @@ class TestNeutronPortSecurity(test.NoDBTestCase):
@mock.patch.object(neutronapi.API, '_get_available_networks') @mock.patch.object(neutronapi.API, '_get_available_networks')
@mock.patch.object(neutronapi, '_filter_hypervisor_macs') @mock.patch.object(neutronapi, '_filter_hypervisor_macs')
@mock.patch.object(neutronapi.API, '_validate_requested_port_ids') @mock.patch.object(neutronapi.API, '_validate_requested_port_ids')
@mock.patch.object(neutronapi.API, '_has_port_binding_extension')
@mock.patch.object(neutronapi, 'get_client') @mock.patch.object(neutronapi, 'get_client')
@mock.patch('nova.objects.VirtualInterface') @mock.patch('nova.objects.VirtualInterface')
def test_port_security_disabled_and_security_groups_requested( def test_port_security_disabled_and_security_groups_requested(
self, mock_vif, mock_get_client, mock_has_port_binding_extension, self, mock_vif, mock_get_client,
mock_validate_requested_port_ids, mock_filter_macs, mock_validate_requested_port_ids, mock_filter_macs,
mock_get_available_networks, mock_process_security_groups, mock_get_available_networks, mock_process_security_groups,
mock_check_external_network_attach, mock_check_external_network_attach,
@ -6246,8 +6158,6 @@ class TestNeutronv2AutoAllocateNetwork(test.NoDBTestCase):
return [model.VIF(id=uuids.port_id)] return [model.VIF(id=uuids.port_id)]
@mock.patch('nova.network.neutronv2.api.get_client', return_value=ntrn) @mock.patch('nova.network.neutronv2.api.get_client', return_value=ntrn)
@mock.patch.object(self.api, '_has_port_binding_extension',
return_value=True)
@mock.patch.object(self.api, '_auto_allocate_network', @mock.patch.object(self.api, '_auto_allocate_network',
return_value=fake_network) return_value=fake_network)
@mock.patch.object(self.api, '_check_external_network_attach') @mock.patch.object(self.api, '_check_external_network_attach')
@ -6270,7 +6180,6 @@ class TestNeutronv2AutoAllocateNetwork(test.NoDBTestCase):
populate_ext_values_mock, populate_ext_values_mock,
check_external_net_attach_mock, check_external_net_attach_mock,
auto_allocate_mock, auto_allocate_mock,
has_port_binding_mock,
get_client_mock): get_client_mock):
instance = fake_instance.fake_instance_obj(self.context) instance = fake_instance.fake_instance_obj(self.context)
net_req = objects.NetworkRequest( net_req = objects.NetworkRequest(

6
releasenotes/notes/require_port_binding_ext-e6d9bdd4f6eef4e3.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Nova now has a hard requirement that the Port Binding extension is
enabled in the Neutron service. This simplifies the logic between
Nova and Neutron.