We just added TLS tests for precopy but not postcopy. Add the
corresponding test for vanilla postcopy.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tests/qtest/migration-test.c | 43 +++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index d9f444ea14..80c4244871 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -481,6 +481,10 @@ typedef struct {
bool only_target;
/* Use dirty ring if true; dirty logging otherwise */
bool use_dirty_ring;
+ /* Whether use TLS channels for postcopy test? */
+ bool postcopy_tls;
+ /* Used only if postcopy_tls==true, to cache the data object */
+ void *postcopy_tls_data;
const char *opts_source;
const char *opts_target;
} MigrateStart;
@@ -980,6 +984,10 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
return -1;
}
+ if (args->postcopy_tls) {
+ args->postcopy_tls_data = test_migrate_tls_psk_start_match(from, to);
+ }
+
migrate_set_capability(from, "postcopy-ram", true);
migrate_set_capability(to, "postcopy-ram", true);
migrate_set_capability(to, "postcopy-blocktime", true);
@@ -1004,7 +1012,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,
+ MigrateStart *args)
{
wait_for_migration_complete(from);
@@ -1015,19 +1024,38 @@ static void migrate_postcopy_complete(QTestState *from, QTestState *to)
read_blocktime(to);
}
+ if (args->postcopy_tls) {
+ assert(args->postcopy_tls_data);
+ test_migrate_tls_psk_finish(from, to, args->postcopy_tls_data);
+ args->postcopy_tls_data = NULL;
+ }
+
test_migrate_end(from, to, true);
}
-static void test_postcopy(void)
+static void test_postcopy_common(MigrateStart *args)
{
- MigrateStart args = {};
QTestState *from, *to;
- if (migrate_postcopy_prepare(&from, &to, &args)) {
+ if (migrate_postcopy_prepare(&from, &to, args)) {
return;
}
migrate_postcopy_start(from, to);
- migrate_postcopy_complete(from, to);
+ migrate_postcopy_complete(from, to, args);
+}
+
+static void test_postcopy(void)
+{
+ MigrateStart args = { };
+
+ test_postcopy_common(&args);
+}
+
+static void test_postcopy_tls(void)
+{
+ MigrateStart args = { .postcopy_tls = true };
+
+ test_postcopy_common(&args);
}
static void test_postcopy_recovery(void)
@@ -1089,7 +1117,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)
@@ -2134,6 +2162,9 @@ int main(int argc, char **argv)
qtest_add_func("/migration/postcopy/unix", test_postcopy);
qtest_add_func("/migration/postcopy/recovery", test_postcopy_recovery);
+#ifdef CONFIG_GNUTLS
+ qtest_add_func("/migration/postcopy/tls", test_postcopy_tls);
+#endif /* CONFIG_GNUTLS */
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);
--
2.32.0On Thu, Mar 31, 2022 at 11:08:55AM -0400, Peter Xu wrote:
> We just added TLS tests for precopy but not postcopy. Add the
> corresponding test for vanilla postcopy.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> tests/qtest/migration-test.c | 43 +++++++++++++++++++++++++++++++-----
> 1 file changed, 37 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index d9f444ea14..80c4244871 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -481,6 +481,10 @@ typedef struct {
> bool only_target;
> /* Use dirty ring if true; dirty logging otherwise */
> bool use_dirty_ring;
> + /* Whether use TLS channels for postcopy test? */
> + bool postcopy_tls;
> + /* Used only if postcopy_tls==true, to cache the data object */
> + void *postcopy_tls_data;
> const char *opts_source;
> const char *opts_target;
> } MigrateStart;
> @@ -980,6 +984,10 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
> return -1;
> }
>
> + if (args->postcopy_tls) {
> + args->postcopy_tls_data = test_migrate_tls_psk_start_match(from, to);
> + }
> +
> migrate_set_capability(from, "postcopy-ram", true);
> migrate_set_capability(to, "postcopy-ram", true);
> migrate_set_capability(to, "postcopy-blocktime", true);
> @@ -1004,7 +1012,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,
> + MigrateStart *args)
> {
> wait_for_migration_complete(from);
>
> @@ -1015,19 +1024,38 @@ static void migrate_postcopy_complete(QTestState *from, QTestState *to)
> read_blocktime(to);
> }
>
> + if (args->postcopy_tls) {
> + assert(args->postcopy_tls_data);
> + test_migrate_tls_psk_finish(from, to, args->postcopy_tls_data);
> + args->postcopy_tls_data = NULL;
> + }
> +
> test_migrate_end(from, to, true);
> }
>
> -static void test_postcopy(void)
> +static void test_postcopy_common(MigrateStart *args)
> {
> - MigrateStart args = {};
> QTestState *from, *to;
>
> - if (migrate_postcopy_prepare(&from, &to, &args)) {
> + if (migrate_postcopy_prepare(&from, &to, args)) {
> return;
> }
> migrate_postcopy_start(from, to);
> - migrate_postcopy_complete(from, to);
> + migrate_postcopy_complete(from, to, args);
> +}
> +
> +static void test_postcopy(void)
> +{
> + MigrateStart args = { };
> +
> + test_postcopy_common(&args);
> +}
> +
> +static void test_postcopy_tls(void)
test_postcopy_tls_psk()
> +{
> + MigrateStart args = { .postcopy_tls = true };
> +
> + test_postcopy_common(&args);
> }
>
> static void test_postcopy_recovery(void)
> @@ -1089,7 +1117,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)
> @@ -2134,6 +2162,9 @@ int main(int argc, char **argv)
>
> qtest_add_func("/migration/postcopy/unix", test_postcopy);
Rename this to /migration/postcopy/unix/plain
> qtest_add_func("/migration/postcopy/recovery", test_postcopy_recovery);
> +#ifdef CONFIG_GNUTLS
> + qtest_add_func("/migration/postcopy/tls", test_postcopy_tls);
And this to /migration/postcopy/unix/tls/psk so we match the precopy test
naming convention I started
> +#endif /* CONFIG_GNUTLS */
> 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);
> --
> 2.32.0
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Wed, Apr 20, 2022 at 12:39:07PM +0100, Daniel P. Berrangé wrote:
> On Thu, Mar 31, 2022 at 11:08:55AM -0400, Peter Xu wrote:
> > We just added TLS tests for precopy but not postcopy. Add the
> > corresponding test for vanilla postcopy.
> >
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > tests/qtest/migration-test.c | 43 +++++++++++++++++++++++++++++++-----
> > 1 file changed, 37 insertions(+), 6 deletions(-)
> >
> > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> > index d9f444ea14..80c4244871 100644
> > --- a/tests/qtest/migration-test.c
> > +++ b/tests/qtest/migration-test.c
> > @@ -481,6 +481,10 @@ typedef struct {
> > bool only_target;
> > /* Use dirty ring if true; dirty logging otherwise */
> > bool use_dirty_ring;
> > + /* Whether use TLS channels for postcopy test? */
> > + bool postcopy_tls;
> > + /* Used only if postcopy_tls==true, to cache the data object */
> > + void *postcopy_tls_data;
> > const char *opts_source;
> > const char *opts_target;
> > } MigrateStart;
> > @@ -980,6 +984,10 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
> > return -1;
> > }
> >
> > + if (args->postcopy_tls) {
> > + args->postcopy_tls_data = test_migrate_tls_psk_start_match(from, to);
> > + }
> > +
> > migrate_set_capability(from, "postcopy-ram", true);
> > migrate_set_capability(to, "postcopy-ram", true);
> > migrate_set_capability(to, "postcopy-blocktime", true);
> > @@ -1004,7 +1012,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,
> > + MigrateStart *args)
> > {
> > wait_for_migration_complete(from);
> >
> > @@ -1015,19 +1024,38 @@ static void migrate_postcopy_complete(QTestState *from, QTestState *to)
> > read_blocktime(to);
> > }
> >
> > + if (args->postcopy_tls) {
> > + assert(args->postcopy_tls_data);
> > + test_migrate_tls_psk_finish(from, to, args->postcopy_tls_data);
> > + args->postcopy_tls_data = NULL;
> > + }
> > +
> > test_migrate_end(from, to, true);
> > }
> >
> > -static void test_postcopy(void)
> > +static void test_postcopy_common(MigrateStart *args)
> > {
> > - MigrateStart args = {};
> > QTestState *from, *to;
> >
> > - if (migrate_postcopy_prepare(&from, &to, &args)) {
> > + if (migrate_postcopy_prepare(&from, &to, args)) {
> > return;
> > }
> > migrate_postcopy_start(from, to);
> > - migrate_postcopy_complete(from, to);
> > + migrate_postcopy_complete(from, to, args);
> > +}
> > +
> > +static void test_postcopy(void)
> > +{
> > + MigrateStart args = { };
> > +
> > + test_postcopy_common(&args);
> > +}
> > +
> > +static void test_postcopy_tls(void)
>
> test_postcopy_tls_psk()
>
> > +{
> > + MigrateStart args = { .postcopy_tls = true };
> > +
> > + test_postcopy_common(&args);
> > }
> >
> > static void test_postcopy_recovery(void)
> > @@ -1089,7 +1117,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)
> > @@ -2134,6 +2162,9 @@ int main(int argc, char **argv)
> >
> > qtest_add_func("/migration/postcopy/unix", test_postcopy);
>
> Rename this to /migration/postcopy/unix/plain
>
> > qtest_add_func("/migration/postcopy/recovery", test_postcopy_recovery);
> > +#ifdef CONFIG_GNUTLS
> > + qtest_add_func("/migration/postcopy/tls", test_postcopy_tls);
>
> And this to /migration/postcopy/unix/tls/psk so we match the precopy test
> naming convention I started
I can do all the renamings.
But note that I explicitly didn't add psk just because for postcopy it's
the same to use either psk or other ways to do encryption - we're testing
the tls channel paths not any specific type of TLS channels.
I wanted to use that trick to make sure people are aware we don't really
need other types of tls tests for postcopy, because the tls-type specific
code paths should have been covered in tls specific precopy tests.
I guess I'll add a comment showing that instead of using a vague naming.
Thanks,
--
Peter Xu
© 2016 - 2026 Red Hat, Inc.