From 1955948570b7e7f1fd9787c7caed9a19e1a59943 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Thu, 7 Mar 2013 12:32:32 +0100 Subject: [PATCH] Filter out router ports without IPs when gathering router sync data Bug 1152050 Change-Id: Idd11d5f953129471c09f44b4f7c75dc9899d6783 --- quantum/db/l3_db.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/quantum/db/l3_db.py b/quantum/db/l3_db.py index 514d7a691d..e21e8b4dc6 100644 --- a/quantum/db/l3_db.py +++ b/quantum/db/l3_db.py @@ -929,10 +929,15 @@ class L3_NAT_db_mixin(l3.RouterPluginBase): for port in ports: fixed_ips = port.get('fixed_ips', []) if len(fixed_ips) > 1: - LOG.error(_("Ignoring multiple IPs on router port %s"), - port['id']) + LOG.info(_("Ignoring multiple IPs on router port %s"), + port['id']) + continue + elif not fixed_ips: + # Skip ports without IPs, which can occur if a subnet + # attached to a router is deleted + LOG.info(_("Skipping port %s as no IP is configure on it"), + port['id']) continue - # Empty fixed_ips should not happen fixed_ip = fixed_ips[0] my_ports = subnet_id_ports_dict.get(fixed_ip['subnet_id'], []) my_ports.append(port)