openstack
/
neutron
Code Issues Proposed changes

Merge "Ensure allocation pools are deleted from database"

This commit is contained in:
Jenkins 2013-01-02 14:03:12 +00:00 committed by Gerrit Code Review
parent e2a2cf602a 7de8e37d83
commit 8061a78a96
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quantum/db/models_v2.py
View File

@ -69,7 +69,8 @@ class IPAllocationPool(model_base.BASEV2, HasId):
last_ip = sa.Column(sa.String(64), nullable=False)
available_ranges = orm.relationship(IPAvailabilityRange,
backref='ipallocationpool',
lazy="dynamic")
lazy="dynamic",
cascade='delete')
def __repr__(self):
return "%s - %s" % (self.first_ip, self.last_ip)
@ -136,7 +137,8 @@ class Subnet(model_base.BASEV2, HasId, HasTenant):
gateway_ip = sa.Column(sa.String(64))
allocation_pools = orm.relationship(IPAllocationPool,
backref='subnet',
lazy="dynamic")
lazy="dynamic",
cascade='delete')
enable_dhcp = sa.Column(sa.Boolean())
dns_nameservers = orm.relationship(DNSNameServer,
backref='subnet',