From: Ann Kamyshnikova Date: Wed, 20 Aug 2014 12:24:10 +0000 (+0400) Subject: Block downgrade from icehouse to havana X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=243881de9271ccf925fe33f45e91bb1dfcb9dd2d;p=openstack-build%2Fneutron-build.git Block downgrade from icehouse to havana We are purging all downgrade methods from icehouse to havana because: 1) havana is going to become unsupported during Kilo cycle. 2) most people will upgrade from icehouse, while a minor percentage from havana 3) downgrade use cases are mostly to revert after failed upgrades See discussion in https://review.openstack.org/109952 for details. This change removes all downgrade code in this migrations and raises an exception in downgrade of icehouse_release. Partially-implements: blueprint reorganize-migrations Change-Id: I874dd2475da0404370dc7e53d7c43e0a8dce0d56 --- diff --git a/neutron/db/migration/alembic_migrations/versions/117643811bca_nec_delete_ofc_mapping.py b/neutron/db/migration/alembic_migrations/versions/117643811bca_nec_delete_ofc_mapping.py index 8db943492..9c49d4771 100644 --- a/neutron/db/migration/alembic_migrations/versions/117643811bca_nec_delete_ofc_mapping.py +++ b/neutron/db/migration/alembic_migrations/versions/117643811bca_nec_delete_ofc_mapping.py @@ -179,30 +179,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.create_table( - 'ofctenants', - sa.Column('id', sa.String(length=36), nullable=False), - sa.Column('quantum_id', sa.String(length=36), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - op.create_table( - 'ofcnetworks', - sa.Column('id', sa.String(length=36), nullable=False), - sa.Column('quantum_id', sa.String(length=36), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - op.create_table( - 'ofcports', - sa.Column('id', sa.String(length=36), nullable=False), - sa.Column('quantum_id', sa.String(length=36), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - op.create_table( - 'ofcfilters', - sa.Column('id', sa.String(length=36), nullable=False), - sa.Column('quantum_id', sa.String(length=36), nullable=False), - sa.PrimaryKeyConstraint('id') - ) + pass diff --git a/neutron/db/migration/alembic_migrations/versions/1421183d533f_nsx_dhcp_metadata.py b/neutron/db/migration/alembic_migrations/versions/1421183d533f_nsx_dhcp_metadata.py index 69e5414a8..2bde94c55 100644 --- a/neutron/db/migration/alembic_migrations/versions/1421183d533f_nsx_dhcp_metadata.py +++ b/neutron/db/migration/alembic_migrations/versions/1421183d533f_nsx_dhcp_metadata.py @@ -67,8 +67,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('lsn_port') - op.drop_table('lsn') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/157a5d299379_ml2_binding_profile.py b/neutron/db/migration/alembic_migrations/versions/157a5d299379_ml2_binding_profile.py index f7900b699..b89b4e924 100644 --- a/neutron/db/migration/alembic_migrations/versions/157a5d299379_ml2_binding_profile.py +++ b/neutron/db/migration/alembic_migrations/versions/157a5d299379_ml2_binding_profile.py @@ -47,7 +47,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_column('ml2_port_bindings', 'profile') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py b/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py index c5972444e..6ab788de8 100644 --- a/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py +++ b/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py @@ -79,22 +79,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('networkgatewaydevices') - # Re-create previous version of networkgatewaydevices table - op.create_table( - 'networkgatewaydevices', - sa.Column('id', sa.String(length=36), nullable=False), - sa.Column('network_gateway_id', sa.String(length=36), nullable=True), - sa.Column('interface_name', sa.String(length=64), nullable=True), - sa.ForeignKeyConstraint(['network_gateway_id'], ['networkgateways.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('id')) - # Copy from networkgatewaydevicereferences to networkgatewaydevices - op.execute("INSERT INTO networkgatewaydevices SELECT " - "id, network_gateway_id, interface_name FROM " - "networkgatewaydevicereferences") - # Dropt networkgatewaydevicereferences - op.drop_table('networkgatewaydevicereferences') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/1b2580001654_nsx_sec_group_mappin.py b/neutron/db/migration/alembic_migrations/versions/1b2580001654_nsx_sec_group_mappin.py index 76e072ca3..9ad216d4a 100644 --- a/neutron/db/migration/alembic_migrations/versions/1b2580001654_nsx_sec_group_mappin.py +++ b/neutron/db/migration/alembic_migrations/versions/1b2580001654_nsx_sec_group_mappin.py @@ -56,6 +56,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - op.drop_table('neutron_nsx_security_group_mappings') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py b/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py index f3ac0980a..d1339853e 100644 --- a/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py +++ b/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py @@ -62,11 +62,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_constraint( - name=UC_NAME, - table_name=TABLE_NAME, - type_='unique' - ) + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py b/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py index f3b444a22..dc0e7f5a4 100644 --- a/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py +++ b/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py @@ -70,12 +70,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_column('subnets', 'ipv6_ra_mode') - op.drop_column('subnets', 'ipv6_address_mode') - context = op.get_context() - if context.bind.dialect.name == 'postgresql': - op.execute('DROP TYPE ipv6_ra_modes') - op.execute('DROP TYPE ipv6_address_modes') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/24c7ea5160d7_cisco_csr_vpnaas.py b/neutron/db/migration/alembic_migrations/versions/24c7ea5160d7_cisco_csr_vpnaas.py index f7cdfd913..38b5b2efd 100644 --- a/neutron/db/migration/alembic_migrations/versions/24c7ea5160d7_cisco_csr_vpnaas.py +++ b/neutron/db/migration/alembic_migrations/versions/24c7ea5160d7_cisco_csr_vpnaas.py @@ -54,7 +54,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('cisco_csr_identifier_map') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/27cc183af192_ml2_vnic_type.py b/neutron/db/migration/alembic_migrations/versions/27cc183af192_ml2_vnic_type.py index db38e65a2..c2a368ccc 100644 --- a/neutron/db/migration/alembic_migrations/versions/27cc183af192_ml2_vnic_type.py +++ b/neutron/db/migration/alembic_migrations/versions/27cc183af192_ml2_vnic_type.py @@ -48,7 +48,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_column('ml2_port_bindings', 'vnic_type') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/2eeaf963a447_floatingip_status.py b/neutron/db/migration/alembic_migrations/versions/2eeaf963a447_floatingip_status.py index 7da8f8415..156b6b8a3 100644 --- a/neutron/db/migration/alembic_migrations/versions/2eeaf963a447_floatingip_status.py +++ b/neutron/db/migration/alembic_migrations/versions/2eeaf963a447_floatingip_status.py @@ -73,7 +73,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - op.drop_column('floatingips', 'last_known_router_id') - op.drop_column('floatingips', 'status') + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/33dd0a9fa487_embrane_lbaas_driver.py b/neutron/db/migration/alembic_migrations/versions/33dd0a9fa487_embrane_lbaas_driver.py index f1d5fd016..e58a07f41 100644 --- a/neutron/db/migration/alembic_migrations/versions/33dd0a9fa487_embrane_lbaas_driver.py +++ b/neutron/db/migration/alembic_migrations/versions/33dd0a9fa487_embrane_lbaas_driver.py @@ -53,7 +53,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table(u'embrane_pool_port') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/3d2585038b95_vmware_nsx.py b/neutron/db/migration/alembic_migrations/versions/3d2585038b95_vmware_nsx.py index c51f02a3d..3fd331198 100644 --- a/neutron/db/migration/alembic_migrations/versions/3d2585038b95_vmware_nsx.py +++ b/neutron/db/migration/alembic_migrations/versions/3d2585038b95_vmware_nsx.py @@ -53,13 +53,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - engine = op.get_bind().engine - if engine.name == 'postgresql': - op.execute("ALTER TYPE tz_network_bindings_binding_type " - "RENAME TO nvp_network_bindings_binding_type;") - - op.rename_table('multi_provider_networks', 'nvp_multi_provider_networks') - op.rename_table('tz_network_bindings', 'nvp_network_bindings') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/3d3cb89d84ee_nsx_switch_mappings.py b/neutron/db/migration/alembic_migrations/versions/3d3cb89d84ee_nsx_switch_mappings.py index 2b4da4891..cc3b529f4 100644 --- a/neutron/db/migration/alembic_migrations/versions/3d3cb89d84ee_nsx_switch_mappings.py +++ b/neutron/db/migration/alembic_migrations/versions/3d3cb89d84ee_nsx_switch_mappings.py @@ -55,7 +55,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('neutron_nsx_network_mappings') + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/492a106273f8_brocade_ml2_mech_dri.py b/neutron/db/migration/alembic_migrations/versions/492a106273f8_brocade_ml2_mech_dri.py index 65cde2e80..94112b88a 100644 --- a/neutron/db/migration/alembic_migrations/versions/492a106273f8_brocade_ml2_mech_dri.py +++ b/neutron/db/migration/alembic_migrations/versions/492a106273f8_brocade_ml2_mech_dri.py @@ -63,8 +63,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('ml2_brocadeports') - op.drop_table('ml2_brocadenetworks') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/4ca36cfc898c_nsx_router_mappings.py b/neutron/db/migration/alembic_migrations/versions/4ca36cfc898c_nsx_router_mappings.py index c9784a890..1e9e9d74d 100644 --- a/neutron/db/migration/alembic_migrations/versions/4ca36cfc898c_nsx_router_mappings.py +++ b/neutron/db/migration/alembic_migrations/versions/4ca36cfc898c_nsx_router_mappings.py @@ -58,7 +58,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('neutron_nsx_router_mappings') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py b/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py index ad4fa3b91..1f89cf32a 100644 --- a/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py +++ b/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py @@ -68,30 +68,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - if op.get_bind().engine.name == 'ibm_db_sa': - # Note(xuhanp): DB2 doesn't allow nullable=False Column with - # "DEFAULT" clause not specified. So server_default is used. - # Using sa.text will result "DEFAULT 0" for cap_port_filter. - op.add_column('ml2_port_bindings', - sa.Column('cap_port_filter', sa.Boolean(), - nullable=False, - server_default=sa.text("0"))) - op.execute( - "UPDATE ml2_port_bindings SET" - " cap_port_filter = 1" - " WHERE vif_details LIKE '%\"port_filter\": true%'") - else: - op.add_column('ml2_port_bindings', - sa.Column('cap_port_filter', sa.Boolean(), - nullable=False, - server_default=sa.text("false"))) - op.execute( - "UPDATE ml2_port_bindings SET" - " cap_port_filter = true" - " WHERE vif_details LIKE '%\"port_filter\": true%'") - op.drop_column('ml2_port_bindings', 'vif_details') - if op.get_bind().engine.name == 'ibm_db_sa': - op.execute("CALL SYSPROC.ADMIN_CMD('REORG TABLE ml2_port_bindings')") + pass diff --git a/neutron/db/migration/alembic_migrations/versions/50e86cb2637a_nsx_mappings.py b/neutron/db/migration/alembic_migrations/versions/50e86cb2637a_nsx_mappings.py index 80da209a0..024d38ede 100644 --- a/neutron/db/migration/alembic_migrations/versions/50e86cb2637a_nsx_mappings.py +++ b/neutron/db/migration/alembic_migrations/versions/50e86cb2637a_nsx_mappings.py @@ -62,19 +62,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - # Restore table to pre-icehouse version - op.create_table('quantum_nvp_port_mapping', - sa.Column('quantum_id', sa.String(length=36), - nullable=False), - sa.Column('nvp_id', sa.String(length=36), - nullable=False), - sa.ForeignKeyConstraint(['quantum_id'], ['ports.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('quantum_id')) - op.execute("INSERT INTO quantum_nvp_port_mapping SELECT neutron_id as " - "quantum_id, nsx_port_id as nvp_id from" - " neutron_nsx_port_mappings") - op.drop_table('neutron_nsx_port_mappings') + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/538732fa21e1_nec_rename_quantum_id_to_neutron_id.py b/neutron/db/migration/alembic_migrations/versions/538732fa21e1_nec_rename_quantum_id_to_neutron_id.py index 0dd6ca149..ad3a34789 100644 --- a/neutron/db/migration/alembic_migrations/versions/538732fa21e1_nec_rename_quantum_id_to_neutron_id.py +++ b/neutron/db/migration/alembic_migrations/versions/538732fa21e1_nec_rename_quantum_id_to_neutron_id.py @@ -52,14 +52,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - for table in ['ofctenantmappings', 'ofcnetworkmappings', - 'ofcportmappings', 'ofcfiltermappings', - 'ofcroutermappings', - ]: - op.alter_column(table, 'neutron_id', - new_column_name='quantum_id', - existing_type=sa.String(length=36), - existing_nullable=False) + pass diff --git a/neutron/db/migration/alembic_migrations/versions/5ac1c354a051_n1kv_segment_alloc.py b/neutron/db/migration/alembic_migrations/versions/5ac1c354a051_n1kv_segment_alloc.py index 516faaf78..09af7f833 100644 --- a/neutron/db/migration/alembic_migrations/versions/5ac1c354a051_n1kv_segment_alloc.py +++ b/neutron/db/migration/alembic_migrations/versions/5ac1c354a051_n1kv_segment_alloc.py @@ -70,14 +70,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_constraint('cisco_n1kv_vxlan_allocations_ibfk_1', - 'cisco_n1kv_vxlan_allocations', - 'foreignkey') - op.drop_column('cisco_n1kv_vxlan_allocations', 'network_profile_id') - op.drop_constraint('cisco_n1kv_vlan_allocations_ibfk_1', - 'cisco_n1kv_vlan_allocations', - 'foreignkey') - op.drop_column('cisco_n1kv_vlan_allocations', 'network_profile_id') + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/81c553f3776c_bsn_consistencyhashes.py b/neutron/db/migration/alembic_migrations/versions/81c553f3776c_bsn_consistencyhashes.py index 0300c2475..f24c57bd3 100644 --- a/neutron/db/migration/alembic_migrations/versions/81c553f3776c_bsn_consistencyhashes.py +++ b/neutron/db/migration/alembic_migrations/versions/81c553f3776c_bsn_consistencyhashes.py @@ -50,7 +50,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('consistencyhashes') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py b/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py index 72a06887f..e9cb78ba6 100644 --- a/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py +++ b/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py @@ -53,7 +53,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('quotas') + pass diff --git a/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py b/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py index b276ae7fc..7d8e280b1 100644 --- a/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py +++ b/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py @@ -52,14 +52,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.alter_column('poolstatisticss', 'bytes_in', - type_=sa.Integer(), existing_type=sa.BigInteger()) - op.alter_column('poolstatisticss', 'bytes_out', - type_=sa.Integer(), existing_type=sa.BigInteger()) - op.alter_column('poolstatisticss', 'active_connections', - type_=sa.Integer(), existing_type=sa.BigInteger()) - op.alter_column('poolstatisticss', 'total_connections', - type_=sa.Integer(), existing_type=sa.BigInteger()) + pass diff --git a/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py b/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py index cfc86a554..b52cbd73f 100644 --- a/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py +++ b/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py @@ -53,11 +53,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_constraint( - CONSTRAINT_NAME, - TABLE_NAME, - type_='unique' - ) + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/e766b19a3bb_nuage_initial.py b/neutron/db/migration/alembic_migrations/versions/e766b19a3bb_nuage_initial.py index 3562c7d94..5d79effc6 100644 --- a/neutron/db/migration/alembic_migrations/versions/e766b19a3bb_nuage_initial.py +++ b/neutron/db/migration/alembic_migrations/versions/e766b19a3bb_nuage_initial.py @@ -107,14 +107,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('router_zone_mapping') - op.drop_table('net_partition_router_mapping') - op.drop_table('subnet_l2dom_mapping') - op.drop_table('port_mapping') - op.drop_table('net_partitions') - op.drop_table('quotas') - - common_ext_ops.downgrade_l3() + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py b/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py index f8980c6c6..674dec78a 100644 --- a/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py +++ b/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py @@ -54,9 +54,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('quotas') - ### end Alembic commands ### + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/f44ab9871cd6_bsn_security_groups.py b/neutron/db/migration/alembic_migrations/versions/f44ab9871cd6_bsn_security_groups.py index bdf7f36fb..a6a6ce4dd 100644 --- a/neutron/db/migration/alembic_migrations/versions/f44ab9871cd6_bsn_security_groups.py +++ b/neutron/db/migration/alembic_migrations/versions/f44ab9871cd6_bsn_security_groups.py @@ -83,12 +83,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('securitygroupportbindings') - op.drop_table('securitygrouprules') - securitygrouprules_direction.drop(op.get_bind(), checkfirst=False) - op.drop_table('securitygroups') - ### end Alembic commands ### + pass diff --git a/neutron/db/migration/alembic_migrations/versions/fcac4c42e2cc_bsn_addresspairs.py b/neutron/db/migration/alembic_migrations/versions/fcac4c42e2cc_bsn_addresspairs.py index 9d80be9fb..8a8e05fbf 100644 --- a/neutron/db/migration/alembic_migrations/versions/fcac4c42e2cc_bsn_addresspairs.py +++ b/neutron/db/migration/alembic_migrations/versions/fcac4c42e2cc_bsn_addresspairs.py @@ -52,7 +52,4 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - if not migration.should_run(active_plugins, migration_for_plugins): - return - - op.drop_table('allowedaddresspairs') + pass \ No newline at end of file diff --git a/neutron/db/migration/alembic_migrations/versions/icehouse_release.py b/neutron/db/migration/alembic_migrations/versions/icehouse_release.py index 5a02ba699..5b41d8df2 100644 --- a/neutron/db/migration/alembic_migrations/versions/icehouse_release.py +++ b/neutron/db/migration/alembic_migrations/versions/icehouse_release.py @@ -36,5 +36,12 @@ def upgrade(active_plugins=None, options=None): def downgrade(active_plugins=None, options=None): - """A no-op migration for marking the Icehouse release.""" - pass + # We are purging all downgrade methods from icehouse to havana because: + # 1) havana is going to become unsupported during Kilo cycle. + # 2) most people will upgrade from icehouse, while a minor percentage + # from havana + # 3) downgrade use cases are mostly to revert after failed upgrades + # See discussion in https://review.openstack.org/109952 for details + + raise NotImplementedError("Downgrade from icehouse to havana not " + "supported") \ No newline at end of file