[v11] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration

[PATCH v11 10/10] migration: modify test_multifd_tcp_none() to use new QAPI syntax.

Posted by Het Gala 2 years, 4 months ago

modify multifd tcp common test to incorporate the new QAPI
syntax defined.

Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/qtest/migration-test.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 46f1c275a2..246cab6451 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -2205,7 +2205,12 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
 
     /* Start incoming migration from the 1st socket */
     qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming',"
-                             "  'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
+                             "  'arguments': { "
+                             "      'channels': [ { 'channeltype': 'main',"
+                             "      'addr': { 'transport': 'socket',"
+                             "                'type': 'inet',"
+                             "                'host': '127.0.0.1',"
+                             "                'port': '0' } } ] } }");
 
     return NULL;
 }
-- 
2.22.3

Re: [PATCH v11 10/10] migration: modify test_multifd_tcp_none() to use new QAPI syntax.

Posted by Fabiano Rosas 2 years, 4 months ago

Het Gala <het.gala@nutanix.com> writes:

> modify multifd tcp common test to incorporate the new QAPI
> syntax defined.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  tests/qtest/migration-test.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index 46f1c275a2..246cab6451 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -2205,7 +2205,12 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
>  
>      /* Start incoming migration from the 1st socket */
>      qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming',"
> -                             "  'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
> +                             "  'arguments': { "
> +                             "      'channels': [ { 'channeltype': 'main',"

channel-type

> +                             "      'addr': { 'transport': 'socket',"
> +                             "                'type': 'inet',"
> +                             "                'host': '127.0.0.1',"
> +                             "                'port': '0' } } ] } }");
>  
>      return NULL;
>  }

Re: [PATCH v11 10/10] migration: modify test_multifd_tcp_none() to use new QAPI syntax.

Posted by Het Gala 2 years, 4 months ago

On 10/4/2023 8:55 PM, Fabiano Rosas wrote:
> Het Gala<het.gala@nutanix.com>  writes:
>
>> modify multifd tcp common test to incorporate the new QAPI
>> syntax defined.
>>
>> Suggested-by: Aravind Retnakaran<aravind.retnakaran@nutanix.com>
>> Signed-off-by: Het Gala<het.gala@nutanix.com>
>> Reviewed-by: Daniel P. Berrangé<berrange@redhat.com>
>> ---
>>   tests/qtest/migration-test.c | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
>> index 46f1c275a2..246cab6451 100644
>> --- a/tests/qtest/migration-test.c
>> +++ b/tests/qtest/migration-test.c
>> @@ -2205,7 +2205,12 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
>>   
>>       /* Start incoming migration from the 1st socket */
>>       qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming',"
>> -                             "  'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
>> +                             "  'arguments': { "
>> +                             "      'channels': [ { 'channeltype': 'main',"
> channel-type
Ack.
>
>> +                             "      'addr': { 'transport': 'socket',"
>> +                             "                'type': 'inet',"
>> +                             "                'host': '127.0.0.1',"
>> +                             "                'port': '0' } } ] } }");
>>   
>>       return NULL;
>>   }
Regards,
Het Gala