[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/18] tests: add multifd migration tests of TLS with PSK credent
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 16/18] tests: add multifd migration tests of TLS with PSK credentials |
Date: |
Wed, 2 Mar 2022 17:49:30 +0000 |
This validates that we correctly handle multifd migration success
and failure scenarios when using TLS with pre shared keys.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qtest/migration-test.c | 94 ++++++++++++++++++++++++++++--------
1 file changed, 75 insertions(+), 19 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 7c69268aa8..506c6996e0 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1717,9 +1717,9 @@ static void test_migrate_auto_converge(void)
}
static void *
-test_migration_precopy_tcp_multifd_start_common(QTestState *from,
- QTestState *to,
- const char *method)
+test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
+ QTestState *to,
+ const char *method)
{
QDict *rsp;
@@ -1741,25 +1741,25 @@
test_migration_precopy_tcp_multifd_start_common(QTestState *from,
}
static void *
-test_migration_precopy_tcp_multifd_start(QTestState *from,
- QTestState *to)
+test_migrate_precopy_tcp_multifd_start(QTestState *from,
+ QTestState *to)
{
- return test_migration_precopy_tcp_multifd_start_common(from, to, "none");
+ return test_migrate_precopy_tcp_multifd_start_common(from, to, "none");
}
static void *
-test_migration_precopy_tcp_multifd_zlib_start(QTestState *from,
- QTestState *to)
+test_migrate_precopy_tcp_multifd_zlib_start(QTestState *from,
+ QTestState *to)
{
- return test_migration_precopy_tcp_multifd_start_common(from, to, "zlib");
+ return test_migrate_precopy_tcp_multifd_start_common(from, to, "zlib");
}
#ifdef CONFIG_ZSTD
static void *
-test_migration_precopy_tcp_multifd_zstd_start(QTestState *from,
- QTestState *to)
+test_migrate_precopy_tcp_multifd_zstd_start(QTestState *from,
+ QTestState *to)
{
- return test_migration_precopy_tcp_multifd_start_common(from, to, "zstd");
+ return test_migrate_precopy_tcp_multifd_start_common(from, to, "zstd");
}
#endif /* CONFIG_ZSTD */
@@ -1777,18 +1777,64 @@ static void
test_multifd_tcp_common(TestMigrateStartHook start_hook)
static void test_multifd_tcp_none(void)
{
- test_multifd_tcp_common(test_migration_precopy_tcp_multifd_start);
+ test_multifd_tcp_common(test_migrate_precopy_tcp_multifd_start);
}
static void test_multifd_tcp_zlib(void)
{
- test_multifd_tcp_common(test_migration_precopy_tcp_multifd_zlib_start);
+ test_multifd_tcp_common(test_migrate_precopy_tcp_multifd_zlib_start);
}
#ifdef CONFIG_ZSTD
static void test_multifd_tcp_zstd(void)
{
- test_multifd_tcp_common(test_migration_precopy_tcp_multifd_zstd_start);
+ test_multifd_tcp_common(test_migrate_precopy_tcp_multifd_zstd_start);
+}
+#endif
+
+#ifdef CONFIG_GNUTLS
+static void test_multifd_tcp_tls_common(TestMigrateStartHook start_hook,
+ TestMigrateFinishHook finish_hook,
+ bool expect_fail)
+{
+ test_precopy_common("defer",
+ NULL, /* connect_uri */
+ start_hook,
+ finish_hook,
+ expect_fail,
+ false, /* dst_quit */
+ 1, /* iterations */
+ false /* dirty_ring */);
+}
+
+static void *
+test_migrate_multifd_tcp_tls_psk_start_match(QTestState *from,
+ QTestState *to)
+{
+ test_migrate_precopy_tcp_multifd_start_common(from, to, "none");
+ return test_migrate_tls_psk_start_match(from, to);
+}
+
+static void *
+test_migrate_multifd_tcp_tls_psk_start_mismatch(QTestState *from,
+ QTestState *to)
+{
+ test_migrate_precopy_tcp_multifd_start_common(from, to, "none");
+ return test_migrate_tls_psk_start_mismatch(from, to);
+}
+
+static void test_multifd_tcp_tls_psk_match(void)
+{
+ test_multifd_tcp_tls_common(test_migrate_multifd_tcp_tls_psk_start_match,
+ test_migrate_tls_psk_finish,
+ false /* expect_fail */);
+}
+
+static void test_multifd_tcp_tls_psk_mismatch(void)
+{
+
test_multifd_tcp_tls_common(test_migrate_multifd_tcp_tls_psk_start_mismatch,
+ test_migrate_tls_psk_finish,
+ true /* expect_fail */);
}
#endif
@@ -2001,12 +2047,22 @@ int main(int argc, char **argv)
test_validate_uuid_dst_not_set);
qtest_add_func("/migration/auto_converge", test_migrate_auto_converge);
- qtest_add_func("/migration/multifd/tcp/none", test_multifd_tcp_none);
- qtest_add_func("/migration/multifd/tcp/cancel", test_multifd_tcp_cancel);
- qtest_add_func("/migration/multifd/tcp/zlib", test_multifd_tcp_zlib);
+ qtest_add_func("/migration/multifd/tcp/plain/none",
+ test_multifd_tcp_none);
+ qtest_add_func("/migration/multifd/tcp/plain/cancel",
+ test_multifd_tcp_cancel);
+ qtest_add_func("/migration/multifd/tcp/plain/zlib",
+ test_multifd_tcp_zlib);
#ifdef CONFIG_ZSTD
- qtest_add_func("/migration/multifd/tcp/zstd", test_multifd_tcp_zstd);
+ qtest_add_func("/migration/multifd/tcp/plain/zstd",
+ test_multifd_tcp_zstd);
#endif
+#ifdef CONFIG_GNUTLS
+ qtest_add_func("/migration/multifd/tcp/tls/psk/match",
+ test_multifd_tcp_tls_psk_match);
+ qtest_add_func("/migration/multifd/tcp/tls/psk/mismatch",
+ test_multifd_tcp_tls_psk_mismatch);
+#endif /* CONFIG_GNUTLS */
if (kvm_dirty_ring_supported()) {
qtest_add_func("/migration/dirty_ring",
--
2.34.1
[PATCH 14/18] tests: convert XBZRLE migration test to use common helper, Daniel P . Berrangé, 2022/03/02
[PATCH 15/18] tests: convert multifd migration tests to use common helper, Daniel P . Berrangé, 2022/03/02
[PATCH 16/18] tests: add multifd migration tests of TLS with PSK credentials,
Daniel P . Berrangé <=
[PATCH 17/18] tests: add multifd migration tests of TLS with x509 credentials, Daniel P . Berrangé, 2022/03/02
[PATCH 18/18] tests: ensure migration status isn't reported as failed, Daniel P . Berrangé, 2022/03/02