From fab2f8eeca0ab7470be668b56b736463d9d82858 Mon Sep 17 00:00:00 2001 From: Henry Gessau Date: Thu, 13 Aug 2015 19:58:58 -0400 Subject: [PATCH] Rename args for alembic 0.8.0 Version 0.8.0 of alembic has renamed some arguments in some of its methods. This generates warnings when running neutron's alembic migration scripts. Change-Id: I4f90a66c2465dd1d7f6631f297146754fd5e9cc4 --- neutron/db/migration/__init__.py | 8 ++++---- .../16cdf118d31d_extra_dhcp_options_ipv6_support.py | 8 ++++---- ...2a1ee2fb59e0_add_mac_address_unique_constraint.py | 6 +++--- .../38495dc99731_ml2_tunnel_endpoints_table.py | 12 ++++++------ .../versions/41662e32bce2_l3_dvr_snat_mapping.py | 6 +++--- ...c02_add_uniqueconstraint_ipavailability_ranges.py | 12 ++++++------ .../versions/57dd745253a6_nuage_kilo_migrate.py | 12 ++++++------ .../versions/f15b1fb526dd_cascade_floatingip.py | 4 ++-- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index 86cce385a..d92e57c49 100644 --- a/neutron/db/migration/__init__.py +++ b/neutron/db/migration/__init__.py @@ -129,7 +129,7 @@ def create_table_if_not_exist_psql(table_name, values): def remove_foreign_keys(table, foreign_keys): for fk in foreign_keys: op.drop_constraint( - name=fk['name'], + constraint_name=fk['name'], table_name=table, type_='foreignkey' ) @@ -138,9 +138,9 @@ def remove_foreign_keys(table, foreign_keys): def create_foreign_keys(table, foreign_keys): for fk in foreign_keys: op.create_foreign_key( - name=fk['name'], - source=table, - referent=fk['referred_table'], + constraint_name=fk['name'], + source_table=table, + referent_table=fk['referred_table'], local_cols=fk['constrained_columns'], remote_cols=fk['referred_columns'], ondelete='CASCADE' diff --git a/neutron/db/migration/alembic_migrations/versions/16cdf118d31d_extra_dhcp_options_ipv6_support.py b/neutron/db/migration/alembic_migrations/versions/16cdf118d31d_extra_dhcp_options_ipv6_support.py index a60a9e17a..00505e7ad 100644 --- a/neutron/db/migration/alembic_migrations/versions/16cdf118d31d_extra_dhcp_options_ipv6_support.py +++ b/neutron/db/migration/alembic_migrations/versions/16cdf118d31d_extra_dhcp_options_ipv6_support.py @@ -38,7 +38,7 @@ TABLE_NAME = 'extradhcpopts' def upgrade(): with migration.remove_fks_from_table(TABLE_NAME): op.drop_constraint( - name=CONSTRAINT_NAME_OLD, + constraint_name=CONSTRAINT_NAME_OLD, table_name=TABLE_NAME, type_='unique' ) @@ -48,7 +48,7 @@ def upgrade(): op.execute("UPDATE extradhcpopts SET ip_version = 4") op.create_unique_constraint( - name=CONSTRAINT_NAME_NEW, - source='extradhcpopts', - local_cols=['port_id', 'opt_name', 'ip_version'] + constraint_name=CONSTRAINT_NAME_NEW, + table_name='extradhcpopts', + columns=['port_id', 'opt_name', 'ip_version'] ) diff --git a/neutron/db/migration/alembic_migrations/versions/2a1ee2fb59e0_add_mac_address_unique_constraint.py b/neutron/db/migration/alembic_migrations/versions/2a1ee2fb59e0_add_mac_address_unique_constraint.py index fec9a6390..44d3d103d 100644 --- a/neutron/db/migration/alembic_migrations/versions/2a1ee2fb59e0_add_mac_address_unique_constraint.py +++ b/neutron/db/migration/alembic_migrations/versions/2a1ee2fb59e0_add_mac_address_unique_constraint.py @@ -33,7 +33,7 @@ CONSTRAINT_NAME = 'uniq_ports0network_id0mac_address' def upgrade(): op.create_unique_constraint( - name=CONSTRAINT_NAME, - source=TABLE_NAME, - local_cols=['network_id', 'mac_address'] + constraint_name=CONSTRAINT_NAME, + table_name=TABLE_NAME, + columns=['network_id', 'mac_address'] ) diff --git a/neutron/db/migration/alembic_migrations/versions/38495dc99731_ml2_tunnel_endpoints_table.py b/neutron/db/migration/alembic_migrations/versions/38495dc99731_ml2_tunnel_endpoints_table.py index 65f6f302a..3bf08bd38 100644 --- a/neutron/db/migration/alembic_migrations/versions/38495dc99731_ml2_tunnel_endpoints_table.py +++ b/neutron/db/migration/alembic_migrations/versions/38495dc99731_ml2_tunnel_endpoints_table.py @@ -37,15 +37,15 @@ def upgrade(): op.add_column('ml2_gre_endpoints', sa.Column('host', sa.String(length=255), nullable=True)) op.create_unique_constraint( - name=CONSTRAINT_NAME_GRE, - source='ml2_gre_endpoints', - local_cols=['host'] + constraint_name=CONSTRAINT_NAME_GRE, + table_name='ml2_gre_endpoints', + columns=['host'] ) op.add_column('ml2_vxlan_endpoints', sa.Column('host', sa.String(length=255), nullable=True)) op.create_unique_constraint( - name=CONSTRAINT_NAME_VXLAN, - source='ml2_vxlan_endpoints', - local_cols=['host'] + constraint_name=CONSTRAINT_NAME_VXLAN, + table_name='ml2_vxlan_endpoints', + columns=['host'] ) diff --git a/neutron/db/migration/alembic_migrations/versions/41662e32bce2_l3_dvr_snat_mapping.py b/neutron/db/migration/alembic_migrations/versions/41662e32bce2_l3_dvr_snat_mapping.py index 75fe067bd..489fd6996 100644 --- a/neutron/db/migration/alembic_migrations/versions/41662e32bce2_l3_dvr_snat_mapping.py +++ b/neutron/db/migration/alembic_migrations/versions/41662e32bce2_l3_dvr_snat_mapping.py @@ -40,10 +40,10 @@ def upgrade(): prev_pk_name = prev_pk_const.get('name') with migration.remove_fks_from_table(TABLE_NAME): - op.drop_constraint(name=prev_pk_name, + op.drop_constraint(constraint_name=prev_pk_name, table_name=TABLE_NAME, type_='primary') - op.create_primary_key(name=None, + op.create_primary_key(constraint_name=None, table_name=TABLE_NAME, - cols=['router_id', 'l3_agent_id']) + columns=['router_id', 'l3_agent_id']) diff --git a/neutron/db/migration/alembic_migrations/versions/44621190bc02_add_uniqueconstraint_ipavailability_ranges.py b/neutron/db/migration/alembic_migrations/versions/44621190bc02_add_uniqueconstraint_ipavailability_ranges.py index 1a00de500..314116a20 100644 --- a/neutron/db/migration/alembic_migrations/versions/44621190bc02_add_uniqueconstraint_ipavailability_ranges.py +++ b/neutron/db/migration/alembic_migrations/versions/44621190bc02_add_uniqueconstraint_ipavailability_ranges.py @@ -35,13 +35,13 @@ UC_2_NAME = 'uniq_ipavailabilityranges0last_ip0allocation_pool_id' def upgrade(): op.create_unique_constraint( - name=UC_1_NAME, - source=TABLE_NAME, - local_cols=['first_ip', 'allocation_pool_id'] + constraint_name=UC_1_NAME, + table_name=TABLE_NAME, + columns=['first_ip', 'allocation_pool_id'] ) op.create_unique_constraint( - name=UC_2_NAME, - source=TABLE_NAME, - local_cols=['last_ip', 'allocation_pool_id'] + constraint_name=UC_2_NAME, + table_name=TABLE_NAME, + columns=['last_ip', 'allocation_pool_id'] ) diff --git a/neutron/db/migration/alembic_migrations/versions/57dd745253a6_nuage_kilo_migrate.py b/neutron/db/migration/alembic_migrations/versions/57dd745253a6_nuage_kilo_migrate.py index e03769e29..96b08be47 100644 --- a/neutron/db/migration/alembic_migrations/versions/57dd745253a6_nuage_kilo_migrate.py +++ b/neutron/db/migration/alembic_migrations/versions/57dd745253a6_nuage_kilo_migrate.py @@ -44,10 +44,10 @@ def upgrade(): op.add_column('nuage_subnet_l2dom_mapping', sa.Column('nuage_managed_subnet', sa.Boolean(), nullable=True)) op.create_unique_constraint( - name=CONSTRAINT_NAME_NR, - source='nuage_net_partition_router_mapping', - local_cols=['nuage_router_id']) + constraint_name=CONSTRAINT_NAME_NR, + table_name='nuage_net_partition_router_mapping', + columns=['nuage_router_id']) op.create_unique_constraint( - name=CONSTRAINT_NAME_NS, - source='nuage_subnet_l2dom_mapping', - local_cols=['nuage_subnet_id']) + constraint_name=CONSTRAINT_NAME_NS, + table_name='nuage_subnet_l2dom_mapping', + columns=['nuage_subnet_id']) diff --git a/neutron/db/migration/alembic_migrations/versions/f15b1fb526dd_cascade_floatingip.py b/neutron/db/migration/alembic_migrations/versions/f15b1fb526dd_cascade_floatingip.py index 51958697a..298a1f5c0 100644 --- a/neutron/db/migration/alembic_migrations/versions/f15b1fb526dd_cascade_floatingip.py +++ b/neutron/db/migration/alembic_migrations/versions/f15b1fb526dd_cascade_floatingip.py @@ -40,7 +40,7 @@ def _drop_constraint(): def upgrade(): _drop_constraint() op.create_foreign_key( - name=None, - source='floatingips', referent='ports', + constraint_name=None, + source_table='floatingips', referent_table='ports', local_cols=['floating_port_id'], remote_cols=['id'], ondelete='CASCADE' ) -- 2.45.2