* [PATCH v3 0/2] Acceptance test: provides to use different transport for migration
@ 2020-02-03 10:52 Oksana Vohchana
2020-02-03 10:52 ` [PATCH v3 1/2] " Oksana Vohchana
2020-02-03 10:52 ` [PATCH v3 2/2] " Oksana Vohchana
0 siblings, 2 replies; 5+ messages in thread
From: Oksana Vohchana @ 2020-02-03 10:52 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd, wainersm, crosa
This series makes refactoring to migration test and adds new tests with
EXEC and UNIX protocols
---
v2:
- Removes unnecessary symbols and unused method
v3:
- Makes refactoring and split into 2 patches
- Provides TCP and EXEC migration
Oksana Vohchana (2):
Acceptance test: provides to use different transport for migration
Acceptance test: provides to use different transport for migration
tests/acceptance/migration.py | 52 +++++++++++++++++++++++++----------
1 file changed, 37 insertions(+), 15 deletions(-)
--
2.21.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 1/2] Acceptance test: provides to use different transport for migration
2020-02-03 10:52 [PATCH v3 0/2] Acceptance test: provides to use different transport for migration Oksana Vohchana
@ 2020-02-03 10:52 ` Oksana Vohchana
2020-02-03 10:52 ` [PATCH v3 2/2] " Oksana Vohchana
1 sibling, 0 replies; 5+ messages in thread
From: Oksana Vohchana @ 2020-02-03 10:52 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd, wainersm, crosa
Along with VM migration via TCP, we can use migration through EXEC
and UNIX transport protocol
Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
---
v2:
- Removes unnecessary symbols and unused method
v3:
- Makes refactoring and split into 2 patches
Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
---
tests/acceptance/migration.py | 36 ++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py
index a44c1ae58f..34263d8eeb 100644
--- a/tests/acceptance/migration.py
+++ b/tests/acceptance/migration.py
@@ -24,6 +24,26 @@ class Migration(Test):
def migration_finished(vm):
return vm.command('query-migrate')['status'] in ('completed', 'failed')
+ def assert_migration(self, source_vm, dest_vm):
+ wait.wait_for(self.migration_finished,
+ timeout=self.timeout,
+ step=0.1,
+ args=(source_vm,))
+ self.assertEqual(source_vm.command('query-migrate')['status'], 'completed')
+ self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed')
+ self.assertEqual(dest_vm.command('query-status')['status'], 'running')
+ self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate')
+
+ def do_migrate(self, dest_uri, src_uri=None):
+ source_vm = self.get_vm()
+ dest_vm = self.get_vm('-incoming', dest_uri)
+ dest_vm.launch()
+ if src_uri is None:
+ src_uri = dest_uri
+ source_vm.launch()
+ source_vm.qmp('migrate', uri=src_uri)
+ self.assert_migration(source_vm, dest_vm)
+
def _get_free_port(self):
port = network.find_free_port()
if port is None:
@@ -32,19 +52,5 @@ class Migration(Test):
def test_migration_with_tcp_localhost(self):
- source_vm = self.get_vm()
dest_uri = 'tcp:localhost:%u' % self._get_free_port()
- dest_vm = self.get_vm('-incoming', dest_uri)
- dest_vm.launch()
- source_vm.launch()
- source_vm.qmp('migrate', uri=dest_uri)
- wait.wait_for(
- self.migration_finished,
- timeout=self.timeout,
- step=0.1,
- args=(source_vm,)
- )
- self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed')
- self.assertEqual(source_vm.command('query-migrate')['status'], 'completed')
- self.assertEqual(dest_vm.command('query-status')['status'], 'running')
- self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate')
+ self.do_migrate(dest_uri)
--
2.21.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/2] Acceptance test: provides to use different transport for migration
2020-02-03 10:52 [PATCH v3 0/2] Acceptance test: provides to use different transport for migration Oksana Vohchana
2020-02-03 10:52 ` [PATCH v3 1/2] " Oksana Vohchana
@ 2020-02-03 10:52 ` Oksana Vohchana
1 sibling, 0 replies; 5+ messages in thread
From: Oksana Vohchana @ 2020-02-03 10:52 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd, wainersm, crosa
Along with VM migration via TCP, we can use migration through EXEC
and UNIX transport protocol
Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
---
v2:
- Removes unnecessary symbols and unused method
v3:
- Makes refactoring and split into 2 patches
- Provides TCP and EXEC migration
Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
---
tests/acceptance/migration.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py
index 34263d8eeb..4419e38384 100644
--- a/tests/acceptance/migration.py
+++ b/tests/acceptance/migration.py
@@ -10,10 +10,13 @@
# later. See the COPYING file in the top-level directory.
+import tempfile
from avocado_qemu import Test
+from avocado import skipUnless
from avocado.utils import network
from avocado.utils import wait
+from avocado.utils.path import find_command
class Migration(Test):
@@ -54,3 +57,16 @@ class Migration(Test):
def test_migration_with_tcp_localhost(self):
dest_uri = 'tcp:localhost:%u' % self._get_free_port()
self.do_migrate(dest_uri)
+
+ def test_migration_with_unix(self):
+ with tempfile.TemporaryDirectory(prefix='socket_') as socket_path:
+ dest_uri = 'unix:%s/qemu-test.sock' % socket_path
+ self.do_migrate(dest_uri)
+
+ @skipUnless(find_command('nc', default=False), "nc command not found on the system")
+ def test_migration_with_exec(self):
+ """
+ The test works for both netcat-traditional and netcat-openbsd packages
+ """
+ free_port = self._get_free_port()
+ dest_uri = 'exec:nc -l localhost %u' % free_port
--
2.21.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 1/2] Acceptance test: provides to use different transport for migration
2020-02-03 11:16 ` [PATCH v3 1/2] " Oksana Vohchana
@ 2020-02-04 14:09 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-04 14:09 UTC (permalink / raw)
To: Oksana Vohchana, qemu-devel; +Cc: wainersm, crosa
Hi Oksana,
On 2/3/20 12:16 PM, Oksana Vohchana wrote:
> Along with VM migration via TCP, we can use migration through EXEC
> and UNIX transport protocol
>
> Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
>
> ---
> v2:
> - Removes unnecessary symbols and unused method
>
> v3:
> - Makes refactoring and split into 2 patches
> Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
> ---
> tests/acceptance/migration.py | 36 ++++++++++++++++++++---------------
> 1 file changed, 21 insertions(+), 15 deletions(-)
>
> diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py
> index a44c1ae58f..34263d8eeb 100644
> --- a/tests/acceptance/migration.py
> +++ b/tests/acceptance/migration.py
> @@ -24,6 +24,26 @@ class Migration(Test):
> def migration_finished(vm):
> return vm.command('query-migrate')['status'] in ('completed', 'failed')
>
> + def assert_migration(self, source_vm, dest_vm):
> + wait.wait_for(self.migration_finished,
> + timeout=self.timeout,
> + step=0.1,
> + args=(source_vm,))
> + self.assertEqual(source_vm.command('query-migrate')['status'], 'completed')
> + self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed')
> + self.assertEqual(dest_vm.command('query-status')['status'], 'running')
> + self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate')
> +
> + def do_migrate(self, dest_uri, src_uri=None):
> + source_vm = self.get_vm()
> + dest_vm = self.get_vm('-incoming', dest_uri)
> + dest_vm.launch()
> + if src_uri is None:
> + src_uri = dest_uri
> + source_vm.launch()
> + source_vm.qmp('migrate', uri=src_uri)
> + self.assert_migration(source_vm, dest_vm)
> +
Do you mind if I split this patch in 2 when applying to python-next, and
change the subjects as "Extract Migration::assert_migration" and
"Extract Migration::do_migrate"?
Meanwhile:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> def _get_free_port(self):
> port = network.find_free_port()
> if port is None:
> @@ -32,19 +52,5 @@ class Migration(Test):
>
>
> def test_migration_with_tcp_localhost(self):
> - source_vm = self.get_vm()
> dest_uri = 'tcp:localhost:%u' % self._get_free_port()
> - dest_vm = self.get_vm('-incoming', dest_uri)
> - dest_vm.launch()
> - source_vm.launch()
> - source_vm.qmp('migrate', uri=dest_uri)
> - wait.wait_for(
> - self.migration_finished,
> - timeout=self.timeout,
> - step=0.1,
> - args=(source_vm,)
> - )
> - self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed')
> - self.assertEqual(source_vm.command('query-migrate')['status'], 'completed')
> - self.assertEqual(dest_vm.command('query-status')['status'], 'running')
> - self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate')
> + self.do_migrate(dest_uri)
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 1/2] Acceptance test: provides to use different transport for migration
2020-02-03 11:16 [PATCH v3 0/2] " Oksana Vohchana
@ 2020-02-03 11:16 ` Oksana Vohchana
2020-02-04 14:09 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Oksana Vohchana @ 2020-02-03 11:16 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd, wainersm, crosa
Along with VM migration via TCP, we can use migration through EXEC
and UNIX transport protocol
Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
---
v2:
- Removes unnecessary symbols and unused method
v3:
- Makes refactoring and split into 2 patches
Signed-off-by: Oksana Vohchana <ovoshcha@redhat.com>
---
tests/acceptance/migration.py | 36 ++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py
index a44c1ae58f..34263d8eeb 100644
--- a/tests/acceptance/migration.py
+++ b/tests/acceptance/migration.py
@@ -24,6 +24,26 @@ class Migration(Test):
def migration_finished(vm):
return vm.command('query-migrate')['status'] in ('completed', 'failed')
+ def assert_migration(self, source_vm, dest_vm):
+ wait.wait_for(self.migration_finished,
+ timeout=self.timeout,
+ step=0.1,
+ args=(source_vm,))
+ self.assertEqual(source_vm.command('query-migrate')['status'], 'completed')
+ self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed')
+ self.assertEqual(dest_vm.command('query-status')['status'], 'running')
+ self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate')
+
+ def do_migrate(self, dest_uri, src_uri=None):
+ source_vm = self.get_vm()
+ dest_vm = self.get_vm('-incoming', dest_uri)
+ dest_vm.launch()
+ if src_uri is None:
+ src_uri = dest_uri
+ source_vm.launch()
+ source_vm.qmp('migrate', uri=src_uri)
+ self.assert_migration(source_vm, dest_vm)
+
def _get_free_port(self):
port = network.find_free_port()
if port is None:
@@ -32,19 +52,5 @@ class Migration(Test):
def test_migration_with_tcp_localhost(self):
- source_vm = self.get_vm()
dest_uri = 'tcp:localhost:%u' % self._get_free_port()
- dest_vm = self.get_vm('-incoming', dest_uri)
- dest_vm.launch()
- source_vm.launch()
- source_vm.qmp('migrate', uri=dest_uri)
- wait.wait_for(
- self.migration_finished,
- timeout=self.timeout,
- step=0.1,
- args=(source_vm,)
- )
- self.assertEqual(dest_vm.command('query-migrate')['status'], 'completed')
- self.assertEqual(source_vm.command('query-migrate')['status'], 'completed')
- self.assertEqual(dest_vm.command('query-status')['status'], 'running')
- self.assertEqual(source_vm.command('query-status')['status'], 'postmigrate')
+ self.do_migrate(dest_uri)
--
2.21.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-04 14:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-03 10:52 [PATCH v3 0/2] Acceptance test: provides to use different transport for migration Oksana Vohchana
2020-02-03 10:52 ` [PATCH v3 1/2] " Oksana Vohchana
2020-02-03 10:52 ` [PATCH v3 2/2] " Oksana Vohchana
2020-02-03 11:16 [PATCH v3 0/2] " Oksana Vohchana
2020-02-03 11:16 ` [PATCH v3 1/2] " Oksana Vohchana
2020-02-04 14:09 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.