openstack
/
neutron
Code Issues Proposed changes

Remove code to debug auto address allocation error 

Change If1eb4046865f43b15ba97c52e2d0b9343dc72c19 fixed bugs 1666493 and 1655567
that reported exception IpAddressAlreadyAllocated being raised during the
creation of IPv6 auto-address subnets. This patchset removes code that was
added by change I22b8f1f537f905f4b82ce9e50d6fcc5bf2210f9f to root-cause these
bugs.

By removing log statements, this patchset contributes to reduce the
'Neutron log obesity epidemic'

Change-Id: I28c58dc4a957df833d277f0d08ce831c7ee07c68
Partial-Bug: #1707307
This commit is contained in:
Miguel Lavalle 2017-08-02 16:34:27 -05:00 committed by Akash Deep
parent 0932969383
commit 22a63315d8
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/db/ipam_pluggable_backend.py
View File

@ -449,11 +449,6 @@ class IpamPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
def add_auto_addrs_on_network_ports(self, context, subnet, ipam_subnet):
"""For an auto-address subnet, add addrs for ports on the net."""
# TODO(kevinbenton): remove after bug/1666493 is resolved
if subnet['id'] != ipam_subnet.subnet_manager.neutron_id:
raise RuntimeError(
"Subnet manager doesn't match subnet. %s != %s"
% (subnet['id'], ipam_subnet.subnet_manager.neutron_id))
# TODO(ataraday): switched for writer when flush_on_subtransaction
# will be available for neutron
with context.session.begin(subtransactions=True):
@ -472,10 +467,6 @@ class IpamPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
'eui64_address': True,
'mac': port['mac_address']}
ip_request = factory.get_request(context, port, ip)
# TODO(kevinbenton): remove after bug/1666493 is resolved
LOG.debug("Requesting with IP request: %s port: %s ip: %s "
"for subnet %s and ipam_subnet %s", ip_request,
port, ip, subnet, ipam_subnet)
try:
ip_address = ipam_subnet.allocate(ip_request)
allocated = port_obj.IPAllocation(

3
neutron/tests/unit/db/test_ipam_pluggable_backend.py
View File

@ -377,9 +377,6 @@ class TestDbBasePluginIpam(test_db_base.NeutronDbPluginV2TestCase):
@mock.patch('neutron.ipam.driver.Pool')
def test_create_ipv6_pd_subnet_over_ipam(self, pool_mock):
mocks = self._prepare_mocks_with_pool_mock(pool_mock)
# TODO(kevinbenton): remove after bug/1666493 is resolved
sub = pool_mock.get_instance.return_value.get_subnet.return_value
sub.subnet_manager.neutron_id = mock.ANY
cfg.CONF.set_override('ipv6_pd_enabled', True)
cidr = n_const.PROVISIONAL_IPV6_PD_PREFIX
allocation_pools = [netaddr.IPRange('::2', '::ffff:ffff:ffff:ffff')]