From 9f6637aa00f684cdfff48ff6a53be97cc7dd64ef Mon Sep 17 00:00:00 2001 From: Zhenmei Date: Mon, 26 Mar 2018 22:42:53 -0400 Subject: [PATCH] Fix sanity check for default firewall group name Only query name for duplicate firewall group named check Change-Id: I2b1e85546de6d778532e43097d56d6b629acf436 Closes-Bug: #1758786 (cherry picked from commit d9c52bcd54881d336cf1d5a74b4ed3697a1223fe) --- .../expand/876782258a43_create_default_firewall_groups_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron_fwaas/db/migration/alembic_migrations/versions/queens/expand/876782258a43_create_default_firewall_groups_table.py b/neutron_fwaas/db/migration/alembic_migrations/versions/queens/expand/876782258a43_create_default_firewall_groups_table.py index 22f57de5b..4c5ea6c76 100644 --- a/neutron_fwaas/db/migration/alembic_migrations/versions/queens/expand/876782258a43_create_default_firewall_groups_table.py +++ b/neutron_fwaas/db/migration/alembic_migrations/versions/queens/expand/876782258a43_create_default_firewall_groups_table.py @@ -61,7 +61,7 @@ def check_sanity(connection): if 'firewall_groups_v2' not in insp.get_table_names(): return [] session = sa.orm.Session(bind=connection.connect()) - default_fwg = session.query(resources.FIREWALL_GROUP).filter( + default_fwg = session.query(resources.FIREWALL_GROUP.name).filter( resources.FIREWALL_GROUP.name == const.DEFAULT_FWG).first() if default_fwg: raise DuplicateDefaultFirewallGroup()