x
/
vmware-nsx
Code Issues Proposed changes

Fix broken DB unittests 

1. Skipping VPNaaS tables
2. Add missing DB enum name

Change-Id: I5025dbc881d5849c835d1e69d6025b700aeeb937
This commit is contained in:
asarfaty 2020-03-25 11:45:12 +02:00
parent e11c8b86a3
commit 04db6e24d7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/db/nsx_models.py
View File

@ -418,7 +418,9 @@ class NsxProjectPluginMapping(model_base.BASEV2, models.TimestampMixin):
"""Stores the mapping between the neutron plugin and the project id"""
__tablename__ = 'nsx_project_plugin_mappings'
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):

7
vmware_nsx/tests/unit/db/test_migrations.py
View File

@ -91,9 +91,14 @@ FWAAS_TABLES = {
'cisco_firewall_associations',
}
VPNAAS_TABLES = {
'vpn_endpoint_groups',
'vpn_endpoints',
}
# EXTERNAL_TABLES should contain all names of tables that are not related to
# 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)