tests: Add postcopy tls migration test

We just added TLS tests for precopy but not postcopy.  Add the
corresponding test for vanilla postcopy.

Rename the vanilla postcopy to "postcopy/plain" because all postcopy tests
will only use unix sockets as channel.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20220707185525.27692-1-peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  dgilbert: Manual merge
This commit is contained in:
Peter Xu 2022-07-07 14:55:25 -04:00 committed by Dr. David Alan Gilbert
parent 312e9dd08c
commit d1a27b169b

View File

@ -573,6 +573,9 @@ typedef struct {
/* Optional: set number of migration passes to wait for */
unsigned int iterations;
/* Postcopy specific fields */
void *postcopy_data;
} MigrateCommon;
static int test_migrate_start(QTestState **from, QTestState **to,
@ -1061,15 +1064,19 @@ test_migrate_tls_x509_finish(QTestState *from,
static int migrate_postcopy_prepare(QTestState **from_ptr,
QTestState **to_ptr,
MigrateStart *args)
MigrateCommon *args)
{
g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
QTestState *from, *to;
if (test_migrate_start(&from, &to, uri, args)) {
if (test_migrate_start(&from, &to, uri, &args->start)) {
return -1;
}
if (args->start_hook) {
args->postcopy_data = args->start_hook(from, to);
}
migrate_set_capability(from, "postcopy-ram", true);
migrate_set_capability(to, "postcopy-ram", true);
migrate_set_capability(to, "postcopy-blocktime", true);
@ -1089,7 +1096,8 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
return 0;
}
static void migrate_postcopy_complete(QTestState *from, QTestState *to)
static void migrate_postcopy_complete(QTestState *from, QTestState *to,
MigrateCommon *args)
{
wait_for_migration_complete(from);
@ -1100,25 +1108,50 @@ static void migrate_postcopy_complete(QTestState *from, QTestState *to)
read_blocktime(to);
}
if (args->finish_hook) {
args->finish_hook(from, to, args->postcopy_data);
args->postcopy_data = NULL;
}
test_migrate_end(from, to, true);
}
static void test_postcopy_common(MigrateCommon *args)
{
QTestState *from, *to;
if (migrate_postcopy_prepare(&from, &to, args)) {
return;
}
migrate_postcopy_start(from, to);
migrate_postcopy_complete(from, to, args);
}
static void test_postcopy(void)
{
MigrateStart args = {};
QTestState *from, *to;
MigrateCommon args = { };
if (migrate_postcopy_prepare(&from, &to, &args)) {
return;
test_postcopy_common(&args);
}
migrate_postcopy_start(from, to);
migrate_postcopy_complete(from, to);
#ifdef CONFIG_GNUTLS
static void test_postcopy_tls_psk(void)
{
MigrateCommon args = {
.start_hook = test_migrate_tls_psk_start_match,
.finish_hook = test_migrate_tls_psk_finish,
};
test_postcopy_common(&args);
}
#endif
static void test_postcopy_recovery(void)
{
MigrateStart args = {
MigrateCommon args = {
.start = {
.hide_stderr = true,
},
};
QTestState *from, *to;
g_autofree char *uri = NULL;
@ -1174,7 +1207,7 @@ static void test_postcopy_recovery(void)
/* Restore the postcopy bandwidth to unlimited */
migrate_set_parameter_int(from, "max-postcopy-bandwidth", 0);
migrate_postcopy_complete(from, to);
migrate_postcopy_complete(from, to, &args);
}
static void test_baddest(void)
@ -2378,12 +2411,20 @@ int main(int argc, char **argv)
qtest_add_func("/migration/postcopy/unix", test_postcopy);
qtest_add_func("/migration/postcopy/recovery", test_postcopy_recovery);
qtest_add_func("/migration/postcopy/plain", test_postcopy);
qtest_add_func("/migration/bad_dest", test_baddest);
qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain);
qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle);
#ifdef CONFIG_GNUTLS
qtest_add_func("/migration/precopy/unix/tls/psk",
test_precopy_unix_tls_psk);
/*
* NOTE: psk test is enough for postcopy, as other types of TLS
* channels are tested under precopy. Here what we want to test is the
* general postcopy path that has TLS channel enabled.
*/
qtest_add_func("/migration/postcopy/tls/psk", test_postcopy_tls_psk);
#ifdef CONFIG_TASN1
qtest_add_func("/migration/precopy/unix/tls/x509/default-host",
test_precopy_unix_tls_x509_default_host);