On Thu, Jul 13, 2023 at 10:57:13AM +0000, Het Gala wrote:
> Add multifd tcp common test case for new QAPI syntax defined.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> tests/qtest/migration-test.c | 45 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index efa8c729db..786e6bbe8b 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -2190,6 +2190,32 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
> return NULL;
> }
>
> +static void *
> +test_migrate_precopy_tcp_multifd_start_new_syntax_common(QTestState *from,
> + QTestState *to,
> + const char *method)
> +{
> + migrate_set_parameter_int(from, "multifd-channels", 16);
> + migrate_set_parameter_int(to, "multifd-channels", 16);
> +
> + migrate_set_parameter_str(from, "multifd-compression", method);
> + migrate_set_parameter_str(to, "multifd-compression", method);
> +
> + migrate_set_capability(from, "multifd", true);
> + migrate_set_capability(to, "multifd", true);
> +
> + /* Start incoming migration from the 1st socket */
> + qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming',"
> + " 'arguments': { "
> + " 'channels': [ { 'channeltype': 'main',"
> + " 'addr': { 'transport': 'socket',"
> + " 'type': 'inet',"
> + " 'host': '127.0.0.1',"
> + " 'port': '0' } } ] } }");
> +
> + return NULL;
> +}
> +
> static void *
> test_migrate_precopy_tcp_multifd_start(QTestState *from,
> QTestState *to)
> @@ -2197,6 +2223,14 @@ test_migrate_precopy_tcp_multifd_start(QTestState *from,
> return test_migrate_precopy_tcp_multifd_start_common(from, to, "none");
> }
>
> +static void *
> +test_migrate_precopy_tcp_multifd_new_syntax_start(QTestState *from,
> + QTestState *to)
> +{
> + return test_migrate_precopy_tcp_multifd_start_new_syntax_common(from,
> + to, "none");
> +}
> +
> static void *
> test_migrate_precopy_tcp_multifd_zlib_start(QTestState *from,
> QTestState *to)
> @@ -2228,6 +2262,15 @@ static void test_multifd_tcp_none(void)
> test_precopy_common(&args);
> }
>
> +static void test_multifd_tcp_new_syntax_none(void)
> +{
> + MigrateCommon args = {
> + .listen_uri = "defer",
> + .start_hook = test_migrate_precopy_tcp_multifd_new_syntax_start,
> + };
> + test_precopy_common(&args);
> +}
> +
> static void test_multifd_tcp_zlib(void)
> {
> MigrateCommon args = {
> @@ -2916,6 +2959,8 @@ int main(int argc, char **argv)
> }
> qtest_add_func("/migration/multifd/tcp/plain/none",
> test_multifd_tcp_none);
> + qtest_add_func("/migration/multifd/tcp/plain/none",
> + test_multifd_tcp_new_syntax_none);
Rather than adding a new test case, I think its sufficient to modify
the existing test_multifd_tcp_none() method to use the new syntax.
We've plenty of other test cases which will still be exercising the
old syntax.
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 :|