VMWare NSXv DB model bugfix

DB Model and migration for VMWare NSXv had two issues:
In DB migration, nsxv_security_group_section_mappings table is not dropped on downgrade.
In nsxv_models.py, tz_network_bindings_binding_type enum name should be
nsxv_tz_network_bindings_binding_type to match migration code.

Change-Id: Ib5e8a2078d9c86da6375c7b6a39f48d5bba4e06e
Closes-bug: #1409411

diff --git a/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py b/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py
index 5867f6c9c7c4def1e9b0a718d6d1eb06ea352cdf..3fbb7ea5f89507e4ed9b62c6906fd340f0b32074 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py
+++ b/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py
@@ -151,7 +151,7 @@ def downgrade():
     op.drop_table('nsxv_port_index_mappings')
     op.drop_table('nsxv_port_vnic_mappings')
     op.drop_table('nsxv_tz_network_bindings')
-    op.drop_table('nsxv_section_mappings')
+    op.drop_table('nsxv_security_group_section_mappings')
     op.drop_table('nsxv_spoofguard_policy_network_mappings')
     op.drop_table('nsxv_edge_vnic_bindings')
     op.drop_table('nsxv_edge_dhcp_static_bindings')
@@ -163,4 +163,4 @@ def downgrade():
     edge_types_enum.drop(op.get_bind(), checkfirst=False)
     internal_network_purpose_enum.drop(op.get_bind(), checkfirst=False)
     internal_edge_purpose_enum.drop(op.get_bind(), checkfirst=False)
-    tz_binding_type_enum.drop(op.get_bind(), checkfirst=False)
\ No newline at end of file
+    tz_binding_type_enum.drop(op.get_bind(), checkfirst=False)

diff --git a/neutron/plugins/vmware/dbexts/nsxv_models.py b/neutron/plugins/vmware/dbexts/nsxv_models.py
index 4e9cecd95fe31d94b2b795164c460df6b9383a4e..395238db0673b23509fa8f65f5782976cac98a37 100644 (file)
--- a/neutron/plugins/vmware/dbexts/nsxv_models.py
+++ b/neutron/plugins/vmware/dbexts/nsxv_models.py
@@ -172,9 +172,10 @@ class NsxvTzNetworkBinding(model_base.BASEV2):
     network_id = sa.Column(sa.String(36),
                            sa.ForeignKey('networks.id', ondelete="CASCADE"),
                            primary_key=True)
-    binding_type = sa.Column(sa.Enum('flat', 'vlan', 'portgroup',
-                                     name='tz_network_bindings_binding_type'),
-                             nullable=False, primary_key=True)
+    binding_type = sa.Column(
+        sa.Enum('flat', 'vlan', 'portgroup',
+                name='nsxv_tz_network_bindings_binding_type'),
+        nullable=False, primary_key=True)
     phy_uuid = sa.Column(sa.String(36), primary_key=True, nullable=True)
     vlan_id = sa.Column(sa.Integer, primary_key=True, nullable=True,
                         autoincrement=False)