[15/17] iotests: add default node-name

Commit Message

Denis V. Lunev Jan. 9, 2017, 3:57 p.m. UTC

On 11/22/2016 08:54 PM, Vladimir Sementsov-Ogievskiy wrote:
> When testing migration, auto-generated by qemu node-names differs in
> source and destination qemu and migration fails. After this patch,
> auto-generated by iotest nodenames will be the same.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
> ---
>  tests/qemu-iotests/iotests.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index f5ca4b8..264ee20 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -162,7 +162,8 @@ class VM(qtest.QEMUQtestMachine):
>      def add_drive(self, path, opts='', interface='virtio', format=imgfmt):
>          '''Add a virtio-blk drive to the VM'''
>          options = ['if=%s' % interface,
> -                   'id=drive%d' % self._num_drives]
> +                   'id=drive%d' % self._num_drives,
> +                   'node-name=drivenode%d' % self._num_drives]
>  
>          if path is not None:
>              options.append('file=%s' % path)
this patch is rotten, it breaks 041 test

Correct code should be like this as was implemented originally.

Den

Patch

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 28295a2..9272dce 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -199,6 +199,7 @@  class VM(object):
             options.append('file=%s' % path)
             options.append('format=%s' % imgfmt)
             options.append('cache=%s' % cachemode)
+            options.append('node-name=drivenode%d' % self._num_drives)
 
         if opts:
             options.append(opts)