From b2cbb2d4af3ea3a4c5e173f647ce213f1ae0c9f8 Mon Sep 17 00:00:00 2001 From: Ann Kamyshnikova Date: Thu, 19 Mar 2015 11:52:37 +0300 Subject: [PATCH] Remove downgrade from existing migrations Remove downgrade from all existing migrations. Create a test that verifies that no migration has a downgrade. Related cross-project spec: https://review.openstack.org/152337 Closes-Bug: 1434103 Change-Id: I2aad5f40f9aec9aea7ea869c9f30bc5ea586f3fe --- .../alembic_migrations/agent_init_ops.py | 4 -- .../alembic_migrations/brocade_init_ops.py | 5 -- .../alembic_migrations/cisco_init_ops.py | 20 ------- .../alembic_migrations/core_init_ops.py | 12 ----- .../alembic_migrations/firewall_init_ops.py | 7 --- .../alembic_migrations/l3_init_ops.py | 8 --- .../alembic_migrations/lb_init_ops.py | 5 -- .../loadbalancer_init_ops.py | 15 ------ .../alembic_migrations/metering_init_ops.py | 6 --- .../alembic_migrations/ml2_init_ops.py | 16 ------ .../alembic_migrations/mlnx_init_ops.py | 6 --- .../alembic_migrations/nec_init_ops.py | 15 ------ .../other_extensions_init_ops.py | 10 ---- .../other_plugins_init_ops.py | 9 ---- .../alembic_migrations/ovs_init_ops.py | 7 --- .../alembic_migrations/portsec_init_ops.py | 5 -- .../alembic_migrations/ryu_init_ops.py | 5 -- .../alembic_migrations/secgroup_init_ops.py | 7 --- .../versions/10cd28e692e9_nuage_extraroute.py | 5 -- .../117643811bca_nec_delete_ofc_mapping.py | 4 -- .../1421183d533f_nsx_dhcp_metadata.py | 4 -- .../14be42f3d0a5_default_sec_group_table.py | 4 -- .../157a5d299379_ml2_binding_profile.py | 4 -- .../1680e1f0c4dc_remove_cisco_nexus_plugin.py | 19 +------ .../versions/16a27a58e093_ext_l3_ha_mode.py | 9 ---- ...118d31d_extra_dhcp_options_ipv6_support.py | 16 ------ .../versions/19180cf98af6_nsx_gw_devices.py | 4 -- .../versions/1955efc66455_weight_scheduler.py | 4 -- .../1b2580001654_nsx_sec_group_mappin.py | 4 -- .../1b837a7125a9_cisco_apic_driver.py | 6 --- .../versions/1d6ee1ae5da5_db_healing.py | 4 -- ...5dd1d09b22_set_not_null_fields_lb_stats.py | 20 ------- .../1f71e54a85e7_ml2_net_seg_model.py | 4 -- ...c149aca4_agents_unique_by_type_and_host.py | 4 -- .../versions/2026156eab2f_l2_dvr_models.py | 5 -- ...f57ab_ml2_refactor_for_dynamic_segments.py | 5 -- .../2447ad0e9585_add_ipv6_mode_props.py | 4 -- .../versions/24c7ea5160d7_cisco_csr_vpnaas.py | 4 -- .../26b54cf9024d_add_index_on_allocated.py | 9 ---- .../versions/27cc183af192_ml2_vnic_type.py | 4 -- .../28c0ffb8ebbd_remove_mlnx_plugin.py | 41 --------------- ...b59e0_add_mac_address_unique_constraint.py | 11 ---- ...0a332_remove_hypervneutronplugin_tables.py | 21 -------- .../2d2a8a565438_hierarchical_binding.py | 49 ----------------- .../versions/2db5203cb7a9_nuage_floatingip.py | 16 ------ .../2eeaf963a447_floatingip_status.py | 4 -- ...1d7f831a591_add_constraint_for_routerid.py | 33 ------------ .../327ee5fde2c7_set_innodb_engine.py | 4 -- .../32f3915891fd_cisco_apic_driver_update.py | 16 ------ ...et_length_of_description_field_metering.py | 4 -- .../33dd0a9fa487_embrane_lbaas_driver.py | 4 -- .../341ee8a4ccb5_sync_with_cisco_repo.py | 9 ---- .../35a0f3365720_add_port_security_in_ml2.py | 4 -- ...322991f59_nuage_removing_mapping_tables.py | 51 ------------------ ...38495dc99731_ml2_tunnel_endpoints_table.py | 17 ------ ...7f7f7c456_l3_extension_distributed_mode.py | 4 -- .../3b85b693a95f_remove_service_tables.py | 8 --- .../3c346828361e_metering_label_shared.py | 6 +-- .../versions/3d2585038b95_vmware_nsx.py | 4 -- .../3d3cb89d84ee_nsx_switch_mappings.py | 4 -- .../408cfbf6923c_remove_ryu_plugin.py | 15 ------ .../4119216b7365_add_tenant_id_idx.py | 6 --- .../41662e32bce2_l3_dvr_snat_mapping.py | 15 ------ ...63a9618fd_add_mtu_attributes_to_network.py | 4 -- ..._uniqueconstraint_ipavailability_ranges.py | 14 ----- .../492a106273f8_brocade_ml2_mech_dri.py | 4 -- .../4ca36cfc898c_nsx_router_mappings.py | 4 -- .../versions/4dbe243cd84d_nsxv.py | 22 -------- ...c2f4_correct_vxlan_endpoint_primary_key.py | 5 -- .../4eca4a84f08a_remove_ml2_cisco_cred_db.py | 7 --- .../50d5ba354c23_ml2_binding_vif_details.py | 4 -- .../versions/50e86cb2637a_nsx_mappings.py | 4 -- .../versions/51c54792158e_subnetpools.py | 5 -- ...1e1_nec_rename_quantum_id_to_neutron_id.py | 4 -- .../544673ac99ab_add_router_port_table.py | 4 -- .../5446f2a45467_set_server_default.py | 51 +++++++----------- .../54f7549a0e5f_set_not_null_peer_address.py | 8 --- .../versions/5589aa32bf80_l3_dvr_scheduler.py | 4 -- .../57086602ca0a_scrap_nsx_adv_svcs_models.py | 52 ------------------- .../57dd745253a6_nuage_kilo_migrate.py | 14 ----- .../58fe87a01143_cisco_csr_routing.py | 6 --- .../5ac1c354a051_n1kv_segment_alloc.py | 4 -- .../6be312499f9_set_not_null_vlan_id_cisco.py | 8 --- .../81c553f3776c_bsn_consistencyhashes.py | 4 -- ...6d6d9776e2b_cisco_apic_driver_update_l3.py | 21 -------- ...cbf1c_unify_nsx_router_extra_attributes.py | 17 ------ .../aae5706a396_nuage_provider_networks.py | 4 -- .../abc88c33f74f_lb_stats_needs_bigint.py | 4 -- ...65aa907aec_set_length_of_protocol_field.py | 4 -- ...dd_vlan_transparent_property_to_network.py | 4 -- ...871c0d5_set_admin_state_up_not_null_ml2.py | 8 --- .../e197124d4b9_add_unique_constrain.py | 4 -- .../versions/e766b19a3bb_nuage_initial.py | 4 -- .../f15b1fb526dd_cascade_floatingip.py | 9 ---- .../versions/havana_initial.py | 23 -------- .../versions/icehouse_release.py | 12 ----- .../versions/juno_release.py | 5 -- .../alembic_migrations/vmware_init_ops.py | 22 -------- .../alembic_migrations/vpn_init_ops.py | 18 ------- .../tests/functional/db/test_migrations.py | 21 ++++++++ 100 files changed, 42 insertions(+), 1024 deletions(-) diff --git a/neutron/db/migration/alembic_migrations/agent_init_ops.py b/neutron/db/migration/alembic_migrations/agent_init_ops.py index 9c321919701..5390ee61854 100644 --- a/neutron/db/migration/alembic_migrations/agent_init_ops.py +++ b/neutron/db/migration/alembic_migrations/agent_init_ops.py @@ -37,7 +37,3 @@ def upgrade(): sa.Column('description', sa.String(length=255), nullable=True), sa.Column('configurations', sa.String(length=4095), nullable=False), sa.PrimaryKeyConstraint('id')) - - -def downgrade(): - op.drop_table('agents') diff --git a/neutron/db/migration/alembic_migrations/brocade_init_ops.py b/neutron/db/migration/alembic_migrations/brocade_init_ops.py index 3db831effac..8a42cbb2ba8 100644 --- a/neutron/db/migration/alembic_migrations/brocade_init_ops.py +++ b/neutron/db/migration/alembic_migrations/brocade_init_ops.py @@ -36,8 +36,3 @@ def upgrade(): sa.Column('tenant_id', sa.String(length=36), nullable=True), sa.ForeignKeyConstraint(['network_id'], ['brocadenetworks.id'], ), sa.PrimaryKeyConstraint('port_id')) - - -def downgrade(): - op.drop_table('brocadeports') - op.drop_table('brocadenetworks') diff --git a/neutron/db/migration/alembic_migrations/cisco_init_ops.py b/neutron/db/migration/alembic_migrations/cisco_init_ops.py index c27cedd35cb..b5031c4d812 100644 --- a/neutron/db/migration/alembic_migrations/cisco_init_ops.py +++ b/neutron/db/migration/alembic_migrations/cisco_init_ops.py @@ -153,23 +153,3 @@ def upgrade(): ondelete='CASCADE'), sa.ForeignKeyConstraint(['profile_id'], ['cisco_policy_profiles.id']), sa.PrimaryKeyConstraint('port_id')) - - -def downgrade(): - op.drop_table('cisco_n1kv_port_bindings') - op.drop_table('cisco_n1kv_network_bindings') - op.drop_table('cisco_n1kv_multi_segments') - op.drop_table('cisco_provider_networks') - op.drop_table('cisco_n1kv_trunk_segments') - op.drop_table('cisco_n1kv_vmnetworks') - op.drop_table('cisco_n1kv_profile_bindings') - op.drop_table('cisco_nexusport_bindings') - op.drop_table('cisco_qos_policies') - op.drop_table('cisco_credentials') - op.drop_table('cisco_n1kv_vxlan_allocations') - op.drop_table('cisco_network_profiles') - op.drop_table('cisco_n1kv_vlan_allocations') - op.drop_table('cisco_policy_profiles') - # generate DDL for dropping enumns - segment_type.drop(op.get_bind(), checkfirst=False) - profile_type.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/core_init_ops.py b/neutron/db/migration/alembic_migrations/core_init_ops.py index 44298266370..df27e286913 100644 --- a/neutron/db/migration/alembic_migrations/core_init_ops.py +++ b/neutron/db/migration/alembic_migrations/core_init_ops.py @@ -115,15 +115,3 @@ def upgrade(): sa.ForeignKeyConstraint(['network_id'], ['networks.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('network_id', 'dhcp_agent_id')) - - -def downgrade(): - op.drop_table('networkdhcpagentbindings') - op.drop_table('ipavailabilityranges') - op.drop_table('ipallocations') - op.drop_table('subnetroutes') - op.drop_table('ipallocationpools') - op.drop_table('dnsnameservers') - op.drop_table('subnets') - op.drop_table('ports') - op.drop_table('networks') diff --git a/neutron/db/migration/alembic_migrations/firewall_init_ops.py b/neutron/db/migration/alembic_migrations/firewall_init_ops.py index 0ad361afba4..981edc691bf 100644 --- a/neutron/db/migration/alembic_migrations/firewall_init_ops.py +++ b/neutron/db/migration/alembic_migrations/firewall_init_ops.py @@ -73,10 +73,3 @@ def upgrade(): ['firewall_policies.id'], name='firewall_rules_ibfk_1'), sa.PrimaryKeyConstraint('id')) - - -def downgrade(): - op.drop_table('firewall_rules') - op.drop_table('firewalls') - op.drop_table('firewall_policies') - action_types.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/l3_init_ops.py b/neutron/db/migration/alembic_migrations/l3_init_ops.py index 47e6b4c19eb..fd57998417f 100644 --- a/neutron/db/migration/alembic_migrations/l3_init_ops.py +++ b/neutron/db/migration/alembic_migrations/l3_init_ops.py @@ -78,11 +78,3 @@ def upgrade(): sa.ForeignKeyConstraint(['router_id'], ['routers.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('id')) - - -def downgrade(): - op.drop_table('routerl3agentbindings') - op.drop_table('routerroutes') - op.drop_table('floatingips') - op.drop_table('routers') - op.drop_table('externalnetworks') diff --git a/neutron/db/migration/alembic_migrations/lb_init_ops.py b/neutron/db/migration/alembic_migrations/lb_init_ops.py index 22176c5b371..f97961fdf86 100644 --- a/neutron/db/migration/alembic_migrations/lb_init_ops.py +++ b/neutron/db/migration/alembic_migrations/lb_init_ops.py @@ -36,8 +36,3 @@ def upgrade(): sa.ForeignKeyConstraint(['network_id'], ['networks.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('network_id')) - - -def downgrade(): - op.drop_table('network_bindings') - op.drop_table('network_states') diff --git a/neutron/db/migration/alembic_migrations/loadbalancer_init_ops.py b/neutron/db/migration/alembic_migrations/loadbalancer_init_ops.py index a83fdc4459d..f3ed1db657d 100644 --- a/neutron/db/migration/alembic_migrations/loadbalancer_init_ops.py +++ b/neutron/db/migration/alembic_migrations/loadbalancer_init_ops.py @@ -130,18 +130,3 @@ def upgrade(): sa.Column('total_connections', sa.Integer(), nullable=False), sa.ForeignKeyConstraint(['pool_id'], ['pools.id'], ), sa.PrimaryKeyConstraint('pool_id')) - - -def downgrade(): - op.drop_table('poolstatisticss') - op.drop_table('poolmonitorassociations') - op.drop_table('members') - op.drop_table('poolloadbalanceragentbindings') - op.drop_table('sessionpersistences') - op.drop_table('pools') - op.drop_table('vips') - op.drop_table('healthmonitors') - protocols.drop(op.get_bind(), checkfirst=False) - session_persistence_type.drop(op.get_bind(), checkfirst=False) - lb_methods.drop(op.get_bind(), checkfirst=False) - health_monitor_type.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/metering_init_ops.py b/neutron/db/migration/alembic_migrations/metering_init_ops.py index 6f1a81c3e60..64edbbd3ea7 100644 --- a/neutron/db/migration/alembic_migrations/metering_init_ops.py +++ b/neutron/db/migration/alembic_migrations/metering_init_ops.py @@ -48,9 +48,3 @@ def upgrade(): ['meteringlabels.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('id')) - - -def downgrade(): - op.drop_table('meteringlabelrules') - op.drop_table('meteringlabels') - direction.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/ml2_init_ops.py b/neutron/db/migration/alembic_migrations/ml2_init_ops.py index 83025092998..dc9f5d28104 100644 --- a/neutron/db/migration/alembic_migrations/ml2_init_ops.py +++ b/neutron/db/migration/alembic_migrations/ml2_init_ops.py @@ -134,19 +134,3 @@ def upgrade(): sa.Column('tenant_id', sa.String(length=255), nullable=True), sa.Column('id', sa.String(length=36), nullable=False), sa.PrimaryKeyConstraint('id')) - - -def downgrade(): - op.drop_table('arista_provisioned_tenants') - op.drop_table('arista_provisioned_vms') - op.drop_table('arista_provisioned_nets') - op.drop_table('cisco_ml2_credentials') - op.drop_table('cisco_ml2_nexusport_bindings') - op.drop_table('ml2_port_bindings') - op.drop_table('ml2_network_segments') - op.drop_table('ml2_flat_allocations') - op.drop_table('ml2_gre_allocations') - op.drop_table('ml2_vxlan_allocations') - op.drop_table('ml2_gre_endpoints') - op.drop_table('ml2_vxlan_endpoints') - op.drop_table('ml2_vlan_allocations') diff --git a/neutron/db/migration/alembic_migrations/mlnx_init_ops.py b/neutron/db/migration/alembic_migrations/mlnx_init_ops.py index dca7aa8f77c..676585f01a6 100644 --- a/neutron/db/migration/alembic_migrations/mlnx_init_ops.py +++ b/neutron/db/migration/alembic_migrations/mlnx_init_ops.py @@ -45,9 +45,3 @@ def upgrade(): sa.ForeignKeyConstraint(['port_id'], ['ports.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('port_id')) - - -def downgrade(): - op.drop_table('port_profile') - op.drop_table('mlnx_network_bindings') - op.drop_table('segmentation_id_allocation') diff --git a/neutron/db/migration/alembic_migrations/nec_init_ops.py b/neutron/db/migration/alembic_migrations/nec_init_ops.py index 327800118d8..9d02495a8d3 100644 --- a/neutron/db/migration/alembic_migrations/nec_init_ops.py +++ b/neutron/db/migration/alembic_migrations/nec_init_ops.py @@ -122,18 +122,3 @@ def upgrade(): sa.Column('mac', sa.String(length=32), nullable=False), sa.ForeignKeyConstraint(['id'], ['ports.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('id')) - - -def downgrade(): - op.drop_table('portinfos') - op.drop_table('packetfilters') - op.drop_table('ofctenants') - op.drop_table('ofcports') - op.drop_table('ofcfilters') - op.drop_table('ofcnetworkmappings') - op.drop_table('ofcfiltermappings') - op.drop_table('ofctenantmappings') - op.drop_table('ofcnetworks') - op.drop_table('routerproviders') - op.drop_table('ofcroutermappings') - op.drop_table('ofcportmappings') diff --git a/neutron/db/migration/alembic_migrations/other_extensions_init_ops.py b/neutron/db/migration/alembic_migrations/other_extensions_init_ops.py index 96a783a3bed..e45526f4098 100644 --- a/neutron/db/migration/alembic_migrations/other_extensions_init_ops.py +++ b/neutron/db/migration/alembic_migrations/other_extensions_init_ops.py @@ -82,13 +82,3 @@ def upgrade(): sa.Column('router_id', sa.String(length=36), nullable=False), sa.ForeignKeyConstraint(['router_id'], ['routers.id'], ), sa.PrimaryKeyConstraint('resource_id', 'resource_type')) - - -def downgrade(): - op.drop_table('servicerouterbindings') - op.drop_table('routerservicetypebindings') - op.drop_table('extradhcpopts') - op.drop_table('portbindingports') - op.drop_table('allowedaddresspairs') - op.drop_table('quotas') - op.drop_table('providerresourceassociations') diff --git a/neutron/db/migration/alembic_migrations/other_plugins_init_ops.py b/neutron/db/migration/alembic_migrations/other_plugins_init_ops.py index 2be5a1afd1b..9d72b5d14f1 100644 --- a/neutron/db/migration/alembic_migrations/other_plugins_init_ops.py +++ b/neutron/db/migration/alembic_migrations/other_plugins_init_ops.py @@ -79,12 +79,3 @@ def upgrade(): sa.ForeignKeyConstraint(['rule_id'], ['routerrules.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('rule_id', 'nexthop')) - - -def downgrade(): - op.drop_table('nexthops') - op.drop_table('routerrules') - op.drop_table('routerflavors') - op.drop_table('networkflavors') - op.drop_table('hyperv_network_bindings') - op.drop_table('hyperv_vlan_allocations') diff --git a/neutron/db/migration/alembic_migrations/ovs_init_ops.py b/neutron/db/migration/alembic_migrations/ovs_init_ops.py index 699c194b1d1..c02a3248941 100644 --- a/neutron/db/migration/alembic_migrations/ovs_init_ops.py +++ b/neutron/db/migration/alembic_migrations/ovs_init_ops.py @@ -52,10 +52,3 @@ def upgrade(): sa.ForeignKeyConstraint(['network_id'], ['networks.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('network_id')) - - -def downgrade(): - op.drop_table('ovs_network_bindings') - op.drop_table('ovs_vlan_allocations') - op.drop_table('ovs_tunnel_allocations') - op.drop_table('ovs_tunnel_endpoints') diff --git a/neutron/db/migration/alembic_migrations/portsec_init_ops.py b/neutron/db/migration/alembic_migrations/portsec_init_ops.py index 46452941ecc..8fbc2439c0a 100644 --- a/neutron/db/migration/alembic_migrations/portsec_init_ops.py +++ b/neutron/db/migration/alembic_migrations/portsec_init_ops.py @@ -36,8 +36,3 @@ def upgrade(): sa.ForeignKeyConstraint(['port_id'], ['ports.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('port_id')) - - -def downgrade(): - op.drop_table('portsecuritybindings') - op.drop_table('networksecuritybindings') diff --git a/neutron/db/migration/alembic_migrations/ryu_init_ops.py b/neutron/db/migration/alembic_migrations/ryu_init_ops.py index 0abd4a65515..426dba1ba9d 100644 --- a/neutron/db/migration/alembic_migrations/ryu_init_ops.py +++ b/neutron/db/migration/alembic_migrations/ryu_init_ops.py @@ -33,8 +33,3 @@ def upgrade(): nullable=False), sa.ForeignKeyConstraint(['network_id'], ['networks.id'], ), sa.PrimaryKeyConstraint('tunnel_key')) - - -def downgrade(): - op.drop_table('tunnelkeys') - op.drop_table('tunnelkeylasts') diff --git a/neutron/db/migration/alembic_migrations/secgroup_init_ops.py b/neutron/db/migration/alembic_migrations/secgroup_init_ops.py index 7aab4e5ef14..de09af40ca5 100644 --- a/neutron/db/migration/alembic_migrations/secgroup_init_ops.py +++ b/neutron/db/migration/alembic_migrations/secgroup_init_ops.py @@ -56,10 +56,3 @@ def upgrade(): sa.ForeignKeyConstraint(['port_id'], ['ports.id'], ondelete='CASCADE'), sa.ForeignKeyConstraint(['security_group_id'], ['securitygroups.id']), sa.PrimaryKeyConstraint('port_id', 'security_group_id')) - - -def downgrade(): - op.drop_table('securitygroupportbindings') - op.drop_table('securitygrouprules') - op.drop_table('securitygroups') - rule_direction_enum.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/versions/10cd28e692e9_nuage_extraroute.py b/neutron/db/migration/alembic_migrations/versions/10cd28e692e9_nuage_extraroute.py index 72b7f218198..6ef617f24dc 100644 --- a/neutron/db/migration/alembic_migrations/versions/10cd28e692e9_nuage_extraroute.py +++ b/neutron/db/migration/alembic_migrations/versions/10cd28e692e9_nuage_extraroute.py @@ -51,8 +51,3 @@ def upgrade(): # if another plugin was configured before the nuage one if not migration.schema_has_table('routerroutes'): l3_init_ops.create_routerroutes() - - -def downgrade(): - # The routerroutes table should not be dropped - op.drop_table('routerroutes_mapping') 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 2e799aa8090..3e8e15cd010 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 @@ -172,7 +172,3 @@ def upgrade(): op.drop_table('ofcnetworks') op.drop_table('ofcports') op.drop_table('ofcfilters') - - -def downgrade(): - 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 05f6788ce3f..6b8630c0d92 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 @@ -52,7 +52,3 @@ def upgrade(): sa.ForeignKeyConstraint(['lsn_id'], ['lsn.lsn_id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('lsn_port_id')) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py b/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py index 4ff6df8eb05..d403f6c699b 100644 --- a/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py +++ b/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py @@ -63,10 +63,6 @@ def upgrade(): op.execute(ins) -def downgrade(): - op.drop_table('default_security_group') - - def check_sanity(connection): res = get_duplicate_default_security_groups(connection) if res: 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 715c25836cd..e127ff91926 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 @@ -36,7 +36,3 @@ def upgrade(): op.add_column('ml2_port_bindings', sa.Column('profile', sa.String(length=4095), nullable=False, server_default='')) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/1680e1f0c4dc_remove_cisco_nexus_plugin.py b/neutron/db/migration/alembic_migrations/versions/1680e1f0c4dc_remove_cisco_nexus_plugin.py index 49040c071db..ff85cb1336c 100644 --- a/neutron/db/migration/alembic_migrations/versions/1680e1f0c4dc_remove_cisco_nexus_plugin.py +++ b/neutron/db/migration/alembic_migrations/versions/1680e1f0c4dc_remove_cisco_nexus_plugin.py @@ -26,28 +26,11 @@ revision = '1680e1f0c4dc' down_revision = '3c346828361e' from alembic import op -import sqlalchemy as sa -def upgrade(active_plugins=None, options=None): +def upgrade(): op.execute('INSERT INTO cisco_ml2_nexusport_bindings (port_id, ' 'vlan_id, switch_ip, instance_id) SELECT ' 'port_id, vlan_id, switch_ip, instance_id FROM ' 'cisco_nexusport_bindings') op.drop_table('cisco_nexusport_bindings') - - -def downgrade(active_plugins=None, options=None): - op.create_table( - 'cisco_nexusport_bindings', - sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True), - sa.Column('port_id', sa.String(255)), - sa.Column('vlan_id', sa.Integer(), nullable=False), - sa.Column('switch_ip', sa.String(255), nullable=False), - sa.Column('instance_id', sa.String(255), nullable=False), - sa.PrimaryKeyConstraint('id') - ) - op.execute('INSERT INTO cisco_nexusport_bindings (port_id, ' - 'vlan_id, switch_ip, instance_id) SELECT ' - 'port_id, vlan_id, switch_ip, instance_id FROM ' - 'cisco_ml2_nexusport_bindings') diff --git a/neutron/db/migration/alembic_migrations/versions/16a27a58e093_ext_l3_ha_mode.py b/neutron/db/migration/alembic_migrations/versions/16a27a58e093_ext_l3_ha_mode.py index cb1cb04586e..63d304d99ec 100644 --- a/neutron/db/migration/alembic_migrations/versions/16a27a58e093_ext_l3_ha_mode.py +++ b/neutron/db/migration/alembic_migrations/versions/16a27a58e093_ext_l3_ha_mode.py @@ -75,12 +75,3 @@ def upgrade(active_plugins=None, options=None): primary_key=True), sa.ForeignKeyConstraint(['network_id'], ['networks.id'], ondelete='CASCADE')) - - -def downgrade(active_plugins=None, options=None): - op.drop_table('ha_router_vrid_allocations') - op.drop_table('ha_router_networks') - op.drop_table('ha_router_agent_port_bindings') - l3_ha_states.drop(op.get_bind(), checkfirst=False) - op.drop_column('router_extra_attributes', 'ha_vr_id') - op.drop_column('router_extra_attributes', 'ha') 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 e64a714b3df..a60a9e17a47 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 @@ -52,19 +52,3 @@ def upgrade(): source='extradhcpopts', local_cols=['port_id', 'opt_name', 'ip_version'] ) - - -def downgrade(): - with migration.remove_fks_from_table(TABLE_NAME): - op.drop_constraint( - name=CONSTRAINT_NAME_NEW, - table_name='extradhcpopts', - type_='unique' - ) - op.drop_column('extradhcpopts', 'ip_version') - - op.create_unique_constraint( - name=CONSTRAINT_NAME_OLD, - source='extradhcpopts', - local_cols=['port_id', 'opt_name'] - ) 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 7a0bb02ca07..b556d541a0b 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 @@ -70,7 +70,3 @@ def upgrade(): "FROM networkgatewaydevicereferences AS gw_dev_ref " "INNER JOIN networkgateways AS net_gw ON " "gw_dev_ref.network_gateway_id=net_gw.id") - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/1955efc66455_weight_scheduler.py b/neutron/db/migration/alembic_migrations/versions/1955efc66455_weight_scheduler.py index 63131efa7ff..fa81e72e1b6 100644 --- a/neutron/db/migration/alembic_migrations/versions/1955efc66455_weight_scheduler.py +++ b/neutron/db/migration/alembic_migrations/versions/1955efc66455_weight_scheduler.py @@ -33,7 +33,3 @@ def upgrade(): op.add_column('agents', sa.Column('load', sa.Integer(), server_default='0', nullable=False)) - - -def downgrade(): - op.drop_column('agents', 'load') 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 602dc2de5bd..33976dec837 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 @@ -48,7 +48,3 @@ def upgrade(): # each record in securitygroups op.execute("INSERT INTO neutron_nsx_security_group_mappings SELECT id,id " "from securitygroups") - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/1b837a7125a9_cisco_apic_driver.py b/neutron/db/migration/alembic_migrations/versions/1b837a7125a9_cisco_apic_driver.py index 1f77d202a23..fb4b75f6119 100644 --- a/neutron/db/migration/alembic_migrations/versions/1b837a7125a9_cisco_apic_driver.py +++ b/neutron/db/migration/alembic_migrations/versions/1b837a7125a9_cisco_apic_driver.py @@ -55,9 +55,3 @@ def upgrade(): sa.Column('contract_id', sa.String(length=64), nullable=False), sa.Column('filter_id', sa.String(length=64), nullable=False), sa.PrimaryKeyConstraint('tenant_id')) - - -def downgrade(active_plugins=None, options=None): - op.drop_table('cisco_ml2_apic_contracts') - op.drop_table('cisco_ml2_apic_port_profiles') - op.drop_table('cisco_ml2_apic_epgs') diff --git a/neutron/db/migration/alembic_migrations/versions/1d6ee1ae5da5_db_healing.py b/neutron/db/migration/alembic_migrations/versions/1d6ee1ae5da5_db_healing.py index c6752668c1b..40430968580 100644 --- a/neutron/db/migration/alembic_migrations/versions/1d6ee1ae5da5_db_healing.py +++ b/neutron/db/migration/alembic_migrations/versions/1d6ee1ae5da5_db_healing.py @@ -30,7 +30,3 @@ from neutron.db.migration.alembic_migrations import heal_script def upgrade(): heal_script.heal() - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py b/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py index eceece94482..feadfdc93f5 100644 --- a/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py +++ b/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py @@ -48,23 +48,3 @@ def upgrade(): 'poolstatisticss', 'total_connections', nullable=False, existing_type=sa.BigInteger()) - - -@migration.skip_if_offline -def downgrade(): - migration.alter_column_if_exists( - 'poolstatisticss', 'bytes_in', - nullable=True, - existing_type=sa.BigInteger()) - migration.alter_column_if_exists( - 'poolstatisticss', 'bytes_out', - nullable=True, - existing_type=sa.BigInteger()) - migration.alter_column_if_exists( - 'poolstatisticss', 'active_connections', - nullable=True, - existing_type=sa.BigInteger()) - migration.alter_column_if_exists( - 'poolstatisticss', 'total_connections', - nullable=True, - existing_type=sa.BigInteger()) diff --git a/neutron/db/migration/alembic_migrations/versions/1f71e54a85e7_ml2_net_seg_model.py b/neutron/db/migration/alembic_migrations/versions/1f71e54a85e7_ml2_net_seg_model.py index f72fbf0efa7..7ecf9e3f733 100644 --- a/neutron/db/migration/alembic_migrations/versions/1f71e54a85e7_ml2_net_seg_model.py +++ b/neutron/db/migration/alembic_migrations/versions/1f71e54a85e7_ml2_net_seg_model.py @@ -34,7 +34,3 @@ def upgrade(): op.add_column('ml2_network_segments', sa.Column('segment_index', sa.Integer(), nullable=False, server_default='0')) - - -def downgrade(): - op.drop_column('ml2_network_segments', 'segment_index') 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 65edfcfac51..f0291c42a98 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 @@ -46,7 +46,3 @@ def upgrade(): source=TABLE_NAME, local_cols=['agent_type', 'host'] ) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/2026156eab2f_l2_dvr_models.py b/neutron/db/migration/alembic_migrations/versions/2026156eab2f_l2_dvr_models.py index 3b46acd4d60..a906dd66bf6 100644 --- a/neutron/db/migration/alembic_migrations/versions/2026156eab2f_l2_dvr_models.py +++ b/neutron/db/migration/alembic_migrations/versions/2026156eab2f_l2_dvr_models.py @@ -60,8 +60,3 @@ def upgrade(): ondelete='SET NULL'), sa.PrimaryKeyConstraint('port_id', 'host') ) - - -def downgrade(): - op.drop_table('ml2_dvr_port_bindings') - op.drop_table('dvr_host_macs') diff --git a/neutron/db/migration/alembic_migrations/versions/236b90af57ab_ml2_refactor_for_dynamic_segments.py b/neutron/db/migration/alembic_migrations/versions/236b90af57ab_ml2_refactor_for_dynamic_segments.py index 7cad62c40bb..fa883778b32 100644 --- a/neutron/db/migration/alembic_migrations/versions/236b90af57ab_ml2_refactor_for_dynamic_segments.py +++ b/neutron/db/migration/alembic_migrations/versions/236b90af57ab_ml2_refactor_for_dynamic_segments.py @@ -34,8 +34,3 @@ def upgrade(): op.add_column('ml2_network_segments', sa.Column('is_dynamic', sa.Boolean(), nullable=False, server_default=sa.sql.false())) - - -def downgrade(): - - op.drop_column('ml2_network_segments', 'is_dynamic') 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 84af3bfc93e..f6df6c4eb92 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 @@ -53,7 +53,3 @@ def upgrade(): name='ipv6_address_modes'), nullable=True) ) - - -def downgrade(): - 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 9f6a37aca8c..74a3b62d3f0 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 @@ -45,7 +45,3 @@ def upgrade(): ['ipsec_site_connections.id'], ondelete='CASCADE') ) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/26b54cf9024d_add_index_on_allocated.py b/neutron/db/migration/alembic_migrations/versions/26b54cf9024d_add_index_on_allocated.py index b0842647738..8663759a9f4 100644 --- a/neutron/db/migration/alembic_migrations/versions/26b54cf9024d_add_index_on_allocated.py +++ b/neutron/db/migration/alembic_migrations/versions/26b54cf9024d_add_index_on_allocated.py @@ -39,12 +39,3 @@ def upgrade(): op.f('ix_ml2_vlan_allocations_physical_network_allocated'), 'ml2_vlan_allocations', ['physical_network', 'allocated'], unique=False) - - -def downgrade(): - op.drop_index(op.f('ix_ml2_vxlan_allocations_allocated'), - table_name='ml2_vxlan_allocations') - op.drop_index(op.f('ix_ml2_gre_allocations_allocated'), - table_name='ml2_gre_allocations') - op.drop_index(op.f('ix_ml2_vlan_allocations_physical_network_allocated'), - table_name='ml2_vlan_allocations') 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 806568669eb..1a302ff1179 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 @@ -37,7 +37,3 @@ def upgrade(): sa.Column('vnic_type', sa.String(length=64), nullable=False, server_default='normal')) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/28c0ffb8ebbd_remove_mlnx_plugin.py b/neutron/db/migration/alembic_migrations/versions/28c0ffb8ebbd_remove_mlnx_plugin.py index dedd488343f..dc06fdaa6a9 100644 --- a/neutron/db/migration/alembic_migrations/versions/28c0ffb8ebbd_remove_mlnx_plugin.py +++ b/neutron/db/migration/alembic_migrations/versions/28c0ffb8ebbd_remove_mlnx_plugin.py @@ -26,50 +26,9 @@ revision = '28c0ffb8ebbd' down_revision = '408cfbf6923c' from alembic import op -import sqlalchemy as sa def upgrade(): op.drop_table('mlnx_network_bindings') op.drop_table('segmentation_id_allocation') op.drop_table('port_profile') - - -def downgrade(): - op.create_table( - 'port_profile', - sa.Column( - 'port_id', sa.String(length=36), nullable=False), - sa.Column( - 'vnic_type', sa.String(length=32), nullable=False), - sa.ForeignKeyConstraint(['port_id'], ['ports.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('port_id'), - ) - op.create_table( - 'segmentation_id_allocation', - sa.Column('physical_network', - sa.String(length=64), - nullable=False), - sa.Column('segmentation_id', - sa.Integer(), - autoincrement=False, - nullable=False), - sa.Column('allocated', - sa.Boolean(), - server_default=sa.sql.false(), - nullable=False), - sa.PrimaryKeyConstraint('physical_network', 'segmentation_id') - ) - op.create_table( - 'mlnx_network_bindings', - sa.Column('network_id', sa.String(length=36), nullable=False), - sa.Column('network_type', sa.String(length=32), nullable=False), - sa.Column('physical_network', sa.String(length=64), nullable=True), - sa.Column('segmentation_id', - sa.Integer(), - autoincrement=False, nullable=False), - sa.ForeignKeyConstraint(['network_id'], - ['networks.id']), - sa.PrimaryKeyConstraint('network_id'), - ) 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 ab8dc1cfee9..fec9a6390d5 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 @@ -27,8 +27,6 @@ down_revision = '41662e32bce2' from alembic import op -from neutron.db import migration - TABLE_NAME = 'ports' CONSTRAINT_NAME = 'uniq_ports0network_id0mac_address' @@ -39,12 +37,3 @@ def upgrade(): source=TABLE_NAME, local_cols=['network_id', 'mac_address'] ) - - -def downgrade(): - with migration.remove_fks_from_table(TABLE_NAME): - op.drop_constraint( - CONSTRAINT_NAME, - TABLE_NAME, - type_='unique' - ) diff --git a/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py b/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py index aa6c46ef7cd..31515849956 100644 --- a/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py +++ b/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py @@ -32,7 +32,6 @@ revision = '2b801560a332' down_revision = '2d2a8a565438' from alembic import op -import sqlalchemy as sa from sqlalchemy.sql import expression as sa_expr from neutron.extensions import portbindings @@ -133,23 +132,3 @@ def upgrade(): op.drop_table('hyperv_vlan_allocations') op.drop_table('hyperv_network_bindings') - - -def downgrade(): - op.create_table( - 'hyperv_vlan_allocations', - sa.Column('physical_network', sa.String(length=64), nullable=False), - sa.Column('vlan_id', sa.Integer(), autoincrement=False, - nullable=False), - sa.Column('allocated', sa.Boolean(), nullable=False), - sa.PrimaryKeyConstraint('physical_network', 'vlan_id')) - - op.create_table( - 'hyperv_network_bindings', - sa.Column('network_id', sa.String(length=36), nullable=False), - sa.Column('network_type', sa.String(length=32), nullable=False), - sa.Column('physical_network', sa.String(length=64), nullable=True), - sa.Column('segmentation_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['network_id'], ['networks.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('network_id')) diff --git a/neutron/db/migration/alembic_migrations/versions/2d2a8a565438_hierarchical_binding.py b/neutron/db/migration/alembic_migrations/versions/2d2a8a565438_hierarchical_binding.py index 52b6e48f9b3..cf660075c93 100644 --- a/neutron/db/migration/alembic_migrations/versions/2d2a8a565438_hierarchical_binding.py +++ b/neutron/db/migration/alembic_migrations/versions/2d2a8a565438_hierarchical_binding.py @@ -72,52 +72,3 @@ def upgrade(): op.drop_constraint(fk_name[0], 'ml2_port_bindings', 'foreignkey') op.drop_column('ml2_port_bindings', 'driver') op.drop_column('ml2_port_bindings', 'segment') - - -def downgrade(): - - dialect = op.get_context().bind.dialect.name - - op.add_column('ml2_port_bindings', - sa.Column('segment', sa.String(length=36), nullable=True)) - op.add_column('ml2_port_bindings', - sa.Column('driver', sa.String(length=64), nullable=True)) - op.create_foreign_key( - name=None, - source='ml2_port_bindings', referent='ml2_network_segments', - local_cols=['segment'], remote_cols=['id'], ondelete='SET NULL' - ) - - op.add_column('ml2_dvr_port_bindings', - sa.Column('driver', sa.String(length=64), nullable=True)) - op.add_column('ml2_dvr_port_bindings', - sa.Column('segment', sa.String(length=36), nullable=True)) - op.add_column('ml2_dvr_port_bindings', - sa.Column('cap_port_filter', sa.Boolean, nullable=False)) - op.create_foreign_key( - name=None, - source='ml2_dvr_port_bindings', referent='ml2_network_segments', - local_cols=['segment'], remote_cols=['id'], ondelete='SET NULL' - ) - - for table in port_binding_tables: - if dialect == 'postgresql': - op.execute(( - "UPDATE %s pb " - "SET driver = pbl.driver, segment = pbl.segment_id " - "FROM ml2_port_binding_levels pbl " - "WHERE pb.port_id = pbl.port_id " - "AND pb.host = pbl.host " - "AND pbl.level = 0;" - ) % table) - else: - op.execute(( - "UPDATE %s pb " - "INNER JOIN ml2_port_binding_levels pbl " - "ON pb.port_id = pbl.port_id " - "AND pb.host = pbl.host " - "AND pbl.level = 0 " - "SET pb.driver = pbl.driver, pb.segment = pbl.segment_id;" - ) % table) - - op.drop_table('ml2_port_binding_levels') diff --git a/neutron/db/migration/alembic_migrations/versions/2db5203cb7a9_nuage_floatingip.py b/neutron/db/migration/alembic_migrations/versions/2db5203cb7a9_nuage_floatingip.py index 9a3cd6055d3..cdd18c21776 100644 --- a/neutron/db/migration/alembic_migrations/versions/2db5203cb7a9_nuage_floatingip.py +++ b/neutron/db/migration/alembic_migrations/versions/2db5203cb7a9_nuage_floatingip.py @@ -78,19 +78,3 @@ def upgrade(): 'nuage_port_mapping') migration.rename_table_if_exists('routerroutes_mapping', 'nuage_routerroutes_mapping') - - -@migration.skip_if_offline -def downgrade(): - migration.drop_table_if_exists('nuage_floatingip_mapping') - migration.drop_table_if_exists('nuage_floatingip_pool_mapping') - migration.rename_table_if_exists('nuage_net_partitions', 'net_partitions') - migration.rename_table_if_exists('nuage_net_partition_router_mapping', - 'net_partition_router_mapping') - migration.rename_table_if_exists('nuage_router_zone_mapping', - 'router_zone_mapping') - migration.rename_table_if_exists('nuage_subnet_l2dom_mapping', - 'subnet_l2dom_mapping') - migration.rename_table_if_exists('nuage_port_mapping', 'port_mapping') - migration.rename_table_if_exists('nuage_routerroutes_mapping', - 'routerroutes_mapping') 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 fcce7cb297d..8bd9a15f1a8 100644 --- a/neutron/db/migration/alembic_migrations/versions/2eeaf963a447_floatingip_status.py +++ b/neutron/db/migration/alembic_migrations/versions/2eeaf963a447_floatingip_status.py @@ -46,7 +46,3 @@ def upgrade(): sa.Column('status', sa.String(length=16), nullable=True)) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/31d7f831a591_add_constraint_for_routerid.py b/neutron/db/migration/alembic_migrations/versions/31d7f831a591_add_constraint_for_routerid.py index 232156748e9..c09a7aaf8f6 100644 --- a/neutron/db/migration/alembic_migrations/versions/31d7f831a591_add_constraint_for_routerid.py +++ b/neutron/db/migration/alembic_migrations/versions/31d7f831a591_add_constraint_for_routerid.py @@ -26,7 +26,6 @@ revision = '31d7f831a591' down_revision = '37f322991f59' from alembic import op -import sqlalchemy as sa from neutron.db import migration @@ -75,35 +74,3 @@ def upgrade(): table_name=TABLE_NAME, cols=['router_id', 'l3_agent_id'] ) - - -def downgrade(): - - context = op.get_context() - dialect = context.bind.dialect.name - - op.drop_constraint( - name=PK_NAME, - table_name=TABLE_NAME, - type_='primary' - ) - - op.add_column( - TABLE_NAME, - sa.Column('id', sa.String(32)) - ) - - if dialect == 'ibm_db_sa': - # DB2 doesn't support nullable column in primary key - op.alter_column( - table_name=TABLE_NAME, - column_name='id', - nullable=False - ) - - with migration.remove_fks_from_table(TABLE_NAME): - op.create_primary_key( - name=PK_NAME, - table_name=TABLE_NAME, - cols=['id'] - ) diff --git a/neutron/db/migration/alembic_migrations/versions/327ee5fde2c7_set_innodb_engine.py b/neutron/db/migration/alembic_migrations/versions/327ee5fde2c7_set_innodb_engine.py index 9c43497fae7..62c81c91e7a 100644 --- a/neutron/db/migration/alembic_migrations/versions/327ee5fde2c7_set_innodb_engine.py +++ b/neutron/db/migration/alembic_migrations/versions/327ee5fde2c7_set_innodb_engine.py @@ -38,7 +38,3 @@ def upgrade(): if op.get_bind().dialect.name == 'mysql': for table in TABLES: op.execute("ALTER TABLE %s ENGINE=InnoDB" % table) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/32f3915891fd_cisco_apic_driver_update.py b/neutron/db/migration/alembic_migrations/versions/32f3915891fd_cisco_apic_driver_update.py index f96f3c8defc..03b52cf99f3 100644 --- a/neutron/db/migration/alembic_migrations/versions/32f3915891fd_cisco_apic_driver_update.py +++ b/neutron/db/migration/alembic_migrations/versions/32f3915891fd_cisco_apic_driver_update.py @@ -48,19 +48,3 @@ def upgrade(): sa.Column('neutron_type', sa.String(length=32), nullable=False), sa.Column('apic_name', sa.String(length=255), nullable=False), sa.PrimaryKeyConstraint('neutron_id', 'neutron_type')) - - -def downgrade(): - - op.drop_table('cisco_ml2_apic_names') - op.drop_table('cisco_ml2_apic_host_links') - - op.create_table( - 'cisco_ml2_apic_port_profiles', - sa.Column('node_id', sa.String(length=255), nullable=False), - sa.Column('profile_id', sa.String(length=64), nullable=False), - sa.Column('hpselc_id', sa.String(length=64), nullable=False), - sa.Column('module', sa.String(length=10), nullable=False), - sa.Column('from_port', sa.Integer(), nullable=False), - sa.Column('to_port', sa.Integer(), nullable=False), - sa.PrimaryKeyConstraint('node_id')) diff --git a/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py b/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py index 043f79963f6..b2a79f75606 100644 --- a/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py +++ b/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py @@ -38,7 +38,3 @@ def upgrade(): existing_nullable=True) else: metering_init_ops.create_meteringlabels() - - -def downgrade(): - pass 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 1639cd9db22..42acf52f9ff 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 @@ -44,7 +44,3 @@ def upgrade(): sa.ForeignKeyConstraint(['port_id'], [u'ports.id'], name=u'embrane_pool_port_ibfk_2'), sa.PrimaryKeyConstraint(u'pool_id')) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/341ee8a4ccb5_sync_with_cisco_repo.py b/neutron/db/migration/alembic_migrations/versions/341ee8a4ccb5_sync_with_cisco_repo.py index 4b254ef2faf..0b08c5f1928 100644 --- a/neutron/db/migration/alembic_migrations/versions/341ee8a4ccb5_sync_with_cisco_repo.py +++ b/neutron/db/migration/alembic_migrations/versions/341ee8a4ccb5_sync_with_cisco_repo.py @@ -65,12 +65,3 @@ def upgrade(): op.add_column('cisco_ml2_nexusport_bindings', sa.Column( 'is_provider_vlan', sa.Boolean(), nullable=False, server_default=sa.sql.false())) - - -def downgrade(): - op.drop_table('ml2_nexus_vxlan_mcast_groups') - op.drop_table('ml2_nexus_vxlan_allocations') - op.drop_table('cisco_ml2_nexus_nve') - - op.drop_column('cisco_ml2_nexusport_bindings', 'vni') - op.drop_column('cisco_ml2_nexusport_bindings', 'is_provider_vlan') diff --git a/neutron/db/migration/alembic_migrations/versions/35a0f3365720_add_port_security_in_ml2.py b/neutron/db/migration/alembic_migrations/versions/35a0f3365720_add_port_security_in_ml2.py index 30b27147639..1b6bc60ac57 100644 --- a/neutron/db/migration/alembic_migrations/versions/35a0f3365720_add_port_security_in_ml2.py +++ b/neutron/db/migration/alembic_migrations/versions/35a0f3365720_add_port_security_in_ml2.py @@ -38,7 +38,3 @@ def upgrade(): 'port_security_enabled) SELECT id, True FROM ports ' 'WHERE id NOT IN (SELECT port_id FROM ' 'portsecuritybindings);') - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/37f322991f59_nuage_removing_mapping_tables.py b/neutron/db/migration/alembic_migrations/versions/37f322991f59_nuage_removing_mapping_tables.py index cec1e51847c..6a8ac26cd52 100644 --- a/neutron/db/migration/alembic_migrations/versions/37f322991f59_nuage_removing_mapping_tables.py +++ b/neutron/db/migration/alembic_migrations/versions/37f322991f59_nuage_removing_mapping_tables.py @@ -26,7 +26,6 @@ revision = '37f322991f59' down_revision = '2026156eab2f' from alembic import op -import sqlalchemy as sa def upgrade(): @@ -35,53 +34,3 @@ def upgrade(): op.drop_table('nuage_routerroutes_mapping') op.drop_table('nuage_port_mapping') op.drop_table('nuage_router_zone_mapping') - - -def downgrade(): - op.create_table( - 'nuage_router_zone_mapping', - sa.Column('router_id', sa.String(length=36), nullable=False), - sa.Column('nuage_zone_id', sa.String(length=36), nullable=True), - sa.Column('nuage_user_id', sa.String(length=36), nullable=True), - sa.Column('nuage_group_id', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['router_id'], ['routers.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('router_id'), - ) - op.create_table( - 'nuage_port_mapping', - sa.Column('port_id', sa.String(length=36), nullable=False), - sa.Column('nuage_vport_id', sa.String(length=36), nullable=True), - sa.Column('nuage_vif_id', sa.String(length=36), nullable=True), - sa.Column('static_ip', sa.Boolean(), nullable=True), - sa.ForeignKeyConstraint(['port_id'], ['ports.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('port_id'), - ) - op.create_table( - 'nuage_routerroutes_mapping', - sa.Column('router_id', sa.String(length=36), nullable=False), - sa.Column('nuage_route_id', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['router_id'], ['routers.id'], - ondelete='CASCADE'), - ) - op.create_table( - 'nuage_floatingip_pool_mapping', - sa.Column('fip_pool_id', sa.String(length=36), nullable=False), - sa.Column('net_id', sa.String(length=36), nullable=True), - sa.Column('router_id', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['net_id'], ['networks.id'], - ondelete='CASCADE'), - sa.ForeignKeyConstraint(['router_id'], ['routers.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('fip_pool_id'), - ) - op.create_table( - 'nuage_floatingip_mapping', - sa.Column('fip_id', sa.String(length=36), nullable=False), - sa.Column('router_id', sa.String(length=36), nullable=True), - sa.Column('nuage_fip_id', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['fip_id'], ['floatingips.id'], - ondelete='CASCADE'), - sa.PrimaryKeyConstraint('fip_id'), - ) 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 485b8726e86..65f6f302a08 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 @@ -49,20 +49,3 @@ def upgrade(): source='ml2_vxlan_endpoints', local_cols=['host'] ) - - -def downgrade(): - - op.drop_constraint( - name=CONSTRAINT_NAME_VXLAN, - table_name='ml2_vxlan_endpoints', - type_='unique' - ) - op.drop_column('ml2_vxlan_endpoints', 'host') - - op.drop_constraint( - name=CONSTRAINT_NAME_GRE, - table_name='ml2_gre_endpoints', - type_='unique' - ) - op.drop_column('ml2_gre_endpoints', 'host') diff --git a/neutron/db/migration/alembic_migrations/versions/3927f7f7c456_l3_extension_distributed_mode.py b/neutron/db/migration/alembic_migrations/versions/3927f7f7c456_l3_extension_distributed_mode.py index c4c8cf9db55..ce20142335d 100644 --- a/neutron/db/migration/alembic_migrations/versions/3927f7f7c456_l3_extension_distributed_mode.py +++ b/neutron/db/migration/alembic_migrations/versions/3927f7f7c456_l3_extension_distributed_mode.py @@ -48,7 +48,3 @@ def upgrade(): op.execute("INSERT INTO router_extra_attributes " "SELECT id as router_id, " "False as distributed from routers") - - -def downgrade(): - op.drop_table('router_extra_attributes') diff --git a/neutron/db/migration/alembic_migrations/versions/3b85b693a95f_remove_service_tables.py b/neutron/db/migration/alembic_migrations/versions/3b85b693a95f_remove_service_tables.py index e87bcf50420..df97e4cf9d2 100644 --- a/neutron/db/migration/alembic_migrations/versions/3b85b693a95f_remove_service_tables.py +++ b/neutron/db/migration/alembic_migrations/versions/3b85b693a95f_remove_service_tables.py @@ -38,11 +38,3 @@ def upgrade(): for table in ('servicedefinitions', 'servicetypes'): if migration.schema_has_table(table): op.drop_table(table) - - -def downgrade(): - """Don't create the tables - - These tables would be created during downgrade at correct place in - migration timeline at revision 557edfc53098. - """ diff --git a/neutron/db/migration/alembic_migrations/versions/3c346828361e_metering_label_shared.py b/neutron/db/migration/alembic_migrations/versions/3c346828361e_metering_label_shared.py index 6ee6f5a063e..3ab62435726 100644 --- a/neutron/db/migration/alembic_migrations/versions/3c346828361e_metering_label_shared.py +++ b/neutron/db/migration/alembic_migrations/versions/3c346828361e_metering_label_shared.py @@ -29,11 +29,7 @@ from alembic import op import sqlalchemy as sa -def upgrade(active_plugins=None, options=None): +def upgrade(): op.add_column('meteringlabels', sa.Column('shared', sa.Boolean(), server_default=sa.sql.false(), nullable=True)) - - -def downgrade(active_plugins=None, options=None): - op.drop_column('meteringlabels', 'shared') 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 27f73f96067..acba275f80a 100644 --- a/neutron/db/migration/alembic_migrations/versions/3d2585038b95_vmware_nsx.py +++ b/neutron/db/migration/alembic_migrations/versions/3d2585038b95_vmware_nsx.py @@ -44,7 +44,3 @@ def upgrade(): if engine.name == 'postgresql': op.execute("ALTER TYPE nvp_network_bindings_binding_type " "RENAME TO tz_network_bindings_binding_type;") - - -def downgrade(): - 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 2d600bca87f..09308772613 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 @@ -38,7 +38,3 @@ def upgrade(): # There might be multiple switches for a neutron network sa.PrimaryKeyConstraint('neutron_id', 'nsx_id'), ) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/408cfbf6923c_remove_ryu_plugin.py b/neutron/db/migration/alembic_migrations/versions/408cfbf6923c_remove_ryu_plugin.py index 3ba3b5c236a..2bd01c1b607 100644 --- a/neutron/db/migration/alembic_migrations/versions/408cfbf6923c_remove_ryu_plugin.py +++ b/neutron/db/migration/alembic_migrations/versions/408cfbf6923c_remove_ryu_plugin.py @@ -26,23 +26,8 @@ revision = '408cfbf6923c' down_revision = '1f71e54a85e7' from alembic import op -import sqlalchemy as sa def upgrade(): op.drop_table('tunnelkeylasts') op.drop_table('tunnelkeys') - - -def downgrade(): - op.create_table( - 'tunnelkeylasts', - sa.Column('last_key', sa.Integer(), nullable=False), - sa.PrimaryKeyConstraint('last_key')) - op.create_table( - 'tunnelkeys', - sa.Column('network_id', sa.String(length=36), nullable=False), - sa.Column('tunnel_key', sa.Integer(), autoincrement=False, - nullable=False), - sa.ForeignKeyConstraint(['network_id'], ['networks.id'], ), - sa.PrimaryKeyConstraint('tunnel_key')) diff --git a/neutron/db/migration/alembic_migrations/versions/4119216b7365_add_tenant_id_idx.py b/neutron/db/migration/alembic_migrations/versions/4119216b7365_add_tenant_id_idx.py index 72f5f501e9b..faa50959d7e 100644 --- a/neutron/db/migration/alembic_migrations/versions/4119216b7365_add_tenant_id_idx.py +++ b/neutron/db/migration/alembic_migrations/versions/4119216b7365_add_tenant_id_idx.py @@ -40,9 +40,3 @@ def upgrade(): for table in TABLES: op.create_index(op.f('ix_%s_tenant_id' % table), table, ['tenant_id'], unique=False) - - -def downgrade(): - for table in TABLES: - op.drop_index(op.f('ix_%s_tenant_id' % table), - table_name=table) 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 824089c1eea..75fe067bd89 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 @@ -47,18 +47,3 @@ def upgrade(): op.create_primary_key(name=None, table_name=TABLE_NAME, cols=['router_id', 'l3_agent_id']) - - -def downgrade(): - inspector = reflection.Inspector.from_engine(op.get_bind()) - prev_pk_const = inspector.get_pk_constraint(TABLE_NAME) - prev_pk_name = prev_pk_const.get('name') - - with migration.remove_fks_from_table(TABLE_NAME): - op.drop_constraint(name=prev_pk_name, - table_name=TABLE_NAME, - type_='primary') - - op.create_primary_key(name=None, - table_name=TABLE_NAME, - cols=['router_id']) diff --git a/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py b/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py index 550f939271f..02e8d9351c8 100644 --- a/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py +++ b/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py @@ -32,7 +32,3 @@ import sqlalchemy as sa def upgrade(): op.add_column('networks', sa.Column('mtu', sa.Integer(), nullable=True)) - - -def downgrade(): - op.drop_column('networks', 'mtu') 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 66b57c12ea2..1a00de50031 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 @@ -45,17 +45,3 @@ def upgrade(): source=TABLE_NAME, local_cols=['last_ip', 'allocation_pool_id'] ) - - -def downgrade(): - op.drop_constraint( - name=UC_1_NAME, - table_name=TABLE_NAME, - type_='unique' - ) - - op.drop_constraint( - name=UC_2_NAME, - table_name=TABLE_NAME, - type_='unique' - ) 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 41186d4475b..055b69d1704 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 @@ -49,7 +49,3 @@ def upgrade(): sa.Column('tenant_id', sa.String(length=255), nullable=True), sa.PrimaryKeyConstraint('id'), sa.ForeignKeyConstraint(['network_id'], ['ml2_brocadenetworks.id'])) - - -def downgrade(): - 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 ece4a55c71d..1faf1c7ca03 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 @@ -49,7 +49,3 @@ def upgrade(): # each record in routers op.execute("INSERT INTO neutron_nsx_router_mappings SELECT id,id " "from routers") - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py b/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py index c12ad4800ba..8bb7ceed38d 100644 --- a/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py +++ b/neutron/db/migration/alembic_migrations/versions/4dbe243cd84d_nsxv.py @@ -146,25 +146,3 @@ def upgrade(): sa.ForeignKeyConstraint(['router_id'], ['routers.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('router_id')) - - -def downgrade(): - op.drop_table('nsxv_router_ext_attributes') - op.drop_table('nsxv_rule_mappings') - op.drop_table('nsxv_port_index_mappings') - op.drop_table('nsxv_port_vnic_mappings') - op.drop_table('nsxv_tz_network_bindings') - op.drop_table('nsxv_security_group_section_mappings') - op.drop_table('nsxv_spoofguard_policy_network_mappings') - op.drop_table('nsxv_edge_vnic_bindings') - op.drop_table('nsxv_edge_dhcp_static_bindings') - op.drop_table('nsxv_firewall_rule_bindings') - op.drop_table('nsxv_internal_edges') - op.drop_table('nsxv_internal_networks') - op.drop_table('nsxv_router_bindings') - appliance_sizes_enum.drop(op.get_bind(), checkfirst=False) - edge_types_enum.drop(op.get_bind(), checkfirst=False) - internal_network_purpose_enum.drop(op.get_bind(), checkfirst=False) - internal_edge_purpose_enum.drop(op.get_bind(), checkfirst=False) - tz_binding_type_enum.drop(op.get_bind(), checkfirst=False) - router_types_enum.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/versions/4eba2f05c2f4_correct_vxlan_endpoint_primary_key.py b/neutron/db/migration/alembic_migrations/versions/4eba2f05c2f4_correct_vxlan_endpoint_primary_key.py index e885921b17a..7fe8495c709 100644 --- a/neutron/db/migration/alembic_migrations/versions/4eba2f05c2f4_correct_vxlan_endpoint_primary_key.py +++ b/neutron/db/migration/alembic_migrations/versions/4eba2f05c2f4_correct_vxlan_endpoint_primary_key.py @@ -36,8 +36,3 @@ PK_NAME = 'ml2_vxlan_endpoints_pkey' def upgrade(): op.drop_constraint(PK_NAME, TABLE_NAME, type_='primary') op.create_primary_key(PK_NAME, TABLE_NAME, cols=['ip_address']) - - -def downgrade(): - op.drop_constraint(PK_NAME, TABLE_NAME, type_='primary') - op.create_primary_key(PK_NAME, TABLE_NAME, cols=['ip_address', 'udp_port']) diff --git a/neutron/db/migration/alembic_migrations/versions/4eca4a84f08a_remove_ml2_cisco_cred_db.py b/neutron/db/migration/alembic_migrations/versions/4eca4a84f08a_remove_ml2_cisco_cred_db.py index 955a0f7dc6a..4b155125638 100644 --- a/neutron/db/migration/alembic_migrations/versions/4eca4a84f08a_remove_ml2_cisco_cred_db.py +++ b/neutron/db/migration/alembic_migrations/versions/4eca4a84f08a_remove_ml2_cisco_cred_db.py @@ -29,8 +29,6 @@ down_revision = '33c3db036fe4' from alembic import op from neutron.db import migration -from neutron.db.migration.alembic_migrations import ml2_init_ops - TABLE = 'cisco_ml2_credentials' @@ -38,8 +36,3 @@ TABLE = 'cisco_ml2_credentials' def upgrade(): if migration.schema_has_table(TABLE): op.drop_table(TABLE) - - -def downgrade(): - if not migration.schema_has_table(TABLE): - ml2_init_ops.create_cisco_ml2_credentials() 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 a1a79841cb1..530d97294e4 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 @@ -62,7 +62,3 @@ def upgrade(): op.drop_column('ml2_port_bindings', 'cap_port_filter') if op.get_bind().engine.name == 'ibm_db_sa': op.execute("CALL SYSPROC.ADMIN_CMD('REORG TABLE ml2_port_bindings')") - - -def downgrade(): - 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 4b9b09c9256..d4d25666c0f 100644 --- a/neutron/db/migration/alembic_migrations/versions/50e86cb2637a_nsx_mappings.py +++ b/neutron/db/migration/alembic_migrations/versions/50e86cb2637a_nsx_mappings.py @@ -49,7 +49,3 @@ def upgrade(): "neutron_id, nvp_id as nsx_port_id, null as nsx_switch_id from" " quantum_nvp_port_mapping") op.drop_table('quantum_nvp_port_mapping') - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/51c54792158e_subnetpools.py b/neutron/db/migration/alembic_migrations/versions/51c54792158e_subnetpools.py index 1c96574ab38..6a23ae7e6b7 100644 --- a/neutron/db/migration/alembic_migrations/versions/51c54792158e_subnetpools.py +++ b/neutron/db/migration/alembic_migrations/versions/51c54792158e_subnetpools.py @@ -55,8 +55,3 @@ def upgrade(): ['subnetpools.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('cidr', 'subnetpool_id')) - - -def downgrade(): - op.drop_table('subnetpoolprefixes') - op.drop_table('subnetpools') 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 816b1c81767..e678d00da08 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 @@ -46,7 +46,3 @@ def upgrade(): new_column_name='neutron_id', existing_type=sa.String(length=36), existing_nullable=False) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/544673ac99ab_add_router_port_table.py b/neutron/db/migration/alembic_migrations/versions/544673ac99ab_add_router_port_table.py index cf3190bec22..d3855a65201 100644 --- a/neutron/db/migration/alembic_migrations/versions/544673ac99ab_add_router_port_table.py +++ b/neutron/db/migration/alembic_migrations/versions/544673ac99ab_add_router_port_table.py @@ -59,7 +59,3 @@ def upgrade(): ) op.execute(SQL_STATEMENT) - - -def downgrade(): - op.drop_table('routerports') diff --git a/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py b/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py index 22afd3fff44..10e059a9040 100644 --- a/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py +++ b/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py @@ -48,37 +48,32 @@ from neutron.plugins.cisco.common import cisco_constants # ml2_vxlan_allocations.allocated # This migration will be skipped when executed offline mode. +default = sqlalchemy.sql.false() + def upgrade(): - run(True) - - -def downgrade(): run() @migration.skip_if_offline -def run(default=None): - set_default_ml2(default) - set_default_mlnx(default) - set_default_brocade(default) - set_default_cisco(default) - set_default_vmware(default) - set_default_agents(default) +def run(): + set_default_ml2() + set_default_mlnx() + set_default_brocade() + set_default_cisco() + set_default_vmware() + set_default_agents() -def set_default_brocade(default): - if default: - default = '' +def set_default_brocade(): + default = '' migration.alter_column_if_exists( 'brocadeports', 'port_id', server_default=default, existing_type=sa.String(36)) -def set_default_mlnx(default): - if default: - default = sqlalchemy.sql.false() +def set_default_mlnx(): migration.alter_column_if_exists( 'segmentation_id_allocation', 'allocated', server_default=default, @@ -86,12 +81,9 @@ def set_default_mlnx(default): existing_type=sa.Boolean) -def set_default_cisco(default): - profile_binding_default = (cisco_constants.TENANT_ID_NOT_SET - if default else None) - profile_default = '0' if default else None - if default: - default = sqlalchemy.sql.false() +def set_default_cisco(): + profile_binding_default = cisco_constants.TENANT_ID_NOT_SET + profile_default = '0' migration.alter_column_if_exists( 'cisco_n1kv_profile_bindings', 'tenant_id', existing_type=sa.String(length=36), @@ -108,9 +100,7 @@ def set_default_cisco(default): existing_nullable=False) -def set_default_vmware(default=None): - if default: - default = sqlalchemy.sql.false() +def set_default_vmware(): migration.alter_column_if_exists( 'nsxrouterextattributess', 'service_router', server_default=default, @@ -127,9 +117,8 @@ def set_default_vmware(default=None): existing_type=sa.Boolean) -def set_default_agents(default=None): - if default: - default = sqlalchemy.sql.true() +def set_default_agents(): + default = sqlalchemy.sql.true() migration.alter_column_if_exists( 'agents', 'admin_state_up', server_default=default, @@ -137,9 +126,7 @@ def set_default_agents(default=None): existing_type=sa.Boolean) -def set_default_ml2(default=None): - if default: - default = sqlalchemy.sql.false() +def set_default_ml2(): migration.alter_column_if_exists( 'ml2_gre_allocations', 'allocated', server_default=default, diff --git a/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py b/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py index 73c6d01690a..3b45e44a5f0 100644 --- a/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py +++ b/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py @@ -41,11 +41,3 @@ def upgrade(): 'ipsec_site_connections', 'peer_address', existing_type=sa.String(255), nullable=False) - - -@migration.skip_if_offline -def downgrade(): - migration.alter_column_if_exists( - 'ipsec_site_connections', 'peer_address', - nullable=True, - existing_type=sa.String(255)) diff --git a/neutron/db/migration/alembic_migrations/versions/5589aa32bf80_l3_dvr_scheduler.py b/neutron/db/migration/alembic_migrations/versions/5589aa32bf80_l3_dvr_scheduler.py index 2386cdd41eb..5c162b8134e 100644 --- a/neutron/db/migration/alembic_migrations/versions/5589aa32bf80_l3_dvr_scheduler.py +++ b/neutron/db/migration/alembic_migrations/versions/5589aa32bf80_l3_dvr_scheduler.py @@ -44,7 +44,3 @@ def upgrade(): ondelete='CASCADE'), sa.PrimaryKeyConstraint('router_id') ) - - -def downgrade(): - op.drop_table('csnat_l3_agent_bindings') diff --git a/neutron/db/migration/alembic_migrations/versions/57086602ca0a_scrap_nsx_adv_svcs_models.py b/neutron/db/migration/alembic_migrations/versions/57086602ca0a_scrap_nsx_adv_svcs_models.py index a45562691a2..a4011f8f46a 100644 --- a/neutron/db/migration/alembic_migrations/versions/57086602ca0a_scrap_nsx_adv_svcs_models.py +++ b/neutron/db/migration/alembic_migrations/versions/57086602ca0a_scrap_nsx_adv_svcs_models.py @@ -26,7 +26,6 @@ revision = '57086602ca0a' down_revision = '28c0ffb8ebbd' from alembic import op -import sqlalchemy as sa def upgrade(): @@ -36,54 +35,3 @@ def upgrade(): op.drop_table('vcns_edge_vip_bindings') op.drop_table(u'routerservicetypebindings') op.drop_table(u'servicerouterbindings') - - -def downgrade(): - op.create_table( - 'servicerouterbindings', - sa.Column('resource_id', sa.String(length=36), nullable=False), - sa.Column('resource_type', sa.String(length=36), nullable=False), - sa.Column('router_id', sa.String(length=36), nullable=False), - sa.ForeignKeyConstraint(['router_id'], [u'routers.id'], - name='servicerouterbindings_ibfk_1'), - sa.PrimaryKeyConstraint('resource_id', 'resource_type')) - op.create_table( - 'routerservicetypebindings', - sa.Column('router_id', sa.String(length=36), nullable=False), - sa.Column('service_type_id', sa.String(length=36), nullable=False), - sa.ForeignKeyConstraint(['router_id'], ['routers.id'], - name='routerservicetypebindings_ibfk_1'), - sa.PrimaryKeyConstraint(u'router_id')) - op.create_table( - 'vcns_edge_vip_bindings', - sa.Column('vip_id', sa.String(length=36), nullable=False), - sa.Column('edge_id', sa.String(length=36), nullable=True), - sa.Column('vip_vseid', sa.String(length=36), nullable=True), - sa.Column('app_profileid', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['vip_id'], ['vips.id'], - name='vcns_edge_vip_bindings_ibfk_1'), - sa.PrimaryKeyConstraint('vip_id')) - op.create_table( - 'vcns_edge_monitor_bindings', - sa.Column('monitor_id', sa.String(length=36), nullable=False), - sa.Column('edge_id', sa.String(length=36), nullable=False), - sa.Column('monitor_vseid', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['monitor_id'], ['healthmonitors.id'], - name='vcns_edge_monitor_bindings_ibfk_1'), - sa.PrimaryKeyConstraint('monitor_id', 'edge_id')) - op.create_table( - 'vcns_firewall_rule_bindings', - sa.Column('rule_id', sa.String(length=36), nullable=False), - sa.Column('edge_id', sa.String(length=36), nullable=False), - sa.Column('rule_vseid', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['rule_id'], ['firewall_rules.id'], - name='vcns_firewall_rule_bindings_ibfk_1'), - sa.PrimaryKeyConstraint('rule_id', u'edge_id')) - op.create_table( - 'vcns_edge_pool_bindings', - sa.Column('pool_id', sa.String(length=36), nullable=False), - sa.Column('edge_id', sa.String(length=36), nullable=False), - sa.Column('pool_vseid', sa.String(length=36), nullable=True), - sa.ForeignKeyConstraint(['pool_id'], ['pools.id'], - name='vcns_edge_pool_bindings_ibfk_1'), - sa.PrimaryKeyConstraint('pool_id', 'edge_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 b6df86ca565..e03769e2922 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 @@ -51,17 +51,3 @@ def upgrade(): name=CONSTRAINT_NAME_NS, source='nuage_subnet_l2dom_mapping', local_cols=['nuage_subnet_id']) - - -def downgrade(): - op.drop_column('nuage_net_partition_router_mapping', 'nuage_rtr_rt') - op.drop_column('nuage_net_partition_router_mapping', 'nuage_rtr_rd') - op.drop_column('nuage_net_partitions', 'isolated_zone') - op.drop_column('nuage_net_partitions', 'shared_zone') - op.drop_column('nuage_subnet_l2dom_mapping', 'nuage_managed_subnet') - op.drop_constraint(CONSTRAINT_NAME_NS, - 'nuage_subnet_l2dom_mapping', - type_='unique') - op.drop_constraint(CONSTRAINT_NAME_NR, - 'nuage_net_partition_router_mapping', - type_='unique') diff --git a/neutron/db/migration/alembic_migrations/versions/58fe87a01143_cisco_csr_routing.py b/neutron/db/migration/alembic_migrations/versions/58fe87a01143_cisco_csr_routing.py index a586d58aab9..53fe89b8b50 100644 --- a/neutron/db/migration/alembic_migrations/versions/58fe87a01143_cisco_csr_routing.py +++ b/neutron/db/migration/alembic_migrations/versions/58fe87a01143_cisco_csr_routing.py @@ -71,9 +71,3 @@ def upgrade(): ondelete='CASCADE'), sa.PrimaryKeyConstraint('router_id') ) - - -def downgrade(): - op.drop_table('cisco_router_mappings') - op.drop_table('cisco_port_mappings') - op.drop_table('cisco_hosting_devices') 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 b606faa1a8a..395e7a1dc70 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 @@ -64,7 +64,3 @@ def upgrade(): local_cols=['network_profile_id'], remote_cols=['id'], ondelete='CASCADE' ) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/6be312499f9_set_not_null_vlan_id_cisco.py b/neutron/db/migration/alembic_migrations/versions/6be312499f9_set_not_null_vlan_id_cisco.py index b4b30c7535f..7f718cb6462 100644 --- a/neutron/db/migration/alembic_migrations/versions/6be312499f9_set_not_null_vlan_id_cisco.py +++ b/neutron/db/migration/alembic_migrations/versions/6be312499f9_set_not_null_vlan_id_cisco.py @@ -40,11 +40,3 @@ def upgrade(): 'cisco_nexusport_bindings', 'vlan_id', nullable=False, existing_type=sa.Integer) - - -@migration.skip_if_offline -def downgrade(): - migration.alter_column_if_exists( - 'cisco_nexusport_bindings', 'vlan_id', - nullable=True, - existing_type=sa.Integer) 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 a2d3d0f4812..99c7ef52d9e 100644 --- a/neutron/db/migration/alembic_migrations/versions/81c553f3776c_bsn_consistencyhashes.py +++ b/neutron/db/migration/alembic_migrations/versions/81c553f3776c_bsn_consistencyhashes.py @@ -35,7 +35,3 @@ def upgrade(): sa.Column('hash_id', sa.String(255), primary_key=True), sa.Column('hash', sa.String(255), nullable=False) ) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/86d6d9776e2b_cisco_apic_driver_update_l3.py b/neutron/db/migration/alembic_migrations/versions/86d6d9776e2b_cisco_apic_driver_update_l3.py index b5a196382c6..73c06f2bb63 100644 --- a/neutron/db/migration/alembic_migrations/versions/86d6d9776e2b_cisco_apic_driver_update_l3.py +++ b/neutron/db/migration/alembic_migrations/versions/86d6d9776e2b_cisco_apic_driver_update_l3.py @@ -41,24 +41,3 @@ def upgrade(): sa.Column('router_id', sa.String(length=64), nullable=False), sa.ForeignKeyConstraint(['router_id'], ['routers.id']), sa.PrimaryKeyConstraint('router_id')) - - -def downgrade(): - - op.drop_table('cisco_ml2_apic_contracts') - - op.create_table( - 'cisco_ml2_apic_epgs', - sa.Column('network_id', sa.String(length=255), nullable=False), - sa.Column('epg_id', sa.String(length=64), nullable=False), - sa.Column('segmentation_id', sa.String(length=64), nullable=False), - sa.Column('provider', sa.Boolean(), server_default=sa.sql.false(), - nullable=False), - sa.PrimaryKeyConstraint('network_id')) - - op.create_table( - 'cisco_ml2_apic_contracts', - sa.Column('tenant_id', sa.String(length=255)), - sa.Column('contract_id', sa.String(length=64), nullable=False), - sa.Column('filter_id', sa.String(length=64), nullable=False), - sa.PrimaryKeyConstraint('tenant_id')) diff --git a/neutron/db/migration/alembic_migrations/versions/884573acbf1c_unify_nsx_router_extra_attributes.py b/neutron/db/migration/alembic_migrations/versions/884573acbf1c_unify_nsx_router_extra_attributes.py index 5b5846299e4..c0e4f2c916e 100644 --- a/neutron/db/migration/alembic_migrations/versions/884573acbf1c_unify_nsx_router_extra_attributes.py +++ b/neutron/db/migration/alembic_migrations/versions/884573acbf1c_unify_nsx_router_extra_attributes.py @@ -61,20 +61,3 @@ def upgrade(): server_default=sa.sql.false())) _migrate_data('router_extra_attributes', 'nsxrouterextattributess') op.drop_table('nsxrouterextattributess') - - -def downgrade(): - op.create_table( - 'nsxrouterextattributess', - sa.Column('router_id', sa.String(length=36), nullable=False), - sa.Column('distributed', sa.Boolean(), nullable=False, - server_default=sa.sql.false()), - sa.Column('service_router', sa.Boolean(), nullable=False, - server_default=sa.sql.false()), - sa.ForeignKeyConstraint( - ['router_id'], ['routers.id'], ondelete='CASCADE'), - sa.PrimaryKeyConstraint('router_id') - ) - op.execute(("INSERT INTO nsxrouterextattributess " - "SELECT * from router_extra_attributes")) - op.drop_column('router_extra_attributes', 'service_router') diff --git a/neutron/db/migration/alembic_migrations/versions/aae5706a396_nuage_provider_networks.py b/neutron/db/migration/alembic_migrations/versions/aae5706a396_nuage_provider_networks.py index bf667307691..ea781291fd4 100644 --- a/neutron/db/migration/alembic_migrations/versions/aae5706a396_nuage_provider_networks.py +++ b/neutron/db/migration/alembic_migrations/versions/aae5706a396_nuage_provider_networks.py @@ -39,7 +39,3 @@ def upgrade(): ['network_id'], ['networks.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('network_id') ) - - -def downgrade(): - op.drop_table('nuage_provider_net_bindings') 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 5a894eea94f..816dc973f58 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 @@ -42,7 +42,3 @@ def upgrade(): type_=sa.BigInteger(), existing_type=sa.Integer()) op.alter_column('poolstatisticss', 'total_connections', type_=sa.BigInteger(), existing_type=sa.Integer()) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py b/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py index 508ac09a12d..0ec354aef9a 100644 --- a/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py +++ b/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py @@ -40,7 +40,3 @@ def upgrade(): 'firewall_rules', 'protocol', type_=sa.String(40), existing_nullable=True) - - -def downgrade(): - pass diff --git a/neutron/db/migration/alembic_migrations/versions/bebba223288_add_vlan_transparent_property_to_network.py b/neutron/db/migration/alembic_migrations/versions/bebba223288_add_vlan_transparent_property_to_network.py index b4173aa5c5a..fd475f6a3d6 100644 --- a/neutron/db/migration/alembic_migrations/versions/bebba223288_add_vlan_transparent_property_to_network.py +++ b/neutron/db/migration/alembic_migrations/versions/bebba223288_add_vlan_transparent_property_to_network.py @@ -32,7 +32,3 @@ import sqlalchemy as sa def upgrade(): op.add_column('networks', sa.Column('vlan_transparent', sa.Boolean(), nullable=True)) - - -def downgrade(): - op.drop_column('networks', 'vlan_transparent') diff --git a/neutron/db/migration/alembic_migrations/versions/d06e871c0d5_set_admin_state_up_not_null_ml2.py b/neutron/db/migration/alembic_migrations/versions/d06e871c0d5_set_admin_state_up_not_null_ml2.py index a1b5e20712a..a717a78f3b8 100644 --- a/neutron/db/migration/alembic_migrations/versions/d06e871c0d5_set_admin_state_up_not_null_ml2.py +++ b/neutron/db/migration/alembic_migrations/versions/d06e871c0d5_set_admin_state_up_not_null_ml2.py @@ -41,11 +41,3 @@ def upgrade(): 'ml2_brocadeports', 'admin_state_up', nullable=False, existing_type=sa.Boolean) - - -@migration.skip_if_offline -def downgrade(): - migration.alter_column_if_exists( - 'ml2_brocadeports', 'admin_state_up', - nullable=True, - existing_type=sa.Boolean) 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 5e5218cade2..7d2b3571c61 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 @@ -41,7 +41,3 @@ def upgrade(): source=TABLE_NAME, local_cols=['pool_id', 'address', 'protocol_port'] ) - - -def downgrade(): - pass 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 a8ae7316dc2..4fb6b3c59c3 100644 --- a/neutron/db/migration/alembic_migrations/versions/e766b19a3bb_nuage_initial.py +++ b/neutron/db/migration/alembic_migrations/versions/e766b19a3bb_nuage_initial.py @@ -92,7 +92,3 @@ def upgrade(): ondelete='CASCADE'), sa.PrimaryKeyConstraint('router_id'), ) - - -def downgrade(): - pass 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 b351546bca3..51958697a57 100644 --- a/neutron/db/migration/alembic_migrations/versions/f15b1fb526dd_cascade_floatingip.py +++ b/neutron/db/migration/alembic_migrations/versions/f15b1fb526dd_cascade_floatingip.py @@ -44,12 +44,3 @@ def upgrade(): source='floatingips', referent='ports', local_cols=['floating_port_id'], remote_cols=['id'], ondelete='CASCADE' ) - - -def downgrade(): - _drop_constraint() - op.create_foreign_key( - name=None, - source='floatingips', referent='ports', - local_cols=['floating_port_id'], remote_cols=['id'] - ) diff --git a/neutron/db/migration/alembic_migrations/versions/havana_initial.py b/neutron/db/migration/alembic_migrations/versions/havana_initial.py index 995856a6713..c1b91261a10 100644 --- a/neutron/db/migration/alembic_migrations/versions/havana_initial.py +++ b/neutron/db/migration/alembic_migrations/versions/havana_initial.py @@ -68,26 +68,3 @@ def upgrade(): other_plugins_init_ops.upgrade() ryu_init_ops.upgrade() vmware_init_ops.upgrade() - - -def downgrade(): - vmware_init_ops.downgrade() - ryu_init_ops.downgrade() - other_plugins_init_ops.downgrade() - nec_init_ops.downgrade() - mlnx_init_ops.downgrade() - cisco_init_ops.downgrade() - brocade_init_ops.downgrade() - metering_init_ops.downgrade() - vpn_init_ops.downgrade() - loadbalancer_init_ops.downgrade() - firewall_init_ops.downgrade() - ovs_init_ops.downgrade() - ml2_init_ops.downgrade() - lb_init_ops.downgrade() - other_extensions_init_ops.downgrade() - portsec_init_ops.downgrade() - secgroup_init_ops.downgrade() - l3_init_ops.downgrade() - core_init_ops.downgrade() - agent_init_ops.downgrade() diff --git a/neutron/db/migration/alembic_migrations/versions/icehouse_release.py b/neutron/db/migration/alembic_migrations/versions/icehouse_release.py index 5d8d441c02b..56413d9d213 100644 --- a/neutron/db/migration/alembic_migrations/versions/icehouse_release.py +++ b/neutron/db/migration/alembic_migrations/versions/icehouse_release.py @@ -29,15 +29,3 @@ down_revision = '5ac1c354a051' def upgrade(): """A no-op migration for marking the Icehouse release.""" pass - - -def downgrade(): - # 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") diff --git a/neutron/db/migration/alembic_migrations/versions/juno_release.py b/neutron/db/migration/alembic_migrations/versions/juno_release.py index a8ce05df634..8e42cf6689a 100644 --- a/neutron/db/migration/alembic_migrations/versions/juno_release.py +++ b/neutron/db/migration/alembic_migrations/versions/juno_release.py @@ -29,8 +29,3 @@ down_revision = '544673ac99ab' def upgrade(): """A no-op migration for marking the Juno release.""" pass - - -def downgrade(): - """A no-op migration for marking the Juno release.""" - pass diff --git a/neutron/db/migration/alembic_migrations/vmware_init_ops.py b/neutron/db/migration/alembic_migrations/vmware_init_ops.py index 201c3af83e5..6304dfc7217 100644 --- a/neutron/db/migration/alembic_migrations/vmware_init_ops.py +++ b/neutron/db/migration/alembic_migrations/vmware_init_ops.py @@ -181,25 +181,3 @@ def upgrade(): sa.ForeignKeyConstraint(['port_id'], ['ports.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('port_id')) - - -def downgrade(): - op.drop_table('maclearningstates') - op.drop_table('portqueuemappings') - op.drop_table('networkqueuemappings') - op.drop_table('qosqueues') - op.drop_table('networkconnections') - op.drop_table('networkgatewaydevices') - op.drop_table('networkgateways') - op.drop_table('vcns_edge_vip_bindings') - op.drop_table('vcns_firewall_rule_bindings') - op.drop_table('vcns_edge_monitor_bindings') - op.drop_table('vcns_edge_pool_bindings') - op.drop_table('vcns_router_bindings') - op.drop_table('nsxrouterextattributess') - op.drop_table('nvp_multi_provider_networks') - op.drop_table('nvp_network_bindings') - op.drop_table('quantum_nvp_port_mapping') - l2gw_segmentation_type.drop(op.get_bind(), checkfirst=False) - qos_marking.drop(op.get_bind(), checkfirst=False) - net_binding_type.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/db/migration/alembic_migrations/vpn_init_ops.py b/neutron/db/migration/alembic_migrations/vpn_init_ops.py index 8b8891025dc..ba3cd3df8c3 100644 --- a/neutron/db/migration/alembic_migrations/vpn_init_ops.py +++ b/neutron/db/migration/alembic_migrations/vpn_init_ops.py @@ -122,21 +122,3 @@ def upgrade(): ['ipsec_site_connections.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('cidr', 'ipsec_site_connection_id')) - - -def downgrade(): - op.drop_table('ipsecpeercidrs') - op.drop_table('ipsec_site_connections') - op.drop_table('vpnservices') - op.drop_table('ikepolicies') - op.drop_table('ipsecpolicies') - auth_algorithms.drop(op.get_bind(), checkfirst=False) - encryption_algorithms.drop(op.get_bind(), checkfirst=False) - encapsulation_modes.drop(op.get_bind(), checkfirst=False) - lifetime_unit_types.drop(op.get_bind(), checkfirst=False) - transform_protocols.drop(op.get_bind(), checkfirst=False) - pfs_types.drop(op.get_bind(), checkfirst=False) - phase1_negotiation_modes.drop(op.get_bind(), checkfirst=False) - ike_versions.drop(op.get_bind(), checkfirst=False) - initiator_types.drop(op.get_bind(), checkfirst=False) - dpd_actions.drop(op.get_bind(), checkfirst=False) diff --git a/neutron/tests/functional/db/test_migrations.py b/neutron/tests/functional/db/test_migrations.py index 63857fb98b5..e39e4383380 100644 --- a/neutron/tests/functional/db/test_migrations.py +++ b/neutron/tests/functional/db/test_migrations.py @@ -261,3 +261,24 @@ class TestSanityCheck(test_base.DbTestCase): script = script_dir.get_revision("14be42f3d0a5").module self.assertRaises(script.DuplicateSecurityGroupsNamedDefault, script.check_sanity, conn) + + +class TestWalkMigrations(test_base.DbTestCase): + + def setUp(self): + super(TestWalkMigrations, self).setUp() + self.alembic_config = migration.get_alembic_config() + self.alembic_config.neutron_config = cfg.CONF + + def test_no_downgrade(self): + script_dir = alembic_script.ScriptDirectory.from_config( + self.alembic_config) + versions = [v for v in script_dir.walk_revisions(base='base', + head='heads')] + failed_revisions = [] + for version in versions: + if hasattr(version.module, 'downgrade'): + failed_revisions.append(version.revision) + + if failed_revisions: + self.fail('Migrations %s have downgrade' % failed_revisions)