openstack
/
neutron
Code Issues Proposed changes

Merge "Revert "Update auto-addresses on MAC change""

This commit is contained in:
Jenkins 2017-04-19 19:26:01 +00:00 committed by Gerrit Code Review
parent a3c04210d8 37097a991b
commit 40804c14ea
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
neutron/db/ipam_pluggable_backend.py
View File

@ -335,19 +335,6 @@ class IpamPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
def update_port_with_ips(self, context, host, db_port, new_port, new_mac):
changes = self.Changes(add=[], original=[], remove=[])
assign_auto = False
if new_mac:
original = self._make_port_dict(db_port, process_extensions=False)
if original.get('mac_address') != new_mac:
for old_ip in original.get('fixed_ips', []):
if ipv6_utils.is_eui64_address(old_ip.get('ip_address')):
assign_auto = True
subnet_to_delete = {}
subnet_to_delete['subnet_id'] = old_ip['subnet_id']
subnet_to_delete['delete_subnet'] = True
new_fixed_ips = new_port.setdefault('fixed_ips', [])
new_fixed_ips.append(subnet_to_delete)
if 'fixed_ips' in new_port:
original = self._make_port_dict(db_port,
process_extensions=False)
@ -375,14 +362,6 @@ class IpamPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
self._update_db_port(context, db_port, new_port, network_id,
new_mac)
getattr(db_port, 'fixed_ips') # refresh relationship before return
if assign_auto:
port_copy = copy.deepcopy(original)
port_copy['fixed_ips'] = constants.ATTR_NOT_SPECIFIED
port_copy.update(new_port)
self.allocate_ips_for_port_and_store(context,
{'port': port_copy}, port_copy['id'])
except Exception:
with excutils.save_and_reraise_exception():
if 'fixed_ips' in new_port:

7
neutron/tests/unit/db/test_db_base_plugin_v2.py
View File

@ -1379,9 +1379,8 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s
subnet_cidr = subnet['subnet']['cidr']
eui_addr = str(netutils.get_ipv6_addr_by_EUI64(subnet_cidr,
port_mac))
self.assertEqual(1, len(port['port']['fixed_ips']))
self.assertEqual(eui_addr,
port['port']['fixed_ips'][0]['ip_address'])
self.assertEqual(port['port']['fixed_ips'][0]['ip_address'],
eui_addr)
def check_update_port_mac(
self, expected_status=webob.exc.HTTPOk.code,
@ -1401,7 +1400,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_address%%3D%s&fixed_ips=subnet_id%%3D%s
self.assertIn('port', result)
self.assertEqual(new_mac, result['port']['mac_address'])
if subnet and subnet['subnet']['ip_version'] == 6:
self._check_v6_auto_address_address(result, subnet)
self._check_v6_auto_address_address(port, subnet)
else:
error = self.deserialize(self.fmt, res)
self.assertEqual(expected_error,