| Message ID | 20160928205602.17275-13-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 28.09.2016 um 22:56 hat Max Reitz geschrieben: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/147 | 201 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/147.out | 5 ++ > tests/qemu-iotests/group | 1 + > 3 files changed, 207 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..61e1e6f > --- /dev/null > +++ b/tests/qemu-iotests/147 > @@ -0,0 +1,201 @@ > +#!/usr/bin/env python > +# > +# Test case for NBD's blockdev-add interface > +# > +# 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 = { 'node-name': 'nbd-blockdev', > + '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) This needs a rebase (**bao instead of options=bao). > + self.assert_qmp(result, 'return', {}) > + > + result = self.vm.qmp('query-named-block-nodes') > + for node in result['return']: > + if node['node-name'] == 'nbd-blockdev': > + self.assert_qmp(node, 'image/filename', filename) > + break > + > + result = self.vm.qmp('x-blockdev-del', node_name='nbd-blockdev') > + 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() > + > + def tearDown(self): > + self.vm.shutdown() > + os.remove(test_img) > + > + def _server_up(self, *args): > + self.assertEqual(qemu_nbd('-f', imgfmt, test_img, *args), 0) > + > + 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) > + try: > + os.remove(socket) > + except OSError: > + pass If the test case fails, the socket file is leaked. We should probably either create and remove it in setUp()/tearDown(), or use a try/finally block around the test_unix code. Kevin
On 13.10.2016 15:26, Kevin Wolf wrote: > Am 28.09.2016 um 22:56 hat Max Reitz geschrieben: >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> tests/qemu-iotests/147 | 201 +++++++++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/147.out | 5 ++ >> tests/qemu-iotests/group | 1 + >> 3 files changed, 207 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..61e1e6f >> --- /dev/null >> +++ b/tests/qemu-iotests/147 >> @@ -0,0 +1,201 @@ >> +#!/usr/bin/env python >> +# >> +# Test case for NBD's blockdev-add interface >> +# >> +# 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 = { 'node-name': 'nbd-blockdev', >> + '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) > > This needs a rebase (**bao instead of options=bao). > >> + self.assert_qmp(result, 'return', {}) >> + >> + result = self.vm.qmp('query-named-block-nodes') >> + for node in result['return']: >> + if node['node-name'] == 'nbd-blockdev': >> + self.assert_qmp(node, 'image/filename', filename) >> + break >> + >> + result = self.vm.qmp('x-blockdev-del', node_name='nbd-blockdev') >> + 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() >> + >> + def tearDown(self): >> + self.vm.shutdown() >> + os.remove(test_img) >> + >> + def _server_up(self, *args): >> + self.assertEqual(qemu_nbd('-f', imgfmt, test_img, *args), 0) >> + >> + 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) >> + try: >> + os.remove(socket) >> + except OSError: >> + pass > > If the test case fails, the socket file is leaked. We should probably > either create and remove it in setUp()/tearDown(), or use a try/finally > block around the test_unix code. Yes, will do, thanks. Max
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 new file mode 100755 index 0000000..61e1e6f --- /dev/null +++ b/tests/qemu-iotests/147 @@ -0,0 +1,201 @@ +#!/usr/bin/env python +# +# Test case for NBD's blockdev-add interface +# +# 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 = { 'node-name': 'nbd-blockdev', + '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-named-block-nodes') + for node in result['return']: + if node['node-name'] == 'nbd-blockdev': + self.assert_qmp(node, 'image/filename', filename) + break + + result = self.vm.qmp('x-blockdev-del', node_name='nbd-blockdev') + 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() + + def tearDown(self): + self.vm.shutdown() + os.remove(test_img) + + def _server_up(self, *args): + self.assertEqual(qemu_nbd('-f', imgfmt, test_img, *args), 0) + + 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) + try: + os.remove(socket) + except OSError: + pass + + +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() + try: + os.remove(socket) + except OSError: + pass + + 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() + + try: + os.remove(sockfile) + except OSError: + pass + + +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 7eb1770..d7d50cf 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -149,6 +149,7 @@ 144 rw auto quick 145 auto quick 146 auto quick +147 auto 148 rw auto quick 149 rw auto sudo 150 rw auto quick
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/147 | 201 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/147.out | 5 ++ tests/qemu-iotests/group | 1 + 3 files changed, 207 insertions(+) create mode 100755 tests/qemu-iotests/147 create mode 100644 tests/qemu-iotests/147.out