From 9776175fc3b2331168651176ec56f9adc5d463dd Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 16 Jan 2014 17:03:41 -0800 Subject: [PATCH] Make nova-network use FixedIP for timeouts This makes nova-network manager use the FixedIP object when disassociating addresses due to timeout. Related to blueprint nova-network-objects Change-Id: I909f710543239207f6d27230b527b4495a23f2cb --- nova/network/manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/network/manager.py b/nova/network/manager.py index bce1d557f238..ff2e10323678 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -358,9 +358,9 @@ class NetworkManager(manager.Manager): now = timeutils.utcnow() timeout = CONF.fixed_ip_disassociate_timeout time = now - datetime.timedelta(seconds=timeout) - num = self.db.fixed_ip_disassociate_all_by_timeout(context, - self.host, - time) + num = fixed_ip_obj.FixedIP.disassociate_all_by_timeout(context, + self.host, + time) if num: LOG.debug(_('Disassociated %s stale fixed ip(s)'), num)