From 1fefb0c9eb95b1496d142a8dc85c7909c851e40c Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Thu, 27 Dec 2012 14:16:46 +0000 Subject: [PATCH] Ensure allocation pools are deleted from database Fixes bug 1091946 Change-Id: I4330f7a81e4745d5885d58fe7c8a010d18a8e004 --- quantum/db/models_v2.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/quantum/db/models_v2.py b/quantum/db/models_v2.py index 557dcc5fc7..760355beb3 100644 --- a/quantum/db/models_v2.py +++ b/quantum/db/models_v2.py @@ -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',