Merge "Fix sanity check for default firewall group name" into stable/queens
This commit is contained in:
commit
1b8a03f9e5
|
@ -61,7 +61,7 @@ def check_sanity(connection):
|
||||||
if 'firewall_groups_v2' not in insp.get_table_names():
|
if 'firewall_groups_v2' not in insp.get_table_names():
|
||||||
return []
|
return []
|
||||||
session = sa.orm.Session(bind=connection.connect())
|
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()
|
resources.FIREWALL_GROUP.name == const.DEFAULT_FWG).first()
|
||||||
if default_fwg:
|
if default_fwg:
|
||||||
raise DuplicateDefaultFirewallGroup()
|
raise DuplicateDefaultFirewallGroup()
|
||||||
|
|
Loading…
Reference in New Issue