1. Patchew
  2. QEMU
  3. [Qemu-devel] [PATCH v4 00/11] Add make check tests for Migration
  4. View patch

[Qemu-devel] [PATCH v4 05/11] tests: Add deprecated commands migration test

Juan Quintela posted 11 patches 7 years, 9 months ago
There is a newer version of this series
[Qemu-devel] [PATCH v4 05/11] tests: Add deprecated commands migration test
Posted by Juan Quintela 7 years, 9 months ago 
We add deprecated commands on a new test, so we don't have to add it
on normal tests.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/migration-test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/tests/migration-test.c b/tests/migration-test.c
index f469235d0b..bcb0a82d42 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -513,6 +513,64 @@ static void test_migrate_end(QTestState *from, QTestState *to)
     cleanup("dest_serial");
 }
 
+static void deprecated_set_downtime(QTestState *who, const double value)
+{
+    QDict *rsp;
+    gchar *cmd;
+    char *expected;
+    int64_t result_int;
+
+    cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime',"
+                          "'arguments': { 'value': %g } }", value);
+    rsp = qtest_qmp(who, cmd);
+    g_free(cmd);
+    g_assert(qdict_haskey(rsp, "return"));
+    QDECREF(rsp);
+    result_int = value * 1000L;
+    expected = g_strdup_printf("%" PRId64, result_int);
+    migrate_check_parameter(who, "downtime-limit", expected);
+    g_free(expected);
+}
+
+static void deprecated_set_speed(QTestState *who, const char *value)
+{
+    QDict *rsp;
+    gchar *cmd;
+
+    cmd = g_strdup_printf("{ 'execute': 'migrate_set_speed',"
+                          "'arguments': { 'value': %s } }", value);
+    rsp = qtest_qmp(who, cmd);
+    g_free(cmd);
+    g_assert(qdict_haskey(rsp, "return"));
+    QDECREF(rsp);
+    migrate_check_parameter(who, "max-bandwidth", value);
+}
+
+static void test_deprecated(void)
+{
+    char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
+    QTestState *from, *to;
+
+    /* Create source and destination guests.  This way we can reuse
+     * test_migrate_start */
+    test_migrate_start(&from, &to, uri);
+
+    deprecated_set_downtime(from, 0.12345);
+    deprecated_set_downtime(to, 0.12345);
+    deprecated_set_speed(from, "12345");
+    deprecated_set_speed(to, "12345");
+
+    g_free(uri);
+
+    qtest_quit(from);
+    qtest_quit(to);
+
+    cleanup("bootsect");
+    cleanup("migsocket");
+    cleanup("src_serial");
+    cleanup("dest_serial");
+}
+
 static void test_migrate(void)
 {
     char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
@@ -580,6 +638,7 @@ int main(int argc, char **argv)
     module_call_init(MODULE_INIT_QOM);
 
     qtest_add_func("/migration/postcopy/unix", test_migrate);
+    qtest_add_func("/migration/deprecated", test_deprecated);
 
     ret = g_test_run();
 
-- 
2.14.3
Re: [Qemu-devel] [PATCH v4 05/11] tests: Add deprecated commands migration test
Posted by Peter Xu 7 years, 9 months ago 
On Fri, Jan 05, 2018 at 10:52:40PM +0100, Juan Quintela wrote:
> We add deprecated commands on a new test, so we don't have to add it
> on normal tests.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/migration-test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 59 insertions(+)
> 
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index f469235d0b..bcb0a82d42 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -513,6 +513,64 @@ static void test_migrate_end(QTestState *from, QTestState *to)
>      cleanup("dest_serial");
>  }
>  
> +static void deprecated_set_downtime(QTestState *who, const double value)
> +{
> +    QDict *rsp;
> +    gchar *cmd;
> +    char *expected;
> +    int64_t result_int;
> +
> +    cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime',"
> +                          "'arguments': { 'value': %g } }", value);
> +    rsp = qtest_qmp(who, cmd);
> +    g_free(cmd);
> +    g_assert(qdict_haskey(rsp, "return"));
> +    QDECREF(rsp);
> +    result_int = value * 1000L;
> +    expected = g_strdup_printf("%" PRId64, result_int);
> +    migrate_check_parameter(who, "downtime-limit", expected);
> +    g_free(expected);
> +}
> +
> +static void deprecated_set_speed(QTestState *who, const char *value)
> +{
> +    QDict *rsp;
> +    gchar *cmd;
> +
> +    cmd = g_strdup_printf("{ 'execute': 'migrate_set_speed',"
> +                          "'arguments': { 'value': %s } }", value);
> +    rsp = qtest_qmp(who, cmd);
> +    g_free(cmd);
> +    g_assert(qdict_haskey(rsp, "return"));
> +    QDECREF(rsp);
> +    migrate_check_parameter(who, "max-bandwidth", value);
> +}
> +
> +static void test_deprecated(void)
> +{
> +    char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
> +    QTestState *from, *to;
> +
> +    /* Create source and destination guests.  This way we can reuse
> +     * test_migrate_start */
> +    test_migrate_start(&from, &to, uri);
> +
> +    deprecated_set_downtime(from, 0.12345);
> +    deprecated_set_downtime(to, 0.12345);
> +    deprecated_set_speed(from, "12345");
> +    deprecated_set_speed(to, "12345");
> +
> +    g_free(uri);
> +
> +    qtest_quit(from);
> +    qtest_quit(to);
> +
> +    cleanup("bootsect");
> +    cleanup("migsocket");
> +    cleanup("src_serial");
> +    cleanup("dest_serial");

I thought calling qtest_start() with a single VM would be even
simpler, but this is good enough for me... Thanks for that.  :-)

Reviewed-by: Peter Xu <peterx@redhat.com>

> +}
> +
>  static void test_migrate(void)
>  {
>      char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
> @@ -580,6 +638,7 @@ int main(int argc, char **argv)
>      module_call_init(MODULE_INIT_QOM);
>  
>      qtest_add_func("/migration/postcopy/unix", test_migrate);
> +    qtest_add_func("/migration/deprecated", test_deprecated);
>  
>      ret = g_test_run();
>  
> -- 
> 2.14.3
> 

-- 
Peter Xu
Re: [Qemu-devel] [PATCH v4 05/11] tests: Add deprecated commands migration test
Posted by Juan Quintela 7 years, 9 months ago 
Peter Xu <peterx@redhat.com> wrote:
> On Fri, Jan 05, 2018 at 10:52:40PM +0100, Juan Quintela wrote:
>> We add deprecated commands on a new test, so we don't have to add it
>> on normal tests.
>> 
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>>  tests/migration-test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 59 insertions(+)
>> 
>> diff --git a/tests/migration-test.c b/tests/migration-test.c
>> index f469235d0b..bcb0a82d42 100644
>> --- a/tests/migration-test.c
>> +++ b/tests/migration-test.c
>> @@ -513,6 +513,64 @@ static void test_migrate_end(QTestState *from, QTestState *to)
>>      cleanup("dest_serial");
>>  }
>>  
>> +static void deprecated_set_downtime(QTestState *who, const double value)
>> +{
>> +    QDict *rsp;
>> +    gchar *cmd;
>> +    char *expected;
>> +    int64_t result_int;
>> +
>> +    cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime',"
>> +                          "'arguments': { 'value': %g } }", value);
>> +    rsp = qtest_qmp(who, cmd);
>> +    g_free(cmd);
>> +    g_assert(qdict_haskey(rsp, "return"));
>> +    QDECREF(rsp);
>> +    result_int = value * 1000L;
>> +    expected = g_strdup_printf("%" PRId64, result_int);
>> +    migrate_check_parameter(who, "downtime-limit", expected);
>> +    g_free(expected);
>> +}
>> +
>> +static void deprecated_set_speed(QTestState *who, const char *value)
>> +{
>> +    QDict *rsp;
>> +    gchar *cmd;
>> +
>> +    cmd = g_strdup_printf("{ 'execute': 'migrate_set_speed',"
>> +                          "'arguments': { 'value': %s } }", value);
>> +    rsp = qtest_qmp(who, cmd);
>> +    g_free(cmd);
>> +    g_assert(qdict_haskey(rsp, "return"));
>> +    QDECREF(rsp);
>> +    migrate_check_parameter(who, "max-bandwidth", value);
>> +}
>> +
>> +static void test_deprecated(void)
>> +{
>> +    char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
>> +    QTestState *from, *to;
>> +
>> +    /* Create source and destination guests.  This way we can reuse
>> +     * test_migrate_start */
>> +    test_migrate_start(&from, &to, uri);
>> +
>> +    deprecated_set_downtime(from, 0.12345);
>> +    deprecated_set_downtime(to, 0.12345);
>> +    deprecated_set_speed(from, "12345");
>> +    deprecated_set_speed(to, "12345");
>> +
>> +    g_free(uri);
>> +
>> +    qtest_quit(from);
>> +    qtest_quit(to);
>> +
>> +    cleanup("bootsect");
>> +    cleanup("migsocket");
>> +    cleanup("src_serial");
>> +    cleanup("dest_serial");
>
> I thought calling qtest_start() with a single VM would be even
> simpler, but this is good enough for me... Thanks for that.  :-)

I had two options:
- reuse the test_migrate_start function, and create two guests
- create a function that only creates one guest, but repeat the
  architecture dependent part.

Take your poison.

> Reviewed-by: Peter Xu <peterx@redhat.com>

Thanks, Juan.
Re: [Qemu-devel] [PATCH v4 05/11] tests: Add deprecated commands migration test
Posted by Peter Xu 7 years, 9 months ago 
On Wed, Jan 10, 2018 at 09:46:49AM +0100, Juan Quintela wrote:
> Peter Xu <peterx@redhat.com> wrote:
> > On Fri, Jan 05, 2018 at 10:52:40PM +0100, Juan Quintela wrote:
> >> We add deprecated commands on a new test, so we don't have to add it
> >> on normal tests.
> >> 
> >> Signed-off-by: Juan Quintela <quintela@redhat.com>
> >> ---
> >>  tests/migration-test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
> >>  1 file changed, 59 insertions(+)
> >> 
> >> diff --git a/tests/migration-test.c b/tests/migration-test.c
> >> index f469235d0b..bcb0a82d42 100644
> >> --- a/tests/migration-test.c
> >> +++ b/tests/migration-test.c
> >> @@ -513,6 +513,64 @@ static void test_migrate_end(QTestState *from, QTestState *to)
> >>      cleanup("dest_serial");
> >>  }
> >>  
> >> +static void deprecated_set_downtime(QTestState *who, const double value)
> >> +{
> >> +    QDict *rsp;
> >> +    gchar *cmd;
> >> +    char *expected;
> >> +    int64_t result_int;
> >> +
> >> +    cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime',"
> >> +                          "'arguments': { 'value': %g } }", value);
> >> +    rsp = qtest_qmp(who, cmd);
> >> +    g_free(cmd);
> >> +    g_assert(qdict_haskey(rsp, "return"));
> >> +    QDECREF(rsp);
> >> +    result_int = value * 1000L;
> >> +    expected = g_strdup_printf("%" PRId64, result_int);
> >> +    migrate_check_parameter(who, "downtime-limit", expected);
> >> +    g_free(expected);
> >> +}
> >> +
> >> +static void deprecated_set_speed(QTestState *who, const char *value)
> >> +{
> >> +    QDict *rsp;
> >> +    gchar *cmd;
> >> +
> >> +    cmd = g_strdup_printf("{ 'execute': 'migrate_set_speed',"
> >> +                          "'arguments': { 'value': %s } }", value);
> >> +    rsp = qtest_qmp(who, cmd);
> >> +    g_free(cmd);
> >> +    g_assert(qdict_haskey(rsp, "return"));
> >> +    QDECREF(rsp);
> >> +    migrate_check_parameter(who, "max-bandwidth", value);
> >> +}
> >> +
> >> +static void test_deprecated(void)
> >> +{
> >> +    char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
> >> +    QTestState *from, *to;
> >> +
> >> +    /* Create source and destination guests.  This way we can reuse
> >> +     * test_migrate_start */
> >> +    test_migrate_start(&from, &to, uri);
> >> +
> >> +    deprecated_set_downtime(from, 0.12345);
> >> +    deprecated_set_downtime(to, 0.12345);
> >> +    deprecated_set_speed(from, "12345");
> >> +    deprecated_set_speed(to, "12345");
> >> +
> >> +    g_free(uri);
> >> +
> >> +    qtest_quit(from);
> >> +    qtest_quit(to);
> >> +
> >> +    cleanup("bootsect");
> >> +    cleanup("migsocket");
> >> +    cleanup("src_serial");
> >> +    cleanup("dest_serial");
> >
> > I thought calling qtest_start() with a single VM would be even
> > simpler, but this is good enough for me... Thanks for that.  :-)
> 
> I had two options:
> - reuse the test_migrate_start function, and create two guests
> - create a function that only creates one guest, but repeat the
>   architecture dependent part.
> 
> Take your poison.

Ah I see your point.  However, do we need those arch-dependent thing
for this QMP-only test?  Would a simplest qtest_start("") suffice?

(I mean, we just start a QEMU without extra QEMU parameters, as long
 as it has QMP)

> 
> > Reviewed-by: Peter Xu <peterx@redhat.com>
> 
> Thanks, Juan.

-- 
Peter Xu

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.