Merge "Remove migrate_to_stateful_fips maintenance task"
This commit is contained in:
Zuul
Gerrit Code Review
commit
d593e1684a
|
|
@ -300,14 +300,6 @@ class OvsdbNbOvnIdl(nb_impl_idl.OvnNbApiIdlImpl, Backend):
|
|||
raise RuntimeError(_("Currently only supports "
|
||||
"delete by lport-name"))
|
||||
|
||||
def get_all_stateless_fip_nats(self):
|
||||
cmd = self.db_find(
|
||||
'NAT',
|
||||
('external_ids', '!=', {ovn_const.OVN_FIP_EXT_ID_KEY: ''}),
|
||||
('options', '=', {'stateless': 'true'}),
|
||||
('type', '=', 'dnat_and_snat'))
|
||||
return cmd.execute(check_error=True)
|
||||
|
||||
def get_all_logical_switches_with_ports(self):
|
||||
result = []
|
||||
for lswitch in self._tables['Logical_Switch'].rows.values():
|
||||
|
|
|
|||
|
|
@ -299,21 +299,6 @@ class DBInconsistenciesPeriodics(SchemaAwarePeriodicsBase):
|
|||
else:
|
||||
self._ovn_client.update_subnet(context, sn_db_obj, n_db_obj)
|
||||
|
||||
# The migration will run just once per neutron-server instance. If the lock
|
||||
# is held by some other neutron-server instance in the cloud, we'll attempt
|
||||
# to perform the migration every 10 seconds until completed.
|
||||
# TODO(ihrachys): Remove the migration to stateful fips in Z+1.
|
||||
@has_lock_periodic(spacing=10, run_immediately=True)
|
||||
@rerun_on_schema_updates
|
||||
def migrate_to_stateful_fips(self):
|
||||
"""Perform the migration from stateless to stateful Floating IPs. """
|
||||
admin_context = n_context.get_admin_context()
|
||||
nb_sync = ovn_db_sync.OvnNbSynchronizer(
|
||||
self._ovn_client._plugin, self._nb_idl, self._ovn_client._sb_idl,
|
||||
None, None)
|
||||
nb_sync.migrate_to_stateful_fips(admin_context)
|
||||
raise periodics.NeverAgain()
|
||||
|
||||
# The migration will run just once per neutron-server instance. If the lock
|
||||
# is held by some other neutron-server instance in the cloud, we'll attempt
|
||||
# to perform the migration every 10 seconds until completed.
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
|
|||
self.sync_port_dns_records(ctx)
|
||||
self.sync_acls(ctx)
|
||||
self.sync_routers_and_rports(ctx)
|
||||
self.migrate_to_stateful_fips_and_log(ctx)
|
||||
self.sync_port_qos_policies(ctx)
|
||||
self.sync_fip_qos_policies(ctx)
|
||||
|
||||
|
|
@ -1276,23 +1275,6 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
|
|||
txn.add(self.ovn_api.pg_add_ports(
|
||||
utils.ovn_port_group_name(sg), port['id']))
|
||||
|
||||
def migrate_to_stateful_fips_and_log(self, ctx):
|
||||
# migrate_to_stateful_fips() is also called from the maintenance
|
||||
# task so log only if called from above
|
||||
LOG.debug('OVN-NB Sync migrate to stateful Floating IPs started @ %s',
|
||||
str(datetime.now()))
|
||||
self.migrate_to_stateful_fips(ctx)
|
||||
LOG.debug('OVN-NB Sync migrate to stateful Floating IPs completed @ '
|
||||
'%s', str(datetime.now()))
|
||||
|
||||
def migrate_to_stateful_fips(self, ctx):
|
||||
# This routine will clear options:stateless=true for all dnat_and_snats
|
||||
# that belong to neutron fips. Since we don't set any other options,
|
||||
# just clear the whole column.
|
||||
with self.ovn_api.transaction(check_error=True) as txn:
|
||||
for nat in self.ovn_api.get_all_stateless_fip_nats():
|
||||
txn.add(self.ovn_api.db_clear('NAT', nat['_uuid'], 'options'))
|
||||
|
||||
def migrate_to_port_groups(self, ctx):
|
||||
# This routine is responsible for migrating the current Security
|
||||
# Groups and SG Rules to the new Port Groups implementation.
|
||||
|
|
|
|||
|
|
@ -1751,62 +1751,6 @@ class TestOvnNbSync(base.TestOVNFunctionalBase):
|
|||
nb_synchronizer.sync_fip_qos_policies(ctx)
|
||||
self._validate_qos_records()
|
||||
|
||||
def test_fip_nat_revert_to_stateful(self):
|
||||
res = self._create_network(self.fmt, 'n1_ext', True, as_admin=True,
|
||||
arg_list=('router:external', ),
|
||||
**{'router:external': True})
|
||||
net_ext = self.deserialize(self.fmt, res)['network']
|
||||
res = self._create_subnet(self.fmt, net_ext['id'], '10.0.0.0/24')
|
||||
subnet_ext = self.deserialize(self.fmt, res)['subnet']
|
||||
|
||||
res = self._create_network(self.fmt, 'n1_int', True)
|
||||
net_int = self.deserialize(self.fmt, res)['network']
|
||||
self._create_subnet(self.fmt, net_int['id'], '10.10.0.0/24')
|
||||
|
||||
port = self._make_port(self.fmt, net_int['id'],
|
||||
name='test-port')['port']
|
||||
|
||||
data = {'name': 'r1', 'admin_state_up': True,
|
||||
'tenant_id': self._tenant_id,
|
||||
'external_gateway_info': {
|
||||
'enable_snat': True,
|
||||
'network_id': net_ext['id'],
|
||||
'external_fixed_ips': [{'ip_address': '10.0.0.5',
|
||||
'subnet_id': subnet_ext['id']}]}
|
||||
}
|
||||
router = self.l3_plugin.create_router(self.context, {'router': data})
|
||||
self.l3_plugin.add_router_interface(
|
||||
self.context, router['id'], {'port_id': port['id']})
|
||||
|
||||
body = {'tenant_id': self._tenant_id,
|
||||
'floating_network_id': net_ext['id'],
|
||||
'port_id': port['id']}
|
||||
self.l3_plugin.create_floatingip(self.context, {'floatingip': body})
|
||||
|
||||
self.assertEqual(0, len(self.nb_api.get_all_stateless_fip_nats()))
|
||||
|
||||
def get_all_stateful_fip_nats():
|
||||
cmd = self.nb_api.db_find('NAT',
|
||||
('external_ids', '!=', {ovn_const.OVN_FIP_EXT_ID_KEY: ''}),
|
||||
('options', '=', {}),
|
||||
('type', '=', 'dnat_and_snat'))
|
||||
return cmd.execute(check_error=True)
|
||||
|
||||
with self.nb_api.transaction(check_error=True) as txn:
|
||||
for nat in get_all_stateful_fip_nats():
|
||||
txn.add(self.nb_api.db_set(
|
||||
'NAT', nat['_uuid'],
|
||||
('options', {'stateless': 'true'})))
|
||||
|
||||
self.assertEqual(1, len(self.nb_api.get_all_stateless_fip_nats()))
|
||||
|
||||
nb_synchronizer = ovn_db_sync.OvnNbSynchronizer(
|
||||
self.plugin, self.mech_driver.nb_ovn, self.mech_driver.sb_ovn,
|
||||
'repair', self.mech_driver)
|
||||
nb_synchronizer.migrate_to_stateful_fips(self.context)
|
||||
|
||||
self.assertEqual(0, len(self.nb_api.get_all_stateless_fip_nats()))
|
||||
|
||||
|
||||
class TestOvnSbSync(base.TestOVNFunctionalBase):
|
||||
|
||||
|
|
|
|||
|
|
@ -147,36 +147,6 @@ class TestDBInconsistenciesPeriodics(testlib_api.SqlTestCaseLight,
|
|||
migration_expected=False,
|
||||
never_again=False)
|
||||
|
||||
def _test_migrate_to_stateful_fips_helper(
|
||||
self, migration_expected, never_again):
|
||||
with mock.patch.object(ovn_db_sync.OvnNbSynchronizer,
|
||||
'migrate_to_stateful_fips') as mtsf:
|
||||
if never_again:
|
||||
self.assertRaises(periodics.NeverAgain,
|
||||
self.periodic.migrate_to_stateful_fips)
|
||||
else:
|
||||
self.periodic.migrate_to_stateful_fips()
|
||||
|
||||
if migration_expected:
|
||||
mtsf.assert_called_once_with(mock.ANY)
|
||||
else:
|
||||
mtsf.assert_not_called()
|
||||
|
||||
def test_migrate_to_stateful_fips(self):
|
||||
# Check normal migration path: if the migration has to be done, it will
|
||||
# take place and won't be attempted in the future.
|
||||
self._test_migrate_to_stateful_fips_helper(migration_expected=True,
|
||||
never_again=True)
|
||||
|
||||
def test_migrate_to_stateful_fips_no_lock(self):
|
||||
with mock.patch.object(maintenance.DBInconsistenciesPeriodics,
|
||||
'has_lock', mock.PropertyMock(
|
||||
return_value=False)):
|
||||
# Check that if this worker doesn't have the lock, it won't
|
||||
# perform the migration and it will try again later.
|
||||
self._test_migrate_to_stateful_fips_helper(
|
||||
migration_expected=False, never_again=False)
|
||||
|
||||
def _test_fix_create_update_network(self, ovn_rev, neutron_rev):
|
||||
with db_api.CONTEXT_WRITER.using(self.ctx):
|
||||
self.net['revision_number'] = neutron_rev
|
||||
|
|
|
|||
|
|
@ -454,8 +454,6 @@ class TestOvnNbSyncML2(test_mech_driver.OVNMechanismDriverTestCase):
|
|||
ovn_api.get_all_logical_switches_with_ports.return_value = (
|
||||
self.lswitches_with_ports)
|
||||
|
||||
ovn_api.get_all_stateless_fip_nats = mock.Mock()
|
||||
ovn_api.get_all_stateless_fip_nats.return_value = []
|
||||
ovn_api.get_all_logical_routers_with_rports = mock.Mock()
|
||||
ovn_api.get_all_logical_routers_with_rports.return_value = (
|
||||
self.lrouters_with_rports)
|
||||
|
|
|
|||
Loading…
Reference in New Issue