From dd97144c08f21dd8661f45a9433c20fdf4538411 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Mon, 10 Dec 2012 06:59:30 +0000 Subject: [PATCH] Remove unnecessary port deletion Fixes bug 1088368 Change-Id: I41b816a8d72d09740ea7d063172a75cedffb8d6d --- quantum/db/l3_db.py | 1 - quantum/tests/unit/test_l3_plugin.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/quantum/db/l3_db.py b/quantum/db/l3_db.py index 04a7a8f228..26a2913698 100644 --- a/quantum/db/l3_db.py +++ b/quantum/db/l3_db.py @@ -857,7 +857,6 @@ class L3_NAT_db_mixin(l3.RouterPluginBase): if len(fixed_ips) > 1: LOG.error(_("Ignoring multiple IPs on router port %s") % port['id']) - ports.remove(port) continue # Empty fixed_ips should not happen fixed_ip = fixed_ips[0] diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py index ddc807caf1..f628f733a4 100644 --- a/quantum/tests/unit/test_l3_plugin.py +++ b/quantum/tests/unit/test_l3_plugin.py @@ -1363,7 +1363,7 @@ class L3NatDBTestCase(test_db_plugin.QuantumDbPluginV2TestCase): routers = plugin.get_sync_data(ctx, None) self.assertEqual(1, len(routers)) interfaces = routers[0].get(l3_constants.INTERFACE_KEY, []) - self.assertEqual(0, len(interfaces)) + self.assertEqual(1, len(interfaces)) # clean-up self._router_interface_action('remove', r['router']['id'],