openstack/neutron
Code Issues Proposed changes

Merge "Add _store_ip_allocation method"

Browse Source
This commit is contained in:
Jenkins 2014-08-25 23:19:49 +00:00 committed by Gerrit Code Review
commit 6f46e05d72
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
neutron/db/db_base_plugin_v2.py
View File

@ -182,6 +182,23 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
return (subnet['ipv6_address_mode'] == constants.IPV6_SLAAC return (subnet['ipv6_address_mode'] == constants.IPV6_SLAAC
or subnet['ipv6_address_mode'] == constants.DHCPV6_STATELESS) or subnet['ipv6_address_mode'] == constants.DHCPV6_STATELESS)
@staticmethod
def _store_ip_allocation(context, ip_address, network_id, subnet_id,
port_id):
LOG.debug("Allocated IP %(ip_address)s "
"(%(network_id)s/%(subnet_id)s/%(port_id)s)",
{'ip_address': ip_address,
'network_id': network_id,
'subnet_id': subnet_id,
'port_id': port_id})
allocated = models_v2.IPAllocation(
network_id=network_id,
port_id=port_id,
ip_address=ip_address,
subnet_id=subnet_id
)
context.session.add(allocated)
@staticmethod @staticmethod
def _generate_ip(context, subnets): def _generate_ip(context, subnets):
try: try:
@ -1295,19 +1312,8 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
for ip in ips: for ip in ips:
ip_address = ip['ip_address'] ip_address = ip['ip_address']
subnet_id = ip['subnet_id'] subnet_id = ip['subnet_id']
LOG.debug(_("Allocated IP %(ip_address)s " NeutronDbPluginV2._store_ip_allocation(
"(%(network_id)s/%(subnet_id)s/%(port_id)s)"), context, ip_address, network_id, subnet_id, port_id)
{'ip_address': ip_address,
'network_id': network_id,
'subnet_id': subnet_id,
'port_id': port_id})
allocated = models_v2.IPAllocation(
network_id=network_id,
port_id=port_id,
ip_address=ip_address,
subnet_id=subnet_id,
)
context.session.add(allocated)
return self._make_port_dict(port, process_extensions=False) return self._make_port_dict(port, process_extensions=False)
@ -1345,10 +1351,9 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
# Update ips if necessary # Update ips if necessary
for ip in added_ips: for ip in added_ips:
allocated = models_v2.IPAllocation( NeutronDbPluginV2._store_ip_allocation(
network_id=port['network_id'], port_id=port.id, context, ip['ip_address'], port['network_id'],
ip_address=ip['ip_address'], subnet_id=ip['subnet_id']) ip['subnet_id'], port.id)
context.session.add(allocated)
# Remove all attributes in p which are not in the port DB model # Remove all attributes in p which are not in the port DB model
# and then update the port # and then update the port
port.update(self._filter_non_model_columns(p, models_v2.Port)) port.update(self._filter_non_model_columns(p, models_v2.Port))