From 6253a26a4ec481dd306e3bf8dc5991687d00d50b Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Tue, 26 Jun 2018 09:48:47 +0200

Subject: [PATCH 78/89] qemu-iotests: Rewrite 207 for blockdev-create job

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20180626094856.6924-65-kwolf@redhat.com>

Patchwork-id: 81083

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 64/73] qemu-iotests: Rewrite 207 for blockdev-create job

Bugzilla: 1513543

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Fam Zheng <famz@redhat.com>

This rewrites the test case 207 to work with the new x-blockdev-create

job rather than the old synchronous version of the command.

Most of the test cases stay the same as before (the exception being some

improved 'size' options that allow distinguishing which command created

the image), but in order to be able to implement proper job handling,

the test case is rewritten in Python.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

(cherry picked from commit 00af19359e8d77e53a09de9a5d3ed6f6e149e0d2)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 tests/qemu-iotests/207     | 440 ++++++++++++++++++++-------------------------

 tests/qemu-iotests/207.out | 107 +++++------

 tests/qemu-iotests/group   |   6 +-

 3 files changed, 257 insertions(+), 296 deletions(-)

diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207

index f5c7785..b595c92 100755

--- a/tests/qemu-iotests/207

+++ b/tests/qemu-iotests/207

@@ -1,9 +1,11 @@

-#!/bin/bash

+#!/usr/bin/env python

 #

 # Test ssh image creation

 #

 # Copyright (C) 2018 Red Hat, Inc.

 #

+# Creator/Owner: Kevin Wolf <kwolf@redhat.com>

+#

 # This program is free software; you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by

 # the Free Software Foundation; either version 2 of the License, or

@@ -18,244 +20,198 @@

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #

-# creator

-owner=kwolf@redhat.com

-

-seq=`basename $0`

-echo "QA output created by $seq"

-

-here=`pwd`

-status=1	# failure is the default!

-

-# get standard environment, filters and checks

-. ./common.rc

-. ./common.filter

-

-_supported_fmt raw

-_supported_proto ssh

-_supported_os Linux

-

-function do_run_qemu()

-{

-    echo Testing: "$@"

-    $QEMU -nographic -qmp stdio -serial none "$@"

-    echo

-}

-

-function run_qemu()

-{

-    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \

-                          | _filter_qemu | _filter_imgfmt \

-                          | _filter_actual_image_size

-}

-

-echo

-echo "=== Successful image creation (defaults) ==="

-echo

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          }

-      },

-      "size": 4194304

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-echo

-TEST_IMG=$TEST_IMG_FILE _img_info | _filter_img_info

-

-echo

-echo "=== Test host-key-check options ==="

-echo

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          },

-          "host-key-check": {

-              "mode": "none"

-          }

-      },

-      "size": 8388608

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          },

-          "host-key-check": {

-              "mode": "known_hosts"

-          }

-      },

-      "size": 4194304

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-

-

-key=$(ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" |

-      cut -d" " -f3 | base64 -d | md5sum -b | cut -d" " -f1)

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          },

-          "host-key-check": {

-              "mode": "hash",

-              "type": "md5",

-              "hash": "wrong"

-          }

-      },

-      "size": 8388608

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          },

-          "host-key-check": {

-              "mode": "hash",

-              "type": "md5",

-              "hash": "$key"

-          }

-      },

-      "size": 8388608

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-

-

-key=$(ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" |

-      cut -d" " -f3 | base64 -d | sha1sum -b | cut -d" " -f1)

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          },

-          "host-key-check": {

-              "mode": "hash",

-              "type": "sha1",

-              "hash": "wrong"

-          }

-      },

-      "size": 4194304

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          },

-          "host-key-check": {

-              "mode": "hash",

-              "type": "sha1",

-              "hash": "$key"

-          }

-      },

-      "size": 4194304

-  }

-}

-{ "execute": "quit" }

-EOF

-

-_img_info | _filter_img_info

-

-echo

-echo "=== Invalid path and user ==="

-echo

-

-run_qemu <

-{ "execute": "qmp_capabilities" }

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "/this/is/not/an/existing/path",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          }

-      },

-      "size": 4194304

-  }

-}

-{ "execute": "x-blockdev-create",

-  "arguments": {

-      "driver": "ssh",

-      "location": {

-          "path": "$TEST_IMG_FILE",

-          "user": "invalid user",

-          "server": {

-              "host": "127.0.0.1",

-              "port": "22"

-          }

-      },

-      "size": 4194304

-  }

-}

-{ "execute": "quit" }

-EOF

-

-# success, all done

-echo "*** done"

-rm -f $seq.full

-status=0

+import iotests

+import subprocess

+import re

+

+iotests.verify_image_format(supported_fmts=['raw'])

+iotests.verify_protocol(supported=['ssh'])

+

+def filter_hash(msg):

+    return re.sub("'hash': '[0-9a-f]+'", "'hash': HASH", msg)

+

+def blockdev_create(vm, options):

+    result = vm.qmp_log('x-blockdev-create', job_id='job0', options=options,

+                        filters=[iotests.filter_testfiles, filter_hash])

+

+    if 'return' in result:

+        assert result['return'] == {}

+        vm.run_job('job0')

+    iotests.log("")

+

+with iotests.FilePath('t.img') as disk_path, \

+     iotests.VM() as vm:

+

+    remote_path = iotests.remote_filename(disk_path)

+

+    #

+    # Successful image creation (defaults)

+    #

+    iotests.log("=== Successful image creation (defaults) ===")

+    iotests.log("")

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              }

+                          },

+                          'size': 4194304 })

+    vm.shutdown()

+

+    iotests.img_info_log(remote_path, filter_path=disk_path)

+    iotests.log("")

+    iotests.img_info_log(disk_path)

+

+    #

+    # Test host-key-check options

+    #

+    iotests.log("=== Test host-key-check options ===")

+    iotests.log("")

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'none'

+                              }

+                          },

+                          'size': 8388608 })

+    vm.shutdown()

+

+    iotests.img_info_log(remote_path, filter_path=disk_path)

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'known_hosts'

+                              }

+                          },

+                          'size': 4194304 })

+    vm.shutdown()

+

+    iotests.img_info_log(remote_path, filter_path=disk_path)

+

+    md5_key = subprocess.check_output(

+        'ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" | ' +

+        'cut -d" " -f3 | base64 -d | md5sum -b | cut -d" " -f1',

+        shell=True).rstrip()

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'hash',

+                                  'type': 'md5',

+                                  'hash': 'wrong',

+                              }

+                          },

+                          'size': 2097152 })

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'hash',

+                                  'type': 'md5',

+                                  'hash': md5_key,

+                              }

+                          },

+                          'size': 8388608 })

+    vm.shutdown()

+

+    iotests.img_info_log(remote_path, filter_path=disk_path)

+

+    sha1_key = subprocess.check_output(

+        'ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" | ' +

+        'cut -d" " -f3 | base64 -d | sha1sum -b | cut -d" " -f1',

+        shell=True).rstrip()

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'hash',

+                                  'type': 'sha1',

+                                  'hash': 'wrong',

+                              }

+                          },

+                          'size': 2097152 })

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'hash',

+                                  'type': 'sha1',

+                                  'hash': sha1_key,

+                              }

+                          },

+                          'size': 4194304 })

+    vm.shutdown()

+

+    iotests.img_info_log(remote_path, filter_path=disk_path)

+

+    #

+    # Invalid path and user

+    #

+    iotests.log("=== Invalid path and user ===")

+    iotests.log("")

+

+    vm.launch()

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': '/this/is/not/an/existing/path',

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'none'

+                              }

+                          },

+                          'size': 4194304 })

+    blockdev_create(vm, { 'driver': 'ssh',

+                          'location': {

+                              'path': disk_path,

+                              'user': 'invalid user',

+                              'server': {

+                                  'host': '127.0.0.1',

+                                  'port': '22'

+                              },

+                              'host-key-check': {

+                                  'mode': 'none'

+                              }

+                          },

+                          'size': 4194304 })

+    vm.shutdown()

diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out

index 417deee..5eee17b 100644

--- a/tests/qemu-iotests/207.out

+++ b/tests/qemu-iotests/207.out

@@ -1,75 +1,80 @@

-QA output created by 207

-

 === Successful image creation (defaults) ===

-Testing:

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

+{u'return': {}}

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

-image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}

+image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 4.0M (4194304 bytes)

-image: TEST_DIR/t.IMGFMT

+

+image: TEST_IMG

 file format: IMGFMT

 virtual size: 4.0M (4194304 bytes)

 === Test host-key-check options ===

-Testing:

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 8388608}}}

+{u'return': {}}

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

-image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}

+image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 8.0M (8388608 bytes)

-Testing:

-QMP_VERSION

-{"return": {}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

-

-image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'known_hosts'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

+{u'return': {}}

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

+

+image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 4.0M (4194304 bytes)

-Testing:

-QMP_VERSION

-{"return": {}}

-{"error": {"class": "GenericError", "desc": "remote host key does not match host_key_check 'wrong'"}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

-

-image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': 'wrong', 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 2097152}}}

+{u'return': {}}

+Job failed: remote host key does not match host_key_check 'wrong'

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 8388608}}}

+{u'return': {}}

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

+

+image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 8.0M (8388608 bytes)

-Testing:

-QMP_VERSION

-{"return": {}}

-{"error": {"class": "GenericError", "desc": "remote host key does not match host_key_check 'wrong'"}}

-{"return": {}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

-

-image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': 'wrong', 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 2097152}}}

+{u'return': {}}

+Job failed: remote host key does not match host_key_check 'wrong'

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

+{u'return': {}}

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

+

+image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}

 file format: IMGFMT

 virtual size: 4.0M (4194304 bytes)

 === Invalid path and user ===

-Testing:

-QMP_VERSION

-{"return": {}}

-{"error": {"class": "GenericError", "desc": "failed to open remote file '/this/is/not/an/existing/path': Failed opening remote file (libssh2 error code: -31)"}}

-{"error": {"class": "GenericError", "desc": "failed to authenticate using publickey authentication and the identities held by your ssh-agent"}}

-{"return": {}}

-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': '/this/is/not/an/existing/path', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

+{u'return': {}}

+Job failed: failed to open remote file '/this/is/not/an/existing/path': Failed opening remote file (libssh2 error code: -31)

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

+

+{'execute': 'x-blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'user': 'invalid user', 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}

+{u'return': {}}

+Job failed: failed to authenticate using publickey authentication and the identities held by your ssh-agent

+{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}

+{u'return': {}}

-*** done

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group

index 3d6ae02..649291a 100644

--- a/tests/qemu-iotests/group

+++ b/tests/qemu-iotests/group

@@ -205,11 +205,11 @@

 204 rw auto quick

 205 rw auto quick

 206 rw auto

-# TODO The following commented out tests need to be reworked to work

-# with the x-blockdev-create job

-#207 rw auto

+207 rw auto

 208 rw auto quick

 209 rw auto quick

+# TODO The following commented out tests need to be reworked to work

+# with the x-blockdev-create job

 #210 rw auto

 #211 rw auto quick

 #212 rw auto quick

-- 

1.8.3.1