Merge "Modify pod_id string length in ShadowAgent"

This commit is contained in:
Jenkins 2017-05-18 07:28:38 +00:00 committed by Gerrit Code Review
commit c149f1d737
2 changed files with 41 additions and 1 deletions
tricircle/db

@ -0,0 +1,40 @@
# All Rights Reserved.
#
# 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.
import migrate
from sqlalchemy import MetaData, String, Table
def upgrade(migrate_engine):
meta = MetaData(bind=migrate_engine)
shadow_agents = Table('shadow_agents', meta, autoload=True)
pods = Table('pods', meta, autoload=True)
col_pod_id_fkey = getattr(shadow_agents.c, 'pod_id')
col_pod_id_pkey = getattr(pods.c, 'pod_id')
# In the migration script 003_shadow_agent.py, the pod_id string length in
# shadow_agents table is 64, but pod_id string length in pods table
# is 36. The string length in foreign key and primary key isn't the same
if col_pod_id_fkey.type.length != col_pod_id_pkey.type.length:
# Delete the old foreign key constraint. If it exists, we can't
# modify the pod_id length.
migrate.ForeignKeyConstraint(columns=[shadow_agents.c.pod_id],
refcolumns=[pods.c.pod_id]).drop()
col_pod_id_fkey.alter(type=String(col_pod_id_pkey.type.length))
# Create the foreign key constraint
migrate.ForeignKeyConstraint(columns=[shadow_agents.c.pod_id],
refcolumns=[pods.c.pod_id]).create()

@ -127,7 +127,7 @@ class ShadowAgent(core.ModelBase, core.DictBase):
attributes = ['id', 'pod_id', 'host', 'type', 'tunnel_ip']
id = sql.Column('id', sql.String(length=36), primary_key=True)
pod_id = sql.Column('pod_id', sql.String(length=64),
pod_id = sql.Column('pod_id', sql.String(length=36),
sql.ForeignKey('pods.pod_id'),
nullable=False)
host = sql.Column('host', sql.String(length=255), nullable=False)