From: Kobi Samoray Date: Sun, 19 Apr 2015 09:25:33 +0000 (+0300) Subject: VMWare NSXv: Metadata for distributed router X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1612b2ad8d3f964f035ec49426c832d95e845477;p=openstack-build%2Fneutron-build.git VMWare NSXv: Metadata for distributed router Metadata support for NSXv distributed routers is provided via DHCP Edge appliances. In order to avoid conflicts between distributed routers and DHCP Edges which map different networks with same CIDRs, we create a 1:1 mapping between an distributed router and a DHCP Edge. This patch contains the data model for the above, while the implementation is in vmware-nsx repository. Change-Id: I324403f7d5df4861193840e05bedf7a473aea655 --- diff --git a/neutron/db/migration/alembic_migrations/versions/354db87e3225_nsxv_vdr_metadata.py b/neutron/db/migration/alembic_migrations/versions/354db87e3225_nsxv_vdr_metadata.py new file mode 100644 index 000000000..fb8644706 --- /dev/null +++ b/neutron/db/migration/alembic_migrations/versions/354db87e3225_nsxv_vdr_metadata.py @@ -0,0 +1,43 @@ +# Copyright 2015 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +"""nsxv_vdr_metadata.py + +Revision ID: 354db87e3225 +Revises: kilo +Create Date: 2015-04-19 14:59:15.102609 + +""" + +# revision identifiers, used by Alembic. +revision = '354db87e3225' +down_revision = 'kilo' +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.create_table( + 'nsxv_vdr_dhcp_bindings', + sa.Column('vdr_router_id', sa.String(length=36), nullable=False), + sa.Column('dhcp_router_id', sa.String(length=36), nullable=False), + sa.Column('dhcp_edge_id', sa.String(length=36), nullable=False), + sa.PrimaryKeyConstraint('vdr_router_id'), + sa.UniqueConstraint( + 'dhcp_router_id', + name='unique_nsxv_vdr_dhcp_bindings0dhcp_router_id'), + sa.UniqueConstraint( + 'dhcp_edge_id', + name='unique_nsxv_vdr_dhcp_bindings0dhcp_edge_id')) diff --git a/neutron/db/migration/alembic_migrations/versions/HEAD b/neutron/db/migration/alembic_migrations/versions/HEAD index 062799591..821a57093 100644 --- a/neutron/db/migration/alembic_migrations/versions/HEAD +++ b/neutron/db/migration/alembic_migrations/versions/HEAD @@ -1 +1 @@ -kilo +354db87e3225 diff --git a/neutron/plugins/vmware/dbexts/nsxv_models.py b/neutron/plugins/vmware/dbexts/nsxv_models.py index f531ad2dd..2edb40061 100644 --- a/neutron/plugins/vmware/dbexts/nsxv_models.py +++ b/neutron/plugins/vmware/dbexts/nsxv_models.py @@ -238,3 +238,21 @@ class NsxvSpoofGuardPolicyNetworkMapping(model_base.BASEV2): primary_key=True, nullable=False) policy_id = sa.Column(sa.String(36), nullable=False) + + +class NsxvVdrDhcpBinding(model_base.BASEV2): + """1:1 mapping between VDR and a DHCP Edge.""" + + __tablename__ = 'nsxv_vdr_dhcp_bindings' + + vdr_router_id = sa.Column(sa.String(36), primary_key=True) + dhcp_router_id = sa.Column(sa.String(36), nullable=False) + dhcp_edge_id = sa.Column(sa.String(36), nullable=False) + + __table_args__ = ( + sa.UniqueConstraint( + dhcp_router_id, + name='unique_nsxv_vdr_dhcp_bindings0dhcp_router_id'), + sa.UniqueConstraint( + dhcp_edge_id, + name='unique_nsxv_vdr_dhcp_bindings0dhcp_edge_id'))