[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add i
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface |
Date: |
Tue, 1 Mar 2016 00:19:33 +0100 |
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/147 | 194 +++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/147.out | 5 ++
tests/qemu-iotests/group | 1 +
3 files changed, 200 insertions(+)
create mode 100755 tests/qemu-iotests/147
create mode 100644 tests/qemu-iotests/147.out
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
new file mode 100755
index 0000000..f31de69
--- /dev/null
+++ b/tests/qemu-iotests/147
@@ -0,0 +1,194 @@
+#!/usr/bin/env python
+#
+# Test case for the QMP 'change' command and all other associated
+# commands
+#
+# Copyright (C) 2016 Red Hat, Inc.
+#
+# 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
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import socket
+import stat
+import time
+import iotests
+from iotests import cachemode, imgfmt, qemu_img, qemu_nbd
+
+NBD_PORT = 10811
+
+test_img = os.path.join(iotests.test_dir, 'test.img')
+
+class NBDBlockdevAddBase(iotests.QMPTestCase):
+ def blockdev_add_options(self, address, export=None):
+ options = { 'id': 'drive0',
+ 'driver': 'raw',
+ 'file': {
+ 'driver': 'nbd',
+ 'address': address
+ } }
+ if export is not None:
+ options['file']['export'] = export
+ return options
+
+ def client_test(self, filename, address, export=None):
+ bao = self.blockdev_add_options(address, export)
+ result = self.vm.qmp('blockdev-add', options=bao)
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('query-block')
+ self.assert_qmp(result, 'return[0]/inserted/image/filename', filename)
+
+ result = self.vm.qmp('x-blockdev-del', id='drive0')
+ self.assert_qmp(result, 'return', {})
+
+
+class QemuNBD(NBDBlockdevAddBase):
+ def setUp(self):
+ qemu_img('create', '-f', iotests.imgfmt, test_img, '64k')
+ self.vm = iotests.VM()
+ self.vm.launch()
+ self.qemu_nbd = None
+
+ def tearDown(self):
+ self.vm.shutdown()
+ if self.qemu_nbd is not None:
+ self.qemu_nbd.wait()
+ os.remove(test_img)
+
+ def _server_up(self, *args):
+ self.qemu_nbd = qemu_nbd('-f', imgfmt, test_img, *args)
+ time.sleep(1)
+
+ def test_inet(self):
+ self._server_up('-p', str(NBD_PORT))
+ address = { 'type': 'inet',
+ 'data': {
+ 'host': 'localhost',
+ 'port': str(NBD_PORT)
+ } }
+ self.client_test('nbd://localhost:%i' % NBD_PORT, address)
+
+ def test_unix(self):
+ socket = os.path.join(iotests.test_dir, 'qemu-nbd.socket')
+ self._server_up('-k', socket)
+ address = { 'type': 'unix',
+ 'data': { 'path': socket } }
+ self.client_test('nbd+unix://?socket=' + socket, address)
+ os.remove(socket)
+
+
+class BuiltinNBD(NBDBlockdevAddBase):
+ def setUp(self):
+ qemu_img('create', '-f', iotests.imgfmt, test_img, '64k')
+ self.vm = iotests.VM()
+ self.vm.launch()
+ self.server = iotests.VM('.server')
+ self.server.add_drive_raw('if=none,id=nbd-export,' +
+ 'file=%s,' % test_img +
+ 'format=%s,' % imgfmt +
+ 'cache=%s' % cachemode)
+ self.server.launch()
+
+ def tearDown(self):
+ self.vm.shutdown()
+ self.server.shutdown()
+ os.remove(test_img)
+
+ def _server_up(self, address):
+ result = self.server.qmp('nbd-server-start', addr=address)
+ self.assert_qmp(result, 'return', {})
+
+ result = self.server.qmp('nbd-server-add', device='nbd-export')
+ self.assert_qmp(result, 'return', {})
+
+ def _server_down(self):
+ result = self.server.qmp('nbd-server-stop')
+ self.assert_qmp(result, 'return', {})
+
+ def test_inet(self):
+ address = { 'type': 'inet',
+ 'data': {
+ 'host': 'localhost',
+ 'port': str(NBD_PORT)
+ } }
+ self._server_up(address)
+ self.client_test('nbd://localhost:%i/nbd-export' % NBD_PORT,
+ address, 'nbd-export')
+ self._server_down()
+
+ def test_inet6(self):
+ address = { 'type': 'inet',
+ 'data': {
+ 'host': '::1',
+ 'port': str(NBD_PORT),
+ 'ipv4': False,
+ 'ipv6': True
+ } }
+ filename = 'json:{"driver": "raw", ' + \
+ '"file": {"driver": "nbd", ' + \
+ '"address.data.host": "::1", ' + \
+ '"address.data.ipv4": false, ' + \
+ '"address.data.ipv6": true, ' + \
+ '"address.type": "inet", ' + \
+ '"export": "nbd-export", ' + \
+ '"address.data.port": "%i"}}' % NBD_PORT
+ self._server_up(address)
+ self.client_test(filename, address, 'nbd-export')
+ self._server_down()
+
+ def test_unix(self):
+ socket = os.path.join(iotests.test_dir, 'nbd.socket')
+ address = { 'type': 'unix',
+ 'data': { 'path': socket } }
+ self._server_up(address)
+ self.client_test('nbd+unix:///nbd-export?socket=' + socket,
+ address, 'nbd-export')
+ self._server_down()
+ os.remove(socket)
+
+ def test_fd(self):
+ sockfile = os.path.join(iotests.test_dir, 'nbd.socket')
+ self._server_up({ 'type': 'unix',
+ 'data': { 'path': sockfile } })
+
+ sockfd = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ sockfd.connect(sockfile)
+
+ result = self.vm.send_fd_scm(str(sockfd.fileno()))
+ self.assertEqual(result, 0, 'Failed to send socket FD')
+
+ result = self.vm.qmp('getfd', fdname='nbd-fifo')
+ self.assert_qmp(result, 'return', {})
+
+ filename = 'json:{"driver": "raw", ' + \
+ '"file": {"driver": "nbd", ' + \
+ '"address.type": "fd", ' + \
+ '"export": "nbd-export", ' + \
+ '"address.data.str": "nbd-fifo"}}'
+ self.client_test(filename,
+ { 'type': 'fd',
+ 'data': { 'str': 'nbd-fifo' } },
+ 'nbd-export')
+
+ self._server_down()
+
+ os.remove(sockfile)
+
+
+if __name__ == '__main__':
+ # Need to support image creation
+ iotests.main(supported_fmts=['vpc', 'parallels', 'qcow', 'vdi', 'qcow2',
+ 'vmdk', 'raw', 'vhdx', 'qed'])
+
diff --git a/tests/qemu-iotests/147.out b/tests/qemu-iotests/147.out
new file mode 100644
index 0000000..3f8a935
--- /dev/null
+++ b/tests/qemu-iotests/147.out
@@ -0,0 +1,5 @@
+......
+----------------------------------------------------------------------
+Ran 6 tests
+
+OK
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 47fd40c..28d2f20 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -148,3 +148,4 @@
143 auto quick
144 rw auto quick
145 auto quick
+147 auto
--
2.7.1
- [Qemu-devel] [PATCH v2 04/16] block/nbd: Drop trailing "." in error messages, (continued)
- [Qemu-devel] [PATCH v2 04/16] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 05/16] block/nbd: Reject port parameter without host, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 07/16] block/nbd: Use qdict_put(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 08/16] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 10/16] block/nbd: Accept SocketAddress, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 09/16] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 11/16] block/nbd: Use SocketAddress options, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 15/16] socket_scm_helper: Accept fd directly, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 12/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface,
Max Reitz <=
- [Qemu-devel] [PATCH v2 13/16] iotests.py: Add qemu_nbd function, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 14/16] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/02/29
- Re: [Qemu-devel] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Eric Blake, 2016/02/29