Fix broken DB unittests
1. Skipping VPNaaS tables 2. Add missing DB enum name Change-Id: I5025dbc881d5849c835d1e69d6025b700aeeb937
This commit is contained in:
parent
e11c8b86a3
commit
04db6e24d7
@ -418,7 +418,9 @@ class NsxProjectPluginMapping(model_base.BASEV2, models.TimestampMixin):
|
|||||||
"""Stores the mapping between the neutron plugin and the project id"""
|
"""Stores the mapping between the neutron plugin and the project id"""
|
||||||
__tablename__ = 'nsx_project_plugin_mappings'
|
__tablename__ = 'nsx_project_plugin_mappings'
|
||||||
project = sa.Column(sa.String(36), primary_key=True)
|
project = sa.Column(sa.String(36), primary_key=True)
|
||||||
plugin = sa.Column(sa.Enum('dvs', 'nsx-v', 'nsx-t'), nullable=False)
|
plugin = sa.Column(sa.Enum('dvs', 'nsx-v', 'nsx-t',
|
||||||
|
name='nsx_plugin_type'),
|
||||||
|
nullable=False)
|
||||||
|
|
||||||
|
|
||||||
class NsxVpnConnectionMapping(model_base.BASEV2, models.TimestampMixin):
|
class NsxVpnConnectionMapping(model_base.BASEV2, models.TimestampMixin):
|
||||||
|
@ -91,9 +91,14 @@ FWAAS_TABLES = {
|
|||||||
'cisco_firewall_associations',
|
'cisco_firewall_associations',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VPNAAS_TABLES = {
|
||||||
|
'vpn_endpoint_groups',
|
||||||
|
'vpn_endpoints',
|
||||||
|
}
|
||||||
|
|
||||||
# EXTERNAL_TABLES should contain all names of tables that are not related to
|
# EXTERNAL_TABLES should contain all names of tables that are not related to
|
||||||
# current repo.
|
# current repo.
|
||||||
EXTERNAL_TABLES = (set(external.TABLES) | LBAAS_TABLES |
|
EXTERNAL_TABLES = (set(external.TABLES) | LBAAS_TABLES | VPNAAS_TABLES |
|
||||||
L2GW_TABLES | SFC_TABLES | TAAS_TABLES | FWAAS_TABLES)
|
L2GW_TABLES | SFC_TABLES | TAAS_TABLES | FWAAS_TABLES)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user