x/group-based-policy
Code Issues Proposed changes

Adapt per-tenant-nat-epg table for tenant_id rename

Browse Source 
Change-Id: I0b40cdc945f7e3c78ca99453b6225498fe69b2f1
Signed-off-by: Amit Bose <bose@noironetworks.com>
This commit is contained in:
Amit Bose 2017-06-10 22:15:29 -07:00 committed by Sumit Naiksatam
parent 4cb980661e
commit 10813882d1
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gbpservice/neutron/db/migration/alembic_migrations/versions/HEAD
View File

@ -1 +1 @@
da6a25bbcfa8
cb5b16acbeb0

38
gbpservice/neutron/db/migration/alembic_migrations/versions/cb5b16acbeb0_alter_project_id_length.py Normal file
View File

@ -0,0 +1,38 @@
# 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.
#
"""alter project_id column length in gp_apic_tenant_specific_nat_epg
Revision ID: cb5b16acbeb0
Revises: da6a25bbcfa8
Create Date: 2017-06-10 00:00:00.000000
"""
# revision identifiers, used by Alembic.
revision = 'cb5b16acbeb0'
down_revision = 'da6a25bbcfa8'
from alembic import op
import sqlalchemy as sa
def upgrade():
op.alter_column('gp_apic_tenant_specific_nat_epg',
'project_id',
existing_type=sa.String(36),
type_=sa.String(255), nullable=False)
def downgrade():
pass

3
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
View File

@ -217,14 +217,13 @@ class L3PolicyMustBeSame(gpexc.GroupPolicyBadRequest):
"L2 policy when BridgeDomain is being reused.")
class TenantSpecificNatEpg(model_base.BASEV2):
class TenantSpecificNatEpg(model_base.BASEV2, model_base.HasProjectPrimaryKey):
"""Tenants that use a specific NAT EPG for an external segment."""
__tablename__ = 'gp_apic_tenant_specific_nat_epg'
external_segment_id = sa.Column(
sa.String(36), sa.ForeignKey('gp_external_segments.id',
ondelete='CASCADE'),
primary_key=True)
tenant_id = sa.Column(sa.String(36), primary_key=True)
SHADOW_PREFIX = 'Shd-'