shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity
687d7fba4c
libvirt/tests/virstoragetest.c

1190 lines
54 KiB
C
Raw Normal View History

storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
/*
conf: modify tracking of encrypted images A future patch will merge virStorageFileMetadata and virStorageSource, but I found it easier to do if both structs use the same information for tracking whether a source file needs encryption keys. * src/util/virstoragefile.h (_virStorageFileMetadata): Prepare full encryption struct instead of just a bool. * src/storage/storage_backend_fs.c (virStorageBackendProbeTarget): Use transfer semantics. * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshVol): Likewise. * src/util/virstoragefile.c (virStorageFileGetMetadataInternal): Populate struct. (virStorageFileFreeMetadata): Adjust clients. * tests/virstoragetest.c (testStorageChain): Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-02 05:13:51 +04:00
* Copyright (C) 2013-2014 Red Hat, Inc.
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include <config.h>
Include unistd.h where used Include unistd.h in all files that use it, instead of relying on it being pulled in via virutil.h Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-02-17 00:59:28 +03:00
#include <unistd.h>
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
util: extract virStorageFile code into storage_source Up until now we had a runtime code and XML related code in the same source file inside util directory. This patch takes the runtime part and extracts it into the new storage_file directory. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-01-22 12:36:21 +03:00
#include "storage_source.h"
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
#include "testutils.h"
#include "vircommand.h"
util: move virFile* functions from virutil.c to virfile.c These all existed before virfile.c was created, and for some reason weren't moved. This is mostly straightfoward, although the syntax rule prohibiting write() had to be changed to have an exception for virfile.c instead of virutil.c. This movement pointed out that there is a function called virBuildPath(), and another almost identical function called virFileBuildPath(). They really should be a single function, which I'll take care of as soon as I figure out what the arglist should look like.
2013-05-09 22:59:04 +04:00
#include "virfile.h"
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
#include "virlog.h"
storage: Move virStorageFileGetMetadata to the storage driver My future work will modify the metadata crawler function to use the storage driver file APIs to access the files instead of accessing them directly so that we will be able to request the metadata for remote files too. To avoid linking the storage driver to every helper file using the utils code, the backing chain traversal function needs to be moved to the storage driver source. Additionally the virt-aa-helper and virstoragetest programs need to be linked with the storage driver as a result of this change.
2014-04-24 14:14:01 +04:00
#include "storage/storage_driver.h"
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
#define VIR_FROM_THIS VIR_FROM_NONE
Add virLogSource variables to all source files Any source file which calls the logging APIs now needs to have a VIR_LOG_INIT("source.name") declaration at the start of the file. This provides a static variable of the virLogSource type. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2014-02-28 16:16:17 +04:00
VIR_LOG_INIT("tests.storagetest");
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
#define datadir abs_builddir "/virstoragedata"
static void
testCleanupImages(void)
{
if (chdir(abs_builddir) < 0) {
fprintf(stderr, "unable to return to correct directory, refusing to "
"clean up %s\n", datadir);
return;
}
tests: simplify storage test cleanup No need to spawn a child 'rm' process when we can do it ourselves. * tests/virstoragetest.c (testCleanupImages): Use dedicated helper. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-03 01:52:18 +04:00
virFileDeleteTree(datadir);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
}
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
static virStorageSource *
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
testStorageFileGetMetadata(const char *path,
int format,
tests: storage: Drop format probing from tests Storage drivers now don't allow it so there's no need to test it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2018-06-04 10:39:28 +03:00
uid_t uid, gid_t gid)
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
{
test: storage: Initialize storage source to correct type Stat the path of the storage file being tested to set the correct type into the virStorageSource. This will avoid breaking the test suite when inquiring metadata of directory paths in the next patches.
2014-04-25 23:44:06 +04:00
struct stat st;
virStorageSourceNew: Abort on failure Add an abort() on the class/object allocation failures so that virStorageSourceNew() always returns a virStorageSource and remove checks from all callers. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-09-22 12:04:17 +03:00
g_autoptr(virStorageSource) def = virStorageSourceNew();
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
tests: Rename variable in testStorageFileGetMetadata To prepare for subsequent change to use VIR_AUTOPTR logic rename the @ret to @def. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-08 16:35:56 +03:00
def->type = VIR_STORAGE_TYPE_FILE;
def->format = format;
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
test: storage: Initialize storage source to correct type Stat the path of the storage file being tested to set the correct type into the virStorageSource. This will avoid breaking the test suite when inquiring metadata of directory paths in the next patches.
2014-04-25 23:44:06 +04:00
if (stat(path, &st) == 0) {
if (S_ISDIR(st.st_mode)) {
tests: Rename variable in testStorageFileGetMetadata To prepare for subsequent change to use VIR_AUTOPTR logic rename the @ret to @def. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-08 16:35:56 +03:00
def->type = VIR_STORAGE_TYPE_DIR;
test: storage: Initialize storage source to correct type Stat the path of the storage file being tested to set the correct type into the virStorageSource. This will avoid breaking the test suite when inquiring metadata of directory paths in the next patches.
2014-04-25 23:44:06 +04:00
} else if (S_ISBLK(st.st_mode)) {
tests: Rename variable in testStorageFileGetMetadata To prepare for subsequent change to use VIR_AUTOPTR logic rename the @ret to @def. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-08 16:35:56 +03:00
def->type = VIR_STORAGE_TYPE_BLOCK;
test: storage: Initialize storage source to correct type Stat the path of the storage file being tested to set the correct type into the virStorageSource. This will avoid breaking the test suite when inquiring metadata of directory paths in the next patches.
2014-04-25 23:44:06 +04:00
}
}
tests: use g_strdup instead of VIR_STRDUP Replace all occurrences of if (VIR_STRDUP(a, b) < 0) /* effectively dead code */ with: a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-20 14:49:46 +03:00
def->path = g_strdup(path);
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
virStorageSourceGetMetadata: Use depth limit instead of unique path checking Prevent unbounded chains by limiting the recursion depth of virStorageSourceGetMetadataRecurse to the maximum number of image layers we limit anyways. This removes the last use of virStorageSourceGetUniqueIdentifier which will allow us to delete some crusty old infrastructure which isn't really needed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-03-22 19:21:12 +03:00
/* 20 is picked as an arbitrary depth, since the chains used here don't exceed it */
if (virStorageSourceGetMetadata(def, uid, gid, 20, true) < 0)
util: Introduce VIR_DEFINE_AUTOPTR_FUNC for virStorageSource Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-12 21:17:56 +03:00
return NULL;
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
Drop needless ret variable In few places we have the following code pattern: int ret; ... /* @ret is not accessed here */ ret = f(...); return ret; This pattern can be written less verbose: ... return f(...); This patch was generated with following coccinelle spatch: @@ type T; constant C; expression f; identifier ret; @@ -T ret = C; ... when != ret -ret = f; -return ret; +return f; Afterwards I needed to fix a few places, e.g. comment in virDomainNetIPParseXML() was removed too because coccinelle thinks it refers to @ret while in fact it doesn't. Also in few places it replaced @ret declaration with a few spaces instead of removing the line. But nothing terribly wrong. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2019-10-17 11:10:10 +03:00
return g_steal_pointer(&def);
util: storage: Invert the way recursive metadata retrieval works To avoid having the root of a backing chain present twice in the list we need to invert the working of virStorageFileGetMetadataRecurse. Until now the recursive worker created a new backing chain element from the name and other information passed as arguments. This required us to pass the data of the parent in a deconstructed way and the worker created a new entry for the parent. This patch converts this function so that it just fills in metadata about the parent and creates a backing chain element from those. This removes the duplication of the first element. To avoid breaking the test suite, virstoragetest now calls a wrapper that creates the parent structure explicitly and pre-fills it with the test data with same function signature as previously used.
2014-04-18 16:49:54 +04:00
}
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
static char *
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
testPrepImages(void)
{
virstoragetest: testPrepImages: Use 'qemu-img' to format 'raw' image Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:14:29 +03:00
g_autoptr(virCommand) cmdraw = NULL;
virstoragetest: testPrepImages: Don't reuse 'cmd' pointer Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:13:04 +03:00
g_autoptr(virCommand) cmdqcow2 = NULL;
g_autoptr(virCommand) cmdwrap = NULL;
virstoragetest: Stop rewriting images in 'mymain' For testing of real images formatted by 'qemu-img' it's now sufficient to format them once without the need to rewrtie them since we use the real images only for testing of one scenario. This allows us to also remove most of the global variables holding the path to the images which was necessary when they were being rewritten. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 17:49:03 +03:00
g_autofree char *absraw = g_strdup_printf("%s/raw", datadir);
g_autofree char *absqcow2 = g_strdup_printf("%s/qcow2", datadir);
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
g_autofree char *abswrap = g_strdup_printf("%s/wrap", datadir);
virstoragetest: Stop rewriting images in 'mymain' For testing of real images formatted by 'qemu-img' it's now sufficient to format them once without the need to rewrtie them since we use the real images only for testing of one scenario. This allows us to also remove most of the global variables holding the path to the images which was necessary when they were being rewritten. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 17:49:03 +03:00
g_autofree char *qemuimg = virFindFileInPath("qemu-img");
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
tests: skip virstoragetest on RHEL 5 virstoragetest was failing on RHEL 5, but with no good error message: TEST: virstoragetest 0 FAIL It turns out that qemu-img was so old, that it lacked support for -o backing_file. It didn't help that the test was also using qemu-img from PATH, even after first probing for kvm-img. * tests/virstoragetest.c (testPrepImages): Consistently use discovered binary. Skip instead of fail if qemu-img fails during setup.
2013-02-26 23:45:38 +04:00
if (!qemuimg)
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
return NULL;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
conf: make virstoragetest debug easier I'm tired of alternating between test failures due to bugs in my refactoring work, vs. test failures due to leftovers in the file system from the previous test. This patch has no impact when the testsuite is successful, but doeesn't hurt either. * tests/virstoragetest.c (testPrepImages): Clean up from prior failed test. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:34:15 +04:00
/* Clean up from any earlier failed tests */
virFileDeleteTree(datadir);
virstoragetest: Convert symlink and relative image testing use preformatted images Use prepared test images instead to simplify and clarify the code instead of rewriting existing images multiple times. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 17:30:52 +03:00
if (g_mkdir_with_parents(datadir, 0777) < 0) {
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
VIR_TEST_VERBOSE("unable to create directory '%s'\n", datadir);
return NULL;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
}
Fix typos Signed-off-by: Tim Wiederhake <twiederh@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
2021-09-10 13:48:47 +03:00
/* create the following real backing chain with qcow2 images with absolute
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
* backing and different qcow2 versions:
* datadir/raw <- datadir/qcow2 (qcow2v2) <- datadir/wrap (qcow2v3) */
virstoragetest: testPrepImages: Use 'qemu-img' to format 'raw' image Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:14:29 +03:00
cmdraw = virCommandNewArgList(qemuimg, "create",
"-f", "raw",
absraw, "1k", NULL);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: testPrepImages: Don't reuse 'cmd' pointer Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:13:04 +03:00
cmdqcow2 = virCommandNewArgList(qemuimg, "create",
"-f", "qcow2",
"-F", "raw",
"-b", absraw,
"-o", "compat=0.10",
absqcow2, NULL);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: testPrepImages: Don't reuse 'cmd' pointer Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:13:04 +03:00
cmdwrap = virCommandNewArgList(qemuimg, "create",
"-f", "qcow2",
"-F", "qcow2",
"-b", absqcow2,
"-o", "compat=1.1",
abswrap, NULL);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
if (virCommandRun(cmdraw, NULL) < 0 ||
virCommandRun(cmdqcow2, NULL) < 0 ||
virCommandRun(cmdwrap, NULL) < 0) {
VIR_TEST_VERBOSE("failed to create backing chain in '%s'\n", datadir);
return NULL;
}
tests: skip virstoragetest on RHEL 5 virstoragetest was failing on RHEL 5, but with no good error message: TEST: virstoragetest 0 FAIL It turns out that qemu-img was so old, that it lacked support for -o backing_file. It didn't help that the test was also using qemu-img from PATH, even after first probing for kvm-img. * tests/virstoragetest.c (testPrepImages): Consistently use discovered binary. Skip instead of fail if qemu-img fails during setup.
2013-02-26 23:45:38 +04:00
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
return g_steal_pointer(&abswrap);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
}
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
enum {
EXP_PASS = 0,
EXP_FAIL = 1,
};
struct testChainData
{
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
const char *testname;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
const char *start;
util: use typedefs for enums in "src/util/" directory In "src/util/" there are many enumeration (enum) declarations. Sometimes, it's better using a typedef for variable types, function types and other usages. Other enumeration will be changed to typedef's in the future. Signed-off-by: Julio Faracco <jcfaracco@gmail.com> Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-27 04:15:22 +04:00
virStorageFileFormat format;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
unsigned int flags;
};
tests: storagetest: Unify and reformat storage chain format string All the fields crammed into two lines weren't easy to parse by human eyes. Split up the format string into lines and put it into a central variable so that changes in two places aren't necessary.
2014-05-26 17:38:29 +04:00
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
static int
testStorageChain(const void *args)
{
const struct testChainData *data = args;
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
virStorageSource *elt;
Use g_autoptr instead of VIR_AUTOUNREF Now that all the types using VIR_AUTOUNREF have a cleanup func defined to virObjectUnref, use g_autoptr instead of VIR_AUTOUNREF. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 15:47:50 +03:00
g_autoptr(virStorageSource) meta = NULL;
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *actual = NULL;
g_autofree char *expectpath = g_strdup_printf("%s/virstoragetestdata/out/%s",
abs_srcdir, data->testname);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: testStorageChain: Skip test if filename is NULL Prepare the test runner for skipping individual tests if images can't be formatted rather than the whole virstoragetest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 15:10:51 +03:00
/* If the filename is NULL it means that the images couldn't be created,
* thus skip this particular test. */
if (!data->start)
return EXIT_AM_SKIP;
tests: storage: Drop format probing from tests Storage drivers now don't allow it so there's no need to test it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2018-06-04 10:39:28 +03:00
meta = testStorageFileGetMetadata(data->start, data->format, -1, -1);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
if (!meta) {
if (data->flags & EXP_FAIL) {
virResetLastError();
util: Introduce VIR_DEFINE_AUTOPTR_FUNC for virStorageSource Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-12 21:17:56 +03:00
return 0;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
}
util: Introduce VIR_DEFINE_AUTOPTR_FUNC for virStorageSource Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-12 21:17:56 +03:00
return -1;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
} else if (data->flags & EXP_FAIL) {
fprintf(stderr, "call should have failed\n");
util: Introduce VIR_DEFINE_AUTOPTR_FUNC for virStorageSource Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-12 21:17:56 +03:00
return -1;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
}
tests: storage: Remove unused test modes EXP_WARN and ALLOW_PROBE flags for the testStorageChain cases are no longer used so we can remove them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-12-17 19:49:36 +03:00
if (virGetLastErrorCode()) {
fprintf(stderr, "call should not have reported error\n");
return -1;
}
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
for (elt = meta; virStorageSourceIsBacking(elt); elt = elt->backingStore) {
g_autofree char *strippedPath = virTestStablePath(elt->path);
g_autofree char *strippedBackingStoreRaw = virTestStablePath(elt->backingStoreRaw);
g_autofree char *strippedRelPath = virTestStablePath(elt->relPath);
virBufferAsprintf(&buf,
"path:%s\n"
"backingStoreRaw: %s\n"
"capacity: %lld\n"
"encryption: %d\n"
"relPath:%s\n"
"type:%d\n"
"format:%d\n"
"protocol:%s\n"
"hostname:%s\n\n",
strippedPath,
strippedBackingStoreRaw,
elt->capacity,
!!elt->encryption,
strippedRelPath,
elt->type,
elt->format,
virStorageNetProtocolTypeToString(elt->protocol),
NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL));
}
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
virBufferTrim(&buf, "\n");
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
actual = virBufferContentAndReset(&buf);
if (virTestCompareToFile(actual, expectpath) < 0)
util: Introduce VIR_DEFINE_AUTOPTR_FUNC for virStorageSource Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-12 21:17:56 +03:00
return -1;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
util: Introduce VIR_DEFINE_AUTOPTR_FUNC for virStorageSource Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-12 21:17:56 +03:00
return 0;
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
}
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
struct testLookupData
{
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
virStorageSource *chain;
Add support for addressing backing stores by index Each backing store of a given disk is associated with a unique index (which is also formatted in domain XML) for easier addressing of any particular backing store. With this patch, any backing store can be addressed by its disk target and the index. For example, "vdc[4]" addresses the backing store with index equal to 4 of the disk identified by "vdc" target. Such shorthand can be used in any API in place for a backing file path: virsh blockcommit domain vda --base vda[3] --top vda[2] Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
2014-04-18 16:35:33 +04:00
const char *target;
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
virStorageSource *from;
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
const char *name;
Add support for addressing backing stores by index Each backing store of a given disk is associated with a unique index (which is also formatted in domain XML) for easier addressing of any particular backing store. With this patch, any backing store can be addressed by its disk target and the index. For example, "vdc[4]" addresses the backing store with index equal to 4 of the disk identified by "vdc" target. Such shorthand can be used in any API in place for a backing file path: virsh blockcommit domain vda --base vda[3] --top vda[2] Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
2014-04-18 16:35:33 +04:00
unsigned int expIndex;
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
virStorageSource *expMeta;
virStorageSource *expParent;
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
};
static int
testStorageLookup(const void *args)
{
const struct testLookupData *data = args;
int ret = 0;
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
virStorageSource *result;
virStorageSource *actualParent;
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
storage_source: use virStorageSource prefix for all functions Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-01-21 18:46:14 +03:00
result = virStorageSourceChainLookup(data->chain, data->from,
virStorageSourceChainLookup: Handle names like 'vda[4]' internally All callers of this function called virStorageFileParseChainIndex before. Internalize the logic of that function to prevent multiple calls and passing around unnecessary temporary variables. This is achieved by calling virStorageFileParseBackingStoreStr and using it to fill the values internally. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-01-25 17:02:26 +03:00
data->name, data->target, &actualParent);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
if (!data->expMeta)
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virResetLastError();
virStorageFileChainLookup: Return virStorageSourcePtr Returning both virStorageSourcePtr and its path member does not make a lot of sense. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
2014-04-18 17:25:19 +04:00
if (data->expMeta != result) {
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
fprintf(stderr, "meta: expected %s, got %s\n",
NULLSTR(data->expMeta ? data->expMeta->path : NULL),
NULLSTR(result ? result->path : NULL));
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
ret = -1;
}
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
tests: storage: Replace index testing in testStorageLookup Test the actual index in the returned virStorageSource rather than the parsed one. Some tests need to be adapted as they were on failed lookup. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-01-25 17:15:02 +03:00
if (data->expIndex > 0) {
if (!result) {
fprintf(stderr, "index: resulting lookup is empty, can't match index\n");
ret = -1;
} else {
if (result->id != data->expIndex) {
fprintf(stderr, "index: expected %u, got %u\n", data->expIndex, result->id);
ret = -1;
}
}
}
util: storage: Return complete parent info from virStorageFileChainLookup Instead of just returning the parent path, return the complete parent source structure.
2014-06-25 17:43:04 +04:00
if (data->expParent != actualParent) {
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
fprintf(stderr, "parent: expected %s, got %s\n",
util: storage: Return complete parent info from virStorageFileChainLookup Instead of just returning the parent path, return the complete parent source structure.
2014-06-25 17:43:04 +04:00
NULLSTR(data->expParent ? data->expParent->path : NULL),
NULLSTR(actualParent ? actualParent->path : NULL));
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
ret = -1;
}
return ret;
}
util: storagefile: Introduce universal function to canonicalize paths Introduce a common function that will take a callback to resolve links that will be used to canonicalize paths on various storage systems and add extensive tests.
2014-05-02 21:22:17 +04:00
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
static virStorageSource backingchain[12];
static void
testPathRelativePrepare(void)
{
size_t i;
Use G_N_ELEMENTS instead of ARRAY_CARDINALITY Prefer the GLib version of the macro. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 14:55:26 +03:00
for (i = 0; i < G_N_ELEMENTS(backingchain); i++) {
test: set 'type' field of virStorageSource Set the type so that the iterators will work after upcoming modification.
2017-10-12 21:45:50 +03:00
backingchain[i].type = VIR_STORAGE_TYPE_FILE;
Use G_N_ELEMENTS instead of ARRAY_CARDINALITY Prefer the GLib version of the macro. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 14:55:26 +03:00
if (i < G_N_ELEMENTS(backingchain) - 1)
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
backingchain[i].backingStore = &backingchain[i + 1];
else
backingchain[i].backingStore = NULL;
util: storage: Remove now redundant backingRelative from virStorageSource Now that we store only relative names in virStorageSource's member relPath the backingRelative member is obsolete. Remove it and adapt the code to the removal.
2014-05-27 12:40:59 +04:00
backingchain[i].relPath = NULL;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
}
/* normal relative backing chain */
backingchain[0].path = (char *) "/path/to/some/img";
backingchain[1].path = (char *) "/path/to/some/asdf";
backingchain[1].relPath = (char *) "asdf";
backingchain[2].path = (char *) "/path/to/some/test";
backingchain[2].relPath = (char *) "test";
backingchain[3].path = (char *) "/path/to/some/blah";
backingchain[3].relPath = (char *) "blah";
/* ovirt's backing chain */
backingchain[4].path = (char *) "/path/to/volume/image1";
backingchain[5].path = (char *) "/path/to/volume/image2";
backingchain[5].relPath = (char *) "../volume/image2";
backingchain[6].path = (char *) "/path/to/volume/image3";
backingchain[6].relPath = (char *) "../volume/image3";
backingchain[7].path = (char *) "/path/to/volume/image4";
backingchain[7].relPath = (char *) "../volume/image4";
/* some arbitrarily crazy backing chains */
backingchain[8].path = (char *) "/crazy/base/image";
backingchain[9].path = (char *) "/crazy/base/directory/stuff/volumes/garbage/image2";
backingchain[9].relPath = (char *) "directory/stuff/volumes/garbage/image2";
backingchain[10].path = (char *) "/crazy/base/directory/image3";
backingchain[10].relPath = (char *) "../../../image3";
backingchain[11].path = (char *) "/crazy/base/blah/image4";
backingchain[11].relPath = (char *) "../blah/image4";
}
struct testPathRelativeBacking
{
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 10:16:13 +03:00
virStorageSource *top;
virStorageSource *base;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
const char *expect;
};
static int
testPathRelative(const void *args)
{
const struct testPathRelativeBacking *data = args;
Use g_autofree instead of VIR_AUTOFREE Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOFREE is just an alias for g_autofree. Use the GLib macros directly instead of our custom aliases. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 16:16:31 +03:00
g_autofree char *actual = NULL;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
storage_source: use virStorageSource prefix for all functions Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-01-21 18:46:14 +03:00
if (virStorageSourceGetRelativeBackingPath(data->top,
data->base,
&actual) < 0) {
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
fprintf(stderr, "relative backing path resolution failed\n");
tests: Use VIR_AUTOFREE for various storage tests Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-01 20:03:16 +03:00
return -1;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
}
if (STRNEQ_NULLABLE(data->expect, actual)) {
fprintf(stderr, "relative path resolution from '%s' to '%s': "
"expected '%s', got '%s'\n",
data->top->path, data->base->path,
NULLSTR(data->expect), NULLSTR(actual));
tests: Use VIR_AUTOFREE for various storage tests Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-01 20:03:16 +03:00
return -1;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
}
tests: Use VIR_AUTOFREE for various storage tests Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-02-01 20:03:16 +03:00
return 0;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
}
util: storagefile: Introduce universal function to canonicalize paths Introduce a common function that will take a callback to resolve links that will be used to canonicalize paths on various storage systems and add extensive tests.
2014-05-02 21:22:17 +04:00
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
struct testBackingParseData {
const char *backing;
const char *expect;
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
int rv;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
};
static int
testBackingParse(const void *args)
{
const struct testBackingParseData *data = args;
virbuffer: use g_auto directly for virBuffer Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOCLEAN is just an alias for g_auto. Use the GLib macros directly instead of our custom aliases. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 15:47:50 +03:00
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
Use g_autofree instead of VIR_AUTOFREE Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOFREE is just an alias for g_autofree. Use the GLib macros directly instead of our custom aliases. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 16:16:31 +03:00
g_autofree char *xml = NULL;
Use g_autoptr instead of VIR_AUTOUNREF Now that all the types using VIR_AUTOUNREF have a cleanup func defined to virObjectUnref, use g_autoptr instead of VIR_AUTOUNREF. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-15 15:47:50 +03:00
g_autoptr(virStorageSource) src = NULL;
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
int rc;
int erc = data->rv;
virstoragetest: testBackingParse: Use VIR_DOMAIN_DEF_FORMAT_SECURE when formatting xml We want to format even the secure information in tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
2020-04-14 11:26:24 +03:00
unsigned int xmlformatflags = VIR_DOMAIN_DEF_FORMAT_SECURE;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
/* expect failure return code with NULL expected data */
if (!data->expect)
erc = -1;
if ((rc = virStorageSourceNewFromBackingAbsolute(data->backing, &src)) != erc) {
fprintf(stderr, "expected return value '%d' actual '%d'\n", erc, rc);
return -1;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
}
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
if (!src)
return 0;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
if (src && !data->expect) {
fprintf(stderr, "parsing of backing store string '%s' should "
"have failed\n", data->backing);
tests: storage: Refactor cleanup in testBackingParse Automatically clean the temporary buffer and get rid of the cleanup label. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:16:21 +03:00
return -1;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
}
conf: Sanitize handling of <auth> and <encryption> placement for disks Modern way to store <auth> and <encryption> of a <disk> is under <source>. This was added to mirror how <backingStore> handles these and in fact they are relevant to the source rather than to any other part of the disk. Historically we allowed them to be directly under <disk> and we need to keep compatibility. This wasn't a problem until introduction of -blockdev in qemu using of <auth> or <encryption> plainly wouldn't work with backing chains. Now that it works in backing chains and can be moved back and forth using snapshots/block-commit we need to ensure that the original placement is properly kept even if the source changes. To achieve the above semantics we need to store the preferred placement with the disk definition rather than the storage source definitions and also ensure that the modern way is chosen when the VM started with <source/encryption> only in the backing store. https://bugzilla.redhat.com/show_bug.cgi?id=1822878 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-07 15:00:28 +03:00
if (virDomainDiskSourceFormat(&buf, src, "source", 0, false, xmlformatflags,
false, false, NULL) < 0 ||
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
!(xml = virBufferContentAndReset(&buf))) {
fprintf(stderr, "failed to format disk source xml\n");
tests: storage: Refactor cleanup in testBackingParse Automatically clean the temporary buffer and get rid of the cleanup label. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:16:21 +03:00
return -1;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
}
cfg.mk: join not_streq and not_strneq tests The marginally nicer error message is not worth the extra lines in cfg.mk. Also drop the excludes since there was only one offender in the tests.
2016-06-16 15:16:43 +03:00
if (STRNEQ(xml, data->expect)) {
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
fprintf(stderr, "\n backing store string '%s'\n"
"expected storage source xml:\n%s\n"
"actual storage source xml:\n%s\n",
data->backing, data->expect, xml);
tests: storage: Refactor cleanup in testBackingParse Automatically clean the temporary buffer and get rid of the cleanup label. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:16:21 +03:00
return -1;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
}
tests: storage: Refactor cleanup in testBackingParse Automatically clean the temporary buffer and get rid of the cleanup label. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:16:21 +03:00
return 0;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
}
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
static int
mymain(void)
{
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
int ret = 0;
tests: refactor virstoragetest for less stack space I'm about to add fields to virStorageFileMetadata, which means also adding fields to the testFileData struct in virstoragetest. Alas, adding even one pointer on an x86_64 machine gave me a dreaded compiler error: virstoragetest.c:712:1: error: the frame size of 4208 bytes is larger than 4096 bytes [-Werror=frame-larger-than=] After some experimentation, I realized that each test was creating yet another testChainData (which contains testFileData) on the stack; forcing the reuse of one of these structures instead of creating a fresh one each time drastically reduces the size requirements. While at it, I also got rid of a lot of intermediate structs, with some macro magic that lets me directly build up the destination chains inline. For a bit more insight into what this patch does: The old code uses an intermediate variable as a fixed-size array of structs: testFileData chain[] = { a, b }; data.files = chain; In the new code, the use of VIR_FLATTEN_* allows the TEST_CHAIN() macro to still take a single argument for each chain, but now of the form '(a, b)', where it is turned into the var-args 'a, b' multiple arguments understood by TEST_ONE_CHAIN(). Thus, the new code avoids an intermediate variable, and directly provides the list of pointers to be assigned into array elements: data.files = { &a, &b }; * tests/virstoragetest.c (mymain): Rewrite TEST_ONE_CHAIN to reuse the same struct for each test, and to take the data inline rather than via intermediate variables. (testChainData): Use bounded array of pointers instead of unlimited array of struct. (testStorageChain): Reflect struct change. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-04 06:26:59 +04:00
struct testChainData data;
storage: better tests of lookup Add some more tests of what happens when we restrict a lookup to begin at a point in the middle of a chain. In particular, we want to ensure that a parent is not found when starting at the child. This commit also demonstrates that we have a slight difference in behavior on what parent we report when filtering is in effect; as the determination of the parent affects the code in block commit, exposing this in the testsuite will help justify changes in future patches that tweak the semantics of what lookups are allowed. * tests/virstoragetest.c (testStorageLookup): Test user input. (TEST_LOOKUP_TARGET): Add parameter. (mymain): Add lookup tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-06-13 19:23:10 +04:00
struct testLookupData data2;
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
struct testPathRelativeBacking data4;
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
struct testBackingParseData data5;
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
g_autofree char *realchain = NULL;
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
virStorageSource fakeChain[4];
virStorageSource *chain = &fakeChain[0];
virStorageSource *chain2 = &fakeChain[1];
virStorageSource *chain3 = &fakeChain[2];
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
tests: storage: Fully register storage driver Use the full storage driver registration method that also fails if one of the storage backends is not present. This makes the test fail if a submodule fails registration, which is useful for testing. Additionally return EXIT_FAILURE as usual in tests rather than -1.
2017-05-11 17:50:04 +03:00
if (storageRegisterAll() < 0)
return EXIT_FAILURE;
storage: backend: Refactor registration of the backend drivers Add APIs that allow to dynamically register driver backends so that the list of available drivers does not need to be known during compile time. This will allow us to modularize the storage driver on runtime.
2017-01-13 18:50:11 +03:00
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
#define TEST_CHAIN(testname, start, format, flags) \
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
do { \
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
data = (struct testChainData){ testname, start, format, flags }; \
if (virTestRun(testname, testStorageChain, &data) < 0) \
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
ret = -1; \
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
} while (0)
/* Missing file */
virstoragetest: Store output of TEST_CHAIN in output files The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 15:13:29 +03:00
TEST_CHAIN("missing", "bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
/* Raw image, whether with right format or no specified format */
virstoragetest: Use existing file for testing 'raw' image lookup We've already added a 'raw' file to the example image directory so we can use that instead of formatting one. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 15:01:42 +03:00
TEST_CHAIN("raw-raw",
abs_srcdir "/virstoragetestdata/images/raw",
VIR_STORAGE_FILE_RAW, EXP_PASS);
TEST_CHAIN("raw-auto",
abs_srcdir "/virstoragetestdata/images/raw",
VIR_STORAGE_FILE_AUTO, EXP_PASS);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
/* Qcow2 file with relative raw backing, format provided */
virstoragetest: Use preformatted qcow2 image for testing relative paths More preparation for eliminating image rewriting. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 15:08:47 +03:00
TEST_CHAIN("qcow2-qcow2_raw-raw-relative",
abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_PASS);
TEST_CHAIN("qcow2-auto_raw-raw-relative",
abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2",
VIR_STORAGE_FILE_AUTO, EXP_PASS);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: Unify testing of QCOW2 images with absolute backing We have 3 test cases for this currently: 1) "qcow2->raw" 1.1) VIR_STORAGE_FILE_QCOW2 as top level format 1.2) VIR_STORAGE_FILE_AUTO as top level format 2) "wrap->qcow2->raw" whith just VIR_STORAGE_FILE_QCOW2 This patch adds also testing of VIR_STORAGE_FILE_AUTO for case 2) and removes both 1) subcases as they are being actually tested as part of 2). Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 17:44:13 +03:00
/* qcow2 chain with absolute backing formatted with a real qemu-img */
virstoragetest: Don't skip the whole test when qemu-img fails to format images We have plenty of other work to do in this test. Skip only the real image testing case when we can't find qemu-img or it failed to format the image. This allows us to also remove the last global variable in the test and move the creation and cleanup of the images closer to the actual test. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:28:51 +03:00
/* Prep some files with qemu-img; if that is not found on PATH, the test
* using the data skips itself if the data can't be prepared */
realchain = testPrepImages();
TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_raw-raw", realchain, VIR_STORAGE_FILE_QCOW2, EXP_PASS);
TEST_CHAIN("qcow2-auto_qcow2-qcow2_raw-raw", realchain, VIR_STORAGE_FILE_AUTO, EXP_PASS);
testCleanupImages();
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
virstoragetest: Reinstate testing of images without 'backing_fmt' There are important security implications when we'd misprobe those images. This commit reinstates the tests removed by commit 979d1ba3ae13 since 'qemu-img' refused to format them. With the new testing approach with stored images we won't run into that problem. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 18:57:30 +03:00
/* Test various combinations of qcow2 images with missing 'backing_format' */
TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_qcow2-auto",
abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-qcow2_qcow2-auto.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_PASS);
TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_raw-auto",
abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-qcow2_raw-auto.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_PASS);
TEST_CHAIN("qcow2-qcow2_qcow2-auto_qcow2-auto",
abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-auto_qcow2-auto.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_FAIL);
TEST_CHAIN("qcow2-qcow2_qcow2-auto",
abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-auto.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_PASS);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
/* Qcow2 file with missing backing file but specified type */
virstoragetest: Use preformatted file for testing missing backing store Similarly to previous ones, this one doesn't need to be created by qemu-img in order for the test to make sense. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 10:18:03 +03:00
TEST_CHAIN("qcow2-qcow2_missing",
abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-missing.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_FAIL);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
storage: Fix crash when parsing backing store URI with schema The code that parses the schema from the URI touches the "hosts[0]" member of the storage file source structure in case the URI contains a schema. The hosts array was not yet allocated at the point in the code where the transport protocol was parsed and set. This lead to a crash of libvirtd. Fix the code by allocating the "hosts" array upfront and add a test case to verify this scenario. (Unfortunately this requires shuffling the test case numbers too). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1156288
2014-10-29 12:55:23 +03:00
/* Qcow2 file with backing protocol instead of file */
virstoragetest: Use pre-formatted file for non-path extraction test This one doesn't require using qemu-img either. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 10:11:54 +03:00
TEST_CHAIN("qcow2-qcow2_nbd-raw",
abs_srcdir "/virstoragetestdata/images/qcow2_nbd-raw.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_PASS);
storage: Fix crash when parsing backing store URI with schema The code that parses the schema from the URI touches the "hosts[0]" member of the storage file source structure in case the URI contains a schema. The hosts array was not yet allocated at the point in the code where the transport protocol was parsed and set. This lead to a crash of libvirtd. Fix the code by allocating the "hosts" array upfront and add a test case to verify this scenario. (Unfortunately this requires shuffling the test case numbers too). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1156288
2014-10-29 12:55:23 +03:00
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
/* qed file */
virstoragetest: Use a pre-formatted QED file for testing backing store extraction The QED format isn't really being developed any more. Use a pre-formatted image to test the existing code. In this instance we switch to using a relative backing path for simplicity. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 10:06:08 +03:00
TEST_CHAIN("qed-qed_raw",
abs_srcdir "/virstoragetestdata/images/qed_raw-raw-relative",
VIR_STORAGE_FILE_QED, EXP_PASS);
TEST_CHAIN("qed-auto_raw",
abs_srcdir "/virstoragetestdata/images/qed_raw-raw-relative",
VIR_STORAGE_FILE_AUTO, EXP_PASS);
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
conf: test for more scenarios Part of the upcoming refactoring will change how broken chains are detected; it makes sense to test that this works. In particular, test the just-fixed infinite loop detection bug. Also, make sure that detection of directories is sane. * tests/virstoragetest.c (testStorageChain): Enhance test. (mymain): Add more tests. (testCleanupImages, testPrepImages): Populate a directory. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-04 23:35:22 +04:00
/* directory */
virstoragetest: Use existing directory in the source tree for 'directory' probing tests We don't need a special directory for the tests. Reuse the directory holding the data for the virstoragetest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 10:03:06 +03:00
TEST_CHAIN("directory-raw", abs_srcdir "/virstoragetestdata/images/", VIR_STORAGE_FILE_RAW, EXP_PASS);
TEST_CHAIN("directory-none", abs_srcdir "/virstoragetestdata/images/", VIR_STORAGE_FILE_NONE, EXP_PASS);
TEST_CHAIN("directory-dir", abs_srcdir "/virstoragetestdata/images/", VIR_STORAGE_FILE_DIR, EXP_PASS);
conf: test for more scenarios Part of the upcoming refactoring will change how broken chains are detected; it makes sense to test that this works. In particular, test the just-fixed infinite loop detection bug. Also, make sure that detection of directories is sane. * tests/virstoragetest.c (testStorageChain): Enhance test. (mymain): Add more tests. (testCleanupImages, testPrepImages): Populate a directory. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-04 23:35:22 +04:00
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
/* Behavior of symlinks to qcow2 with relative backing files */
virstoragetest: Convert symlink and relative image testing use preformatted images Use prepared test images instead to simplify and clarify the code instead of rewriting existing images multiple times. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-08 17:30:52 +03:00
TEST_CHAIN("qcow2-symlinks",
abs_srcdir "/virstoragetestdata/images/sub/link2",
VIR_STORAGE_FILE_QCOW2, EXP_PASS);
conf: test for more scenarios Part of the upcoming refactoring will change how broken chains are detected; it makes sense to test that this works. In particular, test the just-fixed infinite loop detection bug. Also, make sure that detection of directories is sane. * tests/virstoragetest.c (testStorageChain): Enhance test. (mymain): Add more tests. (testCleanupImages, testPrepImages): Populate a directory. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-04 23:35:22 +04:00
/* Behavior of an infinite loop chain */
virstoragetest: Test backing chain loops with hardcoded images Provide the images for the self and mutual backing image loop cases in the repository rather than formatting them with qemu-img. This makes the code more readable and also decouples the backing chain tests from each other. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-06 17:56:19 +03:00
TEST_CHAIN("qcow2-qcow2_infinite-self",
abs_srcdir "/virstoragetestdata/images/loop-self.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_FAIL);
TEST_CHAIN("qcow2-qcow2_infinite-mutual",
abs_srcdir "/virstoragetestdata/images/loop-2.qcow2",
VIR_STORAGE_FILE_QCOW2, EXP_FAIL);
storage: Allow parsing of RBD backing strings when building backing chain As we now have a common function to parse backing store string for RBD backing store we can reuse it in the backing store walker so that we don't fail on files backed by RBD storage. This patch also adds a few tests to verify that the parsing works as expected.
2014-11-04 19:35:16 +03:00
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
/* setup data for backing chain lookup testing */
if (chdir(abs_srcdir "/virstoragetestdata/lookup") < 0) {
virstoragetest: Remove pointless goto from mymain Improve the error message and abort the test. Continuing here is not desired as without chdiring into the appropriate directory the test would fail anyways and worse could attempt stat-ing random files on the host. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-09 10:53:30 +03:00
VIR_TEST_VERBOSE("failed to chdir into '%s'\n",
abs_srcdir "/virstoragetestdata/lookup");
return EXIT_FAILURE;
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
}
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
memset(fakeChain, 0, sizeof(fakeChain));
fakeChain[0].backingStore = &fakeChain[1];
fakeChain[1].backingStore = &fakeChain[2];
fakeChain[2].backingStore = &fakeChain[3];
fakeChain[0].type = VIR_STORAGE_TYPE_FILE;
fakeChain[1].type = VIR_STORAGE_TYPE_FILE;
fakeChain[2].type = VIR_STORAGE_TYPE_FILE;
fakeChain[0].format = VIR_STORAGE_FILE_QCOW2;
fakeChain[1].format = VIR_STORAGE_FILE_QCOW2;
fakeChain[2].format = VIR_STORAGE_FILE_RAW;
/* backing chain with relative start and absolute backing paths */
fakeChain[0].path = (char *) "wrap";
fakeChain[1].path = (char *) abs_srcdir "/virstoragetestdata/lookup/qcow2";
fakeChain[2].path = (char *) abs_srcdir "/virstoragetestdata/lookup/raw";
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
#define TEST_LOOKUP_TARGET(id, target, from, name, index, meta, parent) \
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
do { \
data2 = (struct testLookupData){ \
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
chain, target, from, name, index, meta, parent, }; \
if (virTestRun("Chain lookup " #id, testStorageLookup, &data2) < 0) \
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
ret = -1; \
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
} while (0)
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
#define TEST_LOOKUP(id, from, name, meta, parent) \
TEST_LOOKUP_TARGET(id, NULL, from, name, 0, meta, parent)
TEST_LOOKUP(0, NULL, "bogus", NULL, NULL);
TEST_LOOKUP(1, chain, "bogus", NULL, NULL);
TEST_LOOKUP(2, NULL, "wrap", chain, NULL);
TEST_LOOKUP(3, chain, "wrap", NULL, NULL);
TEST_LOOKUP(4, chain2, "wrap", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(5, NULL, abs_srcdir "/virstoragetestdata/lookup/wrap", chain, NULL);
TEST_LOOKUP(6, chain, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL);
TEST_LOOKUP(7, chain2, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(8, NULL, "qcow2", chain2, chain);
TEST_LOOKUP(9, chain, "qcow2", chain2, chain);
TEST_LOOKUP(10, chain2, "qcow2", NULL, NULL);
TEST_LOOKUP(11, chain3, "qcow2", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(12, NULL, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain);
TEST_LOOKUP(13, chain, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain);
TEST_LOOKUP(14, chain2, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL);
TEST_LOOKUP(15, chain3, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(16, NULL, "raw", chain3, chain2);
TEST_LOOKUP(17, chain, "raw", chain3, chain2);
TEST_LOOKUP(18, chain2, "raw", chain3, chain2);
TEST_LOOKUP(19, chain3, "raw", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(20, NULL, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
TEST_LOOKUP(21, chain, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
TEST_LOOKUP(22, chain2, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
TEST_LOOKUP(23, chain3, abs_srcdir "/virstoragetestdata/lookup/raw", NULL, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(24, NULL, NULL, chain3, chain2);
TEST_LOOKUP(25, chain, NULL, chain3, chain2);
TEST_LOOKUP(26, chain2, NULL, chain3, chain2);
TEST_LOOKUP(27, chain3, NULL, NULL, NULL);
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
/* relative backing, absolute start */
fakeChain[0].path = (char *) abs_srcdir "/virstoragetestdata/lookup/wrap";
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
fakeChain[1].relPath = (char *) "qcow2";
fakeChain[2].relPath = (char *) "raw";
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(28, NULL, "bogus", NULL, NULL);
TEST_LOOKUP(29, chain, "bogus", NULL, NULL);
TEST_LOOKUP(30, NULL, "wrap", chain, NULL);
TEST_LOOKUP(31, chain, "wrap", NULL, NULL);
TEST_LOOKUP(32, chain2, "wrap", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(33, NULL, abs_srcdir "/virstoragetestdata/lookup/wrap", chain, NULL);
TEST_LOOKUP(34, chain, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL);
TEST_LOOKUP(35, chain2, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(36, NULL, "qcow2", chain2, chain);
TEST_LOOKUP(37, chain, "qcow2", chain2, chain);
TEST_LOOKUP(38, chain2, "qcow2", NULL, NULL);
TEST_LOOKUP(39, chain3, "qcow2", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(40, NULL, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain);
TEST_LOOKUP(41, chain, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain);
TEST_LOOKUP(42, chain2, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL);
TEST_LOOKUP(43, chain3, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(44, NULL, "raw", chain3, chain2);
TEST_LOOKUP(45, chain, "raw", chain3, chain2);
TEST_LOOKUP(46, chain2, "raw", chain3, chain2);
TEST_LOOKUP(47, chain3, "raw", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(48, NULL, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
TEST_LOOKUP(49, chain, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
TEST_LOOKUP(50, chain2, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
TEST_LOOKUP(51, chain3, abs_srcdir "/virstoragetestdata/lookup/raw", NULL, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(52, NULL, NULL, chain3, chain2);
TEST_LOOKUP(53, chain, NULL, chain3, chain2);
TEST_LOOKUP(54, chain2, NULL, chain3, chain2);
TEST_LOOKUP(55, chain3, NULL, NULL, NULL);
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
/* Use link to wrap with cross-directory relative backing */
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
fakeChain[0].path = (char *) abs_srcdir "/virstoragetestdata/lookup/sub/link2";
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
fakeChain[1].relPath = (char *) "../qcow2";
fakeChain[2].relPath = (char *) "raw";
conf: test backing chain lookup I realized that we had no good test coverage of looking up a name from within a backing chain, even though code like block-commit is relying on it. * tests/virstoragetest.c (testStorageLookup): New function. (mymain): New tests. Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-10 23:56:57 +04:00
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(56, NULL, "bogus", NULL, NULL);
TEST_LOOKUP(57, NULL, "sub/link2", chain, NULL);
TEST_LOOKUP(58, NULL, "wrap", chain, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(59, NULL, abs_srcdir "/virstoragetestdata/lookup/wrap", chain, NULL);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(60, NULL, "../qcow2", chain2, chain);
TEST_LOOKUP(61, NULL, "qcow2", NULL, NULL);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(62, NULL, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(63, NULL, "raw", chain3, chain2);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
TEST_LOOKUP(64, NULL, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2);
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP(65, NULL, NULL, chain3, chain2);
virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 19:58:32 +03:00
/* index lookup */
fakeChain[0].id = 0;
fakeChain[1].id = 1;
fakeChain[2].id = 2;
virstoragetest: Remove redundant arguments for chain lookup tests Passing in both "chain*" and "chain*->path" is pointless. Use only the full struct which we can use to infer the rest. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-09-07 18:32:22 +03:00
TEST_LOOKUP_TARGET(66, "vda", NULL, "bogus[1]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(67, "vda", NULL, "vda[-1]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(68, "vda", NULL, "vda[1][1]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(69, "vda", NULL, "wrap", 0, chain, NULL);
TEST_LOOKUP_TARGET(70, "vda", chain, "wrap", 0, NULL, NULL);
TEST_LOOKUP_TARGET(71, "vda", chain2, "wrap", 0, NULL, NULL);
TEST_LOOKUP_TARGET(72, "vda", NULL, "vda[0]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(73, "vda", NULL, "vda[1]", 1, chain2, chain);
TEST_LOOKUP_TARGET(74, "vda", chain, "vda[1]", 1, chain2, chain);
TEST_LOOKUP_TARGET(75, "vda", chain2, "vda[1]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(76, "vda", chain3, "vda[1]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(77, "vda", NULL, "vda[2]", 2, chain3, chain2);
TEST_LOOKUP_TARGET(78, "vda", chain, "vda[2]", 2, chain3, chain2);
TEST_LOOKUP_TARGET(79, "vda", chain2, "vda[2]", 2, chain3, chain2);
TEST_LOOKUP_TARGET(80, "vda", chain3, "vda[2]", 0, NULL, NULL);
TEST_LOOKUP_TARGET(81, "vda", NULL, "vda[3]", 0, NULL, NULL);
Add support for addressing backing stores by index Each backing store of a given disk is associated with a unique index (which is also formatted in domain XML) for easier addressing of any particular backing store. With this patch, any backing store can be addressed by its disk target and the index. For example, "vdc[4]" addresses the backing store with index equal to 4 of the disk identified by "vdc" target. Such shorthand can be used in any API in place for a backing file path: virsh blockcommit domain vda --base vda[3] --top vda[2] Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
2014-04-18 16:35:33 +04:00
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
#define TEST_RELATIVE_BACKING(id, TOP, BASE, EXPECT) \
do { \
data4.top = &TOP; \
data4.base = &BASE; \
data4.expect = EXPECT; \
if (virTestRun("Path relative resolve " #id, \
testPathRelative, &data4) < 0) \
ret = -1; \
util: storage: Add helper to resolve relative path difference This patch introduces a function that will allow us to resolve a relative difference between two elements of a disk backing chain. This function will be used to allow relative block commit and block pull where we need to specify the new relative name of the image to qemu. This patch also adds unit tests for the function to verify that it works correctly.
2014-05-13 12:10:56 +04:00
} while (0)
testPathRelativePrepare();
/* few negative tests first */
/* a non-relative image is in the backing chain span */
TEST_RELATIVE_BACKING(1, backingchain[0], backingchain[1], NULL);
TEST_RELATIVE_BACKING(2, backingchain[0], backingchain[2], NULL);
TEST_RELATIVE_BACKING(3, backingchain[0], backingchain[3], NULL);
TEST_RELATIVE_BACKING(4, backingchain[1], backingchain[5], NULL);
/* image is not in chain (specified backwards) */
TEST_RELATIVE_BACKING(5, backingchain[2], backingchain[1], NULL);
/* positive tests */
TEST_RELATIVE_BACKING(6, backingchain[1], backingchain[1], "asdf");
TEST_RELATIVE_BACKING(7, backingchain[1], backingchain[2], "test");
TEST_RELATIVE_BACKING(8, backingchain[1], backingchain[3], "blah");
TEST_RELATIVE_BACKING(9, backingchain[2], backingchain[2], "test");
TEST_RELATIVE_BACKING(10, backingchain[2], backingchain[3], "blah");
TEST_RELATIVE_BACKING(11, backingchain[3], backingchain[3], "blah");
/* oVirt spelling */
TEST_RELATIVE_BACKING(12, backingchain[5], backingchain[5], "../volume/image2");
TEST_RELATIVE_BACKING(13, backingchain[5], backingchain[6], "../volume/../volume/image3");
TEST_RELATIVE_BACKING(14, backingchain[5], backingchain[7], "../volume/../volume/../volume/image4");
TEST_RELATIVE_BACKING(15, backingchain[6], backingchain[6], "../volume/image3");
TEST_RELATIVE_BACKING(16, backingchain[6], backingchain[7], "../volume/../volume/image4");
TEST_RELATIVE_BACKING(17, backingchain[7], backingchain[7], "../volume/image4");
/* crazy spellings */
TEST_RELATIVE_BACKING(17, backingchain[9], backingchain[9], "directory/stuff/volumes/garbage/image2");
TEST_RELATIVE_BACKING(18, backingchain[9], backingchain[10], "directory/stuff/volumes/garbage/../../../image3");
TEST_RELATIVE_BACKING(19, backingchain[9], backingchain[11], "directory/stuff/volumes/garbage/../../../../blah/image4");
TEST_RELATIVE_BACKING(20, backingchain[10], backingchain[10], "../../../image3");
TEST_RELATIVE_BACKING(21, backingchain[10], backingchain[11], "../../../../blah/image4");
TEST_RELATIVE_BACKING(22, backingchain[11], backingchain[11], "../blah/image4");
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
virTestCounterReset("Backing store parse ");
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
#define TEST_BACKING_PARSE_FULL(bck, xml, rc) \
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
do { \
data5.backing = bck; \
data5.expect = xml; \
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
data5.rv = rc; \
Remove backslash alignment attempts Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2017-11-03 15:09:47 +03:00
if (virTestRun(virTestCounterNext(), \
testBackingParse, &data5) < 0) \
ret = -1; \
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
} while (0)
tests: virstorage: Allow testing return value of virStorageSourceNewFromBackingAbsolute Modify testBackingParse to allow testing other return values of the backing store string parser. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:27:43 +03:00
#define TEST_BACKING_PARSE(bck, xml) \
TEST_BACKING_PARSE_FULL(bck, xml, 0)
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
TEST_BACKING_PARSE("path", "<source file='path'/>\n");
storage: Implement backing store support for "fat:" prefix qemublocktest showed that we don't add the "fat:" prefix for directory storage when formatting the backing store string. While it's unlikely to be used it's simple enough to actually implement the support rather than trying to forbid it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-03-23 18:04:19 +03:00
TEST_BACKING_PARSE("fat:/somedir", "<source dir='/somedir'/>\n");
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
TEST_BACKING_PARSE("://", NULL);
util: storage: Properly parse URIs with missing trailing slash The URI parser used by libvirt does not populate uri->path if the trailing slash is missing. The code virStorageSourceParseBackingURI would then not populate src->path. As only NBD network disks are allowed to have the 'name' field in the XML defining the disk source omitted we'd generate an invalid XML which we'd not parse again. Fix it by populating src->path with an empty string if the uri is lacking slash. As pointed out above NBD is special in this case since we actually allow it being NULL. The URI path is used as export name. Since an empty export does not make sense the new approach clears the src->path if the trailing slash is present but nothing else. Add test cases now to cover all the various cases for NBD and non-NBD uris as there was to time only 1 test abusing the quirk witout slash for NBD and all other URIs contained the slash or in case of NBD also the export name. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2018-10-11 13:22:21 +03:00
TEST_BACKING_PARSE("http://example.com",
"<source protocol='http' name=''>\n"
" <host name='example.com' port='80'/>\n"
"</source>\n");
TEST_BACKING_PARSE("http://example.com/",
"<source protocol='http' name=''>\n"
" <host name='example.com' port='80'/>\n"
"</source>\n");
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
TEST_BACKING_PARSE("http://example.com/file",
"<source protocol='http' name='file'>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='example.com' port='80'/>\n"
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
"</source>\n");
util: storagefile: Flag backing store strings with authentication Using inline authentication for storage volumes will not work properly as libvirt requires use of the secret driver for the auth data and thus would not be able to represent the passwords stored in the backing store string. Make sure that the backing store parsers return 1 which is a sign for the caller to not use the file in certain cases. The test data include iscsi via a json pseudo-protocol string and URIs with the userinfo part being present. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:29:43 +03:00
TEST_BACKING_PARSE_FULL("http://user:pass@example.com/file",
"<source protocol='http' name='file'>\n"
" <host name='example.com' port='80'/>\n"
"</source>\n", 1);
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
TEST_BACKING_PARSE("rbd:testshare:id=asdf:mon_host=example.com",
"<source protocol='rbd' name='testshare'>\n"
" <host name='example.com'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd:example.org:6000:exportname=blah",
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
util: storage: Fix parsing of 'exportname' from legacy NBD strings If the nbd export name contains a colon, our parser would not parse it properly as we split the string by colons. Modify the code to look up the exportname and copy any trailing characters as the export name is supposed to be at the end of the string. https://bugzilla.redhat.com/show_bug.cgi?id=1733044 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
2019-07-31 18:17:30 +03:00
TEST_BACKING_PARSE("nbd:example.org:6000:exportname=:",
"<source protocol='nbd' name=':'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd:example.org:6000:exportname=:test",
"<source protocol='nbd' name=':test'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
virStorageSourceParseNBDColonString: Rewrite to match what qemu does Our implementation wasn't quite able to parse everything that qemu does. This patch rewrites the parser to a code that semantically resembles the combination of 'nbd_parse_filename' and 'inet_parse' methods in qemu to be able to parse the strings in an equivalent manner. The only thing that libvirt doesn't do is to check the lengths of various components in the nbd string in places where qemu uses constant size buffers. The test cases validate that some of the corner cases involving colons are parsed properly. https://bugzilla.redhat.com/show_bug.cgi?id=1826652 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
2020-04-24 14:59:21 +03:00
TEST_BACKING_PARSE("nbd:[::1]:6000:exportname=:test",
"<source protocol='nbd' name=':test'>\n"
" <host name='::1' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd:127.0.0.1:6000:exportname=:test",
"<source protocol='nbd' name=':test'>\n"
" <host name='127.0.0.1' port='6000'/>\n"
"</source>\n");
util: storagefile: Properly set transport type when parsing NBD strings When parsing legacy NBD backing file strings such as 'nbd:unix:/tmp/sock:exportname=/' we'd fail to set the transport to VIR_STORAGE_NET_HOST_TRANS_UNIX. This started to be a problem once we actually started to generate config of the backing store on the command line with -blockdev as the JSON code would try to format it as TCP and fail with: internal error: argument key 'host' must not have null value Set the type properly and add a test. This bug was found by the libguestfs test suite in: https://bugzilla.redhat.com/show_bug.cgi?id=1791614 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reported-by: Ming Xie <mxie@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Richard W.M. Jones <rjones@redhat.com>
2020-01-16 14:34:13 +03:00
TEST_BACKING_PARSE("nbd:unix:/tmp/sock:exportname=/",
"<source protocol='nbd' name='/'>\n"
" <host transport='unix' socket='/tmp/sock'/>\n"
"</source>\n");
virStorageSourceParseNBDColonString: Rewrite to match what qemu does Our implementation wasn't quite able to parse everything that qemu does. This patch rewrites the parser to a code that semantically resembles the combination of 'nbd_parse_filename' and 'inet_parse' methods in qemu to be able to parse the strings in an equivalent manner. The only thing that libvirt doesn't do is to check the lengths of various components in the nbd string in places where qemu uses constant size buffers. The test cases validate that some of the corner cases involving colons are parsed properly. https://bugzilla.redhat.com/show_bug.cgi?id=1826652 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
2020-04-24 14:59:21 +03:00
TEST_BACKING_PARSE("nbd:unix:/tmp/sock:",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/tmp/sock:'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd:unix:/tmp/sock::exportname=:",
"<source protocol='nbd' name=':'>\n"
" <host transport='unix' socket='/tmp/sock:'/>\n"
"</source>\n");
util: storage: Properly parse URIs with missing trailing slash The URI parser used by libvirt does not populate uri->path if the trailing slash is missing. The code virStorageSourceParseBackingURI would then not populate src->path. As only NBD network disks are allowed to have the 'name' field in the XML defining the disk source omitted we'd generate an invalid XML which we'd not parse again. Fix it by populating src->path with an empty string if the uri is lacking slash. As pointed out above NBD is special in this case since we actually allow it being NULL. The URI path is used as export name. Since an empty export does not make sense the new approach clears the src->path if the trailing slash is present but nothing else. Add test cases now to cover all the various cases for NBD and non-NBD uris as there was to time only 1 test abusing the quirk witout slash for NBD and all other URIs contained the slash or in case of NBD also the export name. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2018-10-11 13:22:21 +03:00
TEST_BACKING_PARSE("nbd://example.org:1234",
"<source protocol='nbd'>\n"
" <host name='example.org' port='1234'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd://example.org:1234/",
"<source protocol='nbd'>\n"
" <host name='example.org' port='1234'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd://example.org:1234/exportname",
"<source protocol='nbd' name='exportname'>\n"
" <host name='example.org' port='1234'/>\n"
"</source>\n");
tests: virstorage: Add tests for NBD URI style syntax over UNIX Add few test cases for nbd+unix style URIs with few corner cases. The NBD URI syntax is documented at https://github.com/NetworkBlockDevice/nbd/blob/master/doc/uri.md Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-01-16 15:49:37 +03:00
TEST_BACKING_PARSE("nbd+unix://?socket=/tmp/sock",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/tmp/sock'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd+unix:///?socket=/tmp/sock",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/tmp/sock'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd+unix:////?socket=/tmp/sock",
"<source protocol='nbd' name='/'>\n"
" <host transport='unix' socket='/tmp/sock'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd+unix:///exp?socket=/tmp/sock",
"<source protocol='nbd' name='exp'>\n"
" <host transport='unix' socket='/tmp/sock'/>\n"
"</source>\n");
TEST_BACKING_PARSE("nbd+unix:////exp?socket=/tmp/sock",
"<source protocol='nbd' name='/exp'>\n"
" <host transport='unix' socket='/tmp/sock'/>\n"
"</source>\n");
util: storagefile: Flag backing store strings with authentication Using inline authentication for storage volumes will not work properly as libvirt requires use of the secret driver for the auth data and thus would not be able to represent the passwords stored in the backing store string. Make sure that the backing store parsers return 1 which is a sign for the caller to not use the file in certain cases. The test data include iscsi via a json pseudo-protocol string and URIs with the userinfo part being present. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:29:43 +03:00
TEST_BACKING_PARSE_FULL("iscsi://testuser:testpass@example.org:1234/exportname",
"<source protocol='iscsi' name='exportname'>\n"
" <host name='example.org' port='1234'/>\n"
"</source>\n", 1);
tests: virstoragetest: fix --without-yajl Recently added JSON tests should be skipped if compiled --without-yajl https://bugzilla.redhat.com/show_bug.cgi?id=1463435
2017-06-21 15:55:58 +03:00
Revert "Switch from yajl to Jansson" This reverts commit 9cf38263d05ca7f27dbbd9b1a0b48d338d9280e2. Jansson cannot parse QEMU's quirky JSON. Revert back to yajl. https://bugzilla.redhat.com/show_bug.cgi?id=1614569 Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-08-13 14:40:18 +03:00
#ifdef WITH_YAJL
util: storage: Add parser for qemu's json backing pseudo-protocol Add a modular parser that will allow to parse 'json' backing definitions that are supported by qemu. The initial implementation adds support for the 'file' driver. Due to the approach qemu took to implement the JSON backing strings it's possible to specify them in two approaches. The object approach: json:{ "file" : { "driver":"file", "filename":"/path/to/file" } } And a partially flattened approach: json:{"file.driver":"file" "file.filename":"/path/to/file" } Both of the above are supported by qemu and by the code added in this commit. The current implementation de-flattens the first level ('file.') if possible and required. Other handling may be added later but currently only one level was possible anyways.
2016-04-08 10:55:46 +03:00
TEST_BACKING_PARSE("json:", NULL);
TEST_BACKING_PARSE("json:asdgsdfg", NULL);
TEST_BACKING_PARSE("json:{}", NULL);
TEST_BACKING_PARSE("json: { \"file.driver\":\"blah\"}", NULL);
TEST_BACKING_PARSE("json:{\"file.driver\":\"file\"}", NULL);
TEST_BACKING_PARSE("json:{\"file.driver\":\"file\", "
"\"file.filename\":\"/path/to/file\"}",
"<source file='/path/to/file'/>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"file\", "
"\"filename\":\"/path/to/file\"}", NULL);
TEST_BACKING_PARSE("json:{\"file\" : { \"driver\":\"file\","
"\"filename\":\"/path/to/file\""
"}"
"}",
"<source file='/path/to/file'/>\n");
tests: virstorage: Add test cases for "json:" pseudo-URI without 'file' wrapper Add few cases that prove the second format of "json:" pseudo-URIs. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-02-03 18:40:16 +03:00
TEST_BACKING_PARSE("json:{\"driver\":\"file\","
"\"filename\":\"/path/to/file\""
"}",
"<source file='/path/to/file'/>\n");
util: storage: Add support for host device backing specified via JSON JSON pseudo protocol for qemu allows to explicitly specify devices. Add convertor to the internal type.
2016-07-14 14:58:26 +03:00
TEST_BACKING_PARSE("json:{\"file.driver\":\"host_device\", "
"\"file.filename\":\"/path/to/dev\"}",
"<source dev='/path/to/dev'/>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"host_cdrom\", "
"\"file.filename\":\"/path/to/cdrom\"}",
"<source dev='/path/to/cdrom'/>\n");
util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol http(s), ftp(s) and tftp use URIs for volume definitions in the JSON pseudo protocol so it's pretty straightforward to add support for them.
2016-07-12 18:59:58 +03:00
TEST_BACKING_PARSE("json:{\"file.driver\":\"http\", "
utils: storage: Fix JSON field name for uri based storage qemu uses 'url' instead of 'uri'. They unfortunately look very similar. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1367260
2016-08-16 10:24:12 +03:00
"\"file.url\":\"http://example.com/file\"}",
util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol http(s), ftp(s) and tftp use URIs for volume definitions in the JSON pseudo protocol so it's pretty straightforward to add support for them.
2016-07-12 18:59:58 +03:00
"<source protocol='http' name='file'>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='example.com' port='80'/>\n"
util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol http(s), ftp(s) and tftp use URIs for volume definitions in the JSON pseudo protocol so it's pretty straightforward to add support for them.
2016-07-12 18:59:58 +03:00
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{ \"driver\":\"http\","
utils: storage: Fix JSON field name for uri based storage qemu uses 'url' instead of 'uri'. They unfortunately look very similar. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1367260
2016-08-16 10:24:12 +03:00
"\"url\":\"http://example.com/file\""
util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol http(s), ftp(s) and tftp use URIs for volume definitions in the JSON pseudo protocol so it's pretty straightforward to add support for them.
2016-07-12 18:59:58 +03:00
"}"
"}",
"<source protocol='http' name='file'>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='example.com' port='80'/>\n"
util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol http(s), ftp(s) and tftp use URIs for volume definitions in the JSON pseudo protocol so it's pretty straightforward to add support for them.
2016-07-12 18:59:58 +03:00
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"ftp\", "
utils: storage: Fix JSON field name for uri based storage qemu uses 'url' instead of 'uri'. They unfortunately look very similar. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1367260
2016-08-16 10:24:12 +03:00
"\"file.url\":\"http://example.com/file\"}",
util: storage: Add support for URI based backing volumes in qemu's JSON pseudo-protocol http(s), ftp(s) and tftp use URIs for volume definitions in the JSON pseudo protocol so it's pretty straightforward to add support for them.
2016-07-12 18:59:58 +03:00
NULL);
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
TEST_BACKING_PARSE("json:{\"file.driver\":\"gluster\", "
"\"file.filename\":\"gluster://example.com/vol/file\"}",
"<source protocol='gluster' name='vol/file'>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='example.com' port='24007'/>\n"
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"gluster\","
"\"volume\":\"testvol\","
"\"path\":\"img.qcow2\","
"\"server\":[ { \"type\":\"tcp\","
"\"host\":\"example.com\","
"\"port\":\"1234\""
"},"
"{ \"type\":\"unix\","
"\"socket\":\"/path/socket\""
"},"
"{ \"type\":\"tcp\","
"\"host\":\"example.com\""
"}"
"]"
"}"
"}",
util: storage: Properly set protocol type when parsing gluster json string Commit 2ed772cd forgot to set proper protocol. This was also present in the test data. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1372251
2016-09-05 16:31:44 +03:00
"<source protocol='gluster' name='testvol/img.qcow2'>\n"
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
" <host name='example.com' port='1234'/>\n"
" <host transport='unix' socket='/path/socket'/>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='example.com' port='24007'/>\n"
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"gluster\","
"\"file.volume\":\"testvol\","
"\"file.path\":\"img.qcow2\","
"\"file.server\":[ { \"type\":\"tcp\","
"\"host\":\"example.com\","
"\"port\":\"1234\""
"},"
"{ \"type\":\"unix\","
"\"socket\":\"/path/socket\""
"},"
util: storage: Add support for type 'inet' in virStorageSourceParseBackingJSONSocketAddress 'SocketAddress' structure was changed to contain 'inet' instead of 'tcp' since qemu commit c5f1ae3ae7b. Existing entries have a backward compatibility layer. Libvirt will parse 'inet' and 'tcp' as equivalents.
2017-06-19 15:37:47 +03:00
"{ \"type\":\"inet\","
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
"\"host\":\"example.com\""
"}"
"]"
"}",
util: storage: Properly set protocol type when parsing gluster json string Commit 2ed772cd forgot to set proper protocol. This was also present in the test data. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1372251
2016-09-05 16:31:44 +03:00
"<source protocol='gluster' name='testvol/img.qcow2'>\n"
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
" <host name='example.com' port='1234'/>\n"
" <host transport='unix' socket='/path/socket'/>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='example.com' port='24007'/>\n"
util: storage: Add json pseudo protocol support for gluster volumes Along with the legacy URI based syntax add support for the brand-new fully object based syntax.
2016-07-13 16:35:29 +03:00
"</source>\n");
tests: virstoragetest: validate that array deflattening works for gluster Validate that we are able to parse back the dotted syntax arrays we were generating in the pre-blockdev era. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2017-12-14 20:01:05 +03:00
TEST_BACKING_PARSE("json:{\"driver\": \"raw\","
"\"file\": {\"server.0.host\": \"A.A.A.A\","
"\"server.1.host\": \"B.B.B.B\","
"\"server.2.host\": \"C.C.C.C\","
"\"driver\": \"gluster\","
"\"path\": \"raw\","
"\"server.0.type\": \"tcp\","
"\"server.1.type\": \"tcp\","
"\"server.2.type\": \"tcp\","
"\"server.0.port\": \"24007\","
"\"server.1.port\": \"24007\","
"\"server.2.port\": \"24007\","
"\"volume\": \"vol1\"}}",
"<source protocol='gluster' name='vol1/raw'>\n"
" <host name='A.A.A.A' port='24007'/>\n"
" <host name='B.B.B.B' port='24007'/>\n"
" <host name='C.C.C.C' port='24007'/>\n"
"</source>\n");
util: storage: Add JSON backing volume parser for 'nbd' protocol
2016-07-14 09:10:31 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"path\":\"/path/to/socket\""
"}"
"}",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/to/socket'/>\n"
"</source>\n");
tests: virstorage: Add test cases for "json:" pseudo-URI without 'file' wrapper Add few cases that prove the second format of "json:" pseudo-URIs. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-02-03 18:40:16 +03:00
TEST_BACKING_PARSE("json:{\"driver\":\"nbd\","
"\"path\":\"/path/to/socket\""
"}",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/to/socket'/>\n"
"</source>\n");
util: storage: Add JSON backing volume parser for 'nbd' protocol
2016-07-14 09:10:31 +03:00
TEST_BACKING_PARSE("json:{\"file.driver\":\"nbd\","
"\"file.path\":\"/path/to/socket\""
"}",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/to/socket'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"export\":\"blah\","
"\"host\":\"example.org\","
"\"port\":\"6000\""
"}"
"}",
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"nbd\","
"\"file.export\":\"blah\","
"\"file.host\":\"example.org\","
"\"file.port\":\"6000\""
"}",
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
util: storage: adapt to changes in JSON format for NBD Since 2.9 the host and port for NBD are no longer directly under the json pseudo-protocol object, but rather belong to a sub-object called 'server'.
2017-06-15 18:44:18 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"export\":\"blah\","
"\"server\": { \"type\":\"inet\","
"\"host\":\"example.org\","
"\"port\":\"6000\""
"}"
"}"
"}",
"<source protocol='nbd' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
virstoragetest: Add test case for NBD over unix socket with new syntax Use the new syntax which uses the 'UnixSocket' type in qemu. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2018-02-12 18:16:42 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nbd\","
"\"server\": { \"type\":\"unix\","
"\"path\":\"/path/socket\""
"}"
"}"
"}",
"<source protocol='nbd'>\n"
" <host transport='unix' socket='/path/socket'/>\n"
"</source>\n");
util: storage: Add JSON backing volume parser for 'ssh' protocol
2016-07-15 16:12:10 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"ssh\","
"\"host\":\"example.org\","
"\"port\":\"6000\","
"\"path\":\"blah\","
"\"user\":\"user\""
"}"
"}",
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file.driver\":\"ssh\","
"\"file.host\":\"example.org\","
"\"file.port\":\"6000\","
"\"file.path\":\"blah\","
"\"file.user\":\"user\""
"}",
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
util: storage: adapt to changes in JSON format for ssh Since qemu 2.9 the options changed from a monolithic string into fine grained options for the json pseudo-protocol object.
2017-06-15 18:44:18 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"ssh\","
"\"path\":\"blah\","
"\"server\":{ \"host\":\"example.org\","
"\"port\":\"6000\""
"},"
"\"user\":\"user\""
"}"
"}",
"<source protocol='ssh' name='blah'>\n"
" <host name='example.org' port='6000'/>\n"
"</source>\n");
util: storage: Add json pseudo protocol support for legacy RBD strings RBD in qemu still uses only the legacy 'filename' syntax. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1371758
2016-09-05 16:15:22 +03:00
TEST_BACKING_PARSE("json:{\"file.driver\":\"rbd\","
"\"file.filename\":\"rbd:testshare:id=asdf:mon_host=example.com\""
"}",
"<source protocol='rbd' name='testshare'>\n"
" <host name='example.com'/>\n"
"</source>\n");
util: storage: adapt to changes in JSON format for ceph/rbd Since qemu 2.9 the options changed from a monolithic string into fine grained options for the json pseudo-protocol object.
2017-06-15 18:44:18 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"rbd\","
"\"image\":\"test\","
"\"pool\":\"libvirt\","
"\"conf\":\"/path/to/conf\","
"\"snapshot\":\"snapshotname\","
"\"server\":[ {\"host\":\"example.com\","
"\"port\":\"1234\""
"},"
"{\"host\":\"example2.com\""
"}"
"]"
"}"
"}",
"<source protocol='rbd' name='libvirt/test'>\n"
" <host name='example.com' port='1234'/>\n"
" <host name='example2.com'/>\n"
" <snapshot name='snapshotname'/>\n"
" <config file='/path/to/conf'/>\n"
"</source>\n");
util: storage: add JSON backing volume parser 'raw' block driver The 'raw' block driver in Qemu is not directly interesting from libvirt's perspective, but it can be layered above some other block drivers and this may be interesting for the user. The patch adds support for the 'raw' block driver. The driver is treated simply as a pass-through and child driver in JSON is queried to get the necessary information. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
2017-02-14 01:53:43 +03:00
TEST_BACKING_PARSE("json:{ \"file\": { "
"\"driver\": \"raw\","
"\"file\": {"
"\"driver\": \"file\","
"\"filename\": \"/path/to/file\" } } }",
"<source file='/path/to/file'/>\n");
util: storage: Add JSON parser for new options in iSCSI protocol Starting from qemu 2.9, more granular options are supported. Add parser for the relevant bits. With this patch libvirt is able to parse the host and target IQN of from the JSON pseudo-protocol specification. This corresponds to BlockdevOptionsIscsi in qemu qapi.
2017-06-15 18:12:01 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"iscsi\","
"\"transport\":\"tcp\","
"\"portal\":\"test.org\","
"\"target\":\"iqn.2016-12.com.virttest:emulated-iscsi-noauth.target\""
"}"
"}",
"<source protocol='iscsi' name='iqn.2016-12.com.virttest:emulated-iscsi-noauth.target/0'>\n"
util: storage: fill in default ports when parsing backing chain Similarly to when parsing XML we need to fill in default ports for the backing chain. This was missed in commit 5bda835466a8050625dd8bb10566e
2017-07-20 15:18:04 +03:00
" <host name='test.org' port='3260'/>\n"
util: storage: Add JSON parser for new options in iSCSI protocol Starting from qemu 2.9, more granular options are supported. Add parser for the relevant bits. With this patch libvirt is able to parse the host and target IQN of from the JSON pseudo-protocol specification. This corresponds to BlockdevOptionsIscsi in qemu qapi.
2017-06-15 18:12:01 +03:00
"</source>\n");
util: storagefile: Flag backing store strings with authentication Using inline authentication for storage volumes will not work properly as libvirt requires use of the secret driver for the auth data and thus would not be able to represent the passwords stored in the backing store string. Make sure that the backing store parsers return 1 which is a sign for the caller to not use the file in certain cases. The test data include iscsi via a json pseudo-protocol string and URIs with the userinfo part being present. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-08-15 20:29:43 +03:00
TEST_BACKING_PARSE_FULL("json:{\"file\":{\"driver\":\"iscsi\","
"\"transport\":\"tcp\","
"\"portal\":\"test.org\","
"\"user\":\"testuser\","
"\"target\":\"iqn.2016-12.com.virttest:emulated-iscsi-auth.target\""
"}"
"}",
"<source protocol='iscsi' name='iqn.2016-12.com.virttest:emulated-iscsi-auth.target/0'>\n"
" <host name='test.org' port='3260'/>\n"
"</source>\n", 1);
TEST_BACKING_PARSE_FULL("json:{\"file\":{\"driver\":\"iscsi\","
"\"transport\":\"tcp\","
"\"portal\":\"test.org\","
"\"password\":\"testpass\","
"\"target\":\"iqn.2016-12.com.virttest:emulated-iscsi-auth.target\""
"}"
"}",
"<source protocol='iscsi' name='iqn.2016-12.com.virttest:emulated-iscsi-auth.target/0'>\n"
" <host name='test.org' port='3260'/>\n"
"</source>\n", 1);
util: storage: Add JSON parser for new options in iSCSI protocol Starting from qemu 2.9, more granular options are supported. Add parser for the relevant bits. With this patch libvirt is able to parse the host and target IQN of from the JSON pseudo-protocol specification. This corresponds to BlockdevOptionsIscsi in qemu qapi.
2017-06-15 18:12:01 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"iscsi\","
"\"transport\":\"tcp\","
"\"portal\":\"test.org:1234\","
"\"target\":\"iqn.2016-12.com.virttest:emulated-iscsi-noauth.target\","
util: storage: Parse 'lun' for iSCSI protocol from JSON as string or number While the QEMU QAPI schema describes 'lun' as a number, the code dealing with JSON strings does not strictly adhere to this schema and thus formats the number back as a string. Use the new helper to retrieve both possibilities. Note that the formatting code is okay and qemu will accept it as an int. Tweak also one of the test strings to verify that both formats work with libvirt. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1540290
2018-01-31 14:00:42 +03:00
"\"lun\":\"6\""
util: storage: Add JSON parser for new options in iSCSI protocol Starting from qemu 2.9, more granular options are supported. Add parser for the relevant bits. With this patch libvirt is able to parse the host and target IQN of from the JSON pseudo-protocol specification. This corresponds to BlockdevOptionsIscsi in qemu qapi.
2017-06-15 18:12:01 +03:00
"}"
"}",
"<source protocol='iscsi' name='iqn.2016-12.com.virttest:emulated-iscsi-noauth.target/6'>\n"
" <host name='test.org' port='1234'/>\n"
"</source>\n");
util: storage: Fix parsing of IPv6 portal address for iSCSI Split on the last colon and avoid parsing port if the split remainder contains the closing square bracket, so that IPv6 addresses are interpreted correctly.
2017-11-07 18:20:23 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"iscsi\","
"\"transport\":\"tcp\","
"\"portal\":\"[2001::0]:1234\","
"\"target\":\"iqn.2016-12.com.virttest:emulated-iscsi-noauth.target\","
"\"lun\":6"
"}"
"}",
"<source protocol='iscsi' name='iqn.2016-12.com.virttest:emulated-iscsi-noauth.target/6'>\n"
" <host name='[2001::0]' port='1234'/>\n"
"</source>\n");
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"iscsi\","
"\"transport\":\"tcp\","
"\"portal\":\"[2001::0]\","
"\"target\":\"iqn.2016-12.com.virttest:emulated-iscsi-noauth.target\","
"\"lun\":6"
"}"
"}",
"<source protocol='iscsi' name='iqn.2016-12.com.virttest:emulated-iscsi-noauth.target/6'>\n"
" <host name='[2001::0]' port='3260'/>\n"
"</source>\n");
util: storage: adapt to changes in JSON format for sheepdog Since qemu 2.9 the options changed from a monolithic string into fine grained options for the json pseudo-protocol object.
2017-06-15 18:44:18 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"sheepdog\","
"\"vdi\":\"test\","
"\"server\":{ \"type\":\"inet\","
"\"host\":\"example.com\","
"\"port\":\"321\""
"}"
"}"
"}",
"<source protocol='sheepdog' name='test'>\n"
" <host name='example.com' port='321'/>\n"
"</source>\n");
tests: Validate that JSON deflattening fixed nested json pseudo-protocol strings Sheepdog and possibly others use nested objects for network server and thus could be specified in a way that libvirt would not parse. Validates that https://bugzilla.redhat.com/show_bug.cgi?id=1464821 is fixed properly.
2017-06-26 20:42:06 +03:00
TEST_BACKING_PARSE("json:{\"driver\": \"raw\","
"\"file\": {\"server.host\": \"10.10.10.10\","
"\"server.port\": \"7000\","
"\"tag\": \"\","
"\"driver\": \"sheepdog\","
"\"server.type\": \"inet\","
"\"vdi\": \"Alice\"}}",
"<source protocol='sheepdog' name='Alice'>\n"
" <host name='10.10.10.10' port='7000'/>\n"
"</source>\n");
util: storage: Add JSON backing volume parse for VxHS Add the backing parse and a test case to verify parsing of VxHS backing storage. Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com> Signed-off-by: John Ferlan <jferlan@redhat.com>
2017-08-30 16:46:50 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"vxhs\","
"\"vdisk-id\":\"c6718f6b-0401-441d-a8c3-1f0064d75ee0\","
qemu: block: Use proper type for servers for VxHS disks Original implementation used 'SocketAddress' equivalent from qemu for the disk server field, while qemu documentation specifies 'InetSocketAddress'. The backing store parser uses the correct parsing function but the formatter used the incorrect one (and also with the legacy mode enabled which was wrong).
2017-10-23 19:02:28 +03:00
"\"server\": { \"host\":\"example.com\","
util: storage: Add JSON backing volume parse for VxHS Add the backing parse and a test case to verify parsing of VxHS backing storage. Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com> Signed-off-by: John Ferlan <jferlan@redhat.com>
2017-08-30 16:46:50 +03:00
"\"port\":\"9999\""
"}"
"}"
"}",
"<source protocol='vxhs' name='c6718f6b-0401-441d-a8c3-1f0064d75ee0'>\n"
" <host name='example.com' port='9999'/>\n"
"</source>\n");
util: virstoragefile: Add 'json:' pseudo-protocol parser for 'nfs' protocol Enable parsing of backing store strings containing the native 'nfs' protocol specification. Signed-off-by: Ryan Gahagan <rgahagan@cs.utexas.edu> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-01-07 00:32:31 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\":\"nfs\","
"\"user\":2,"
"\"group\":9,"
"\"path\":\"/foo/bar/baz\","
"\"server\": { \"host\":\"example.com\","
"\"type\":\"inet\""
"}"
"}"
"}",
"<source protocol='nfs' name='/foo/bar/baz'>\n"
" <host name='example.com'/>\n"
" <identity user='+2' group='+9'/>\n"
"</source>\n");
tests: virstorage: Add test data for json specified raw image with offset/size QEMU allows specifying the offset and size into a raw file to expose a sub-slice of the image to the guest with the raw driver. Libvirt currently doesn't support it but we can add test case for future reference. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-01-16 18:02:15 +03:00
TEST_BACKING_PARSE_FULL("json:{ \"driver\": \"raw\","
"\"offset\": 10752,"
"\"size\": 4063232,"
"\"file\": { \"driver\": \"file\","
"\"filename\": \"/tmp/testfle\""
"}"
"}",
virStorageSourceParseBackingJSONRaw: Parse 'offset' and 'size' attributes If the parsed 'raw' format JSON string has 'offset' or 'size' attributes parse them as the format slice. https://bugzilla.redhat.com/show_bug.cgi?id=1791788 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-02-05 20:09:55 +03:00
"<source file='/tmp/testfle'>\n"
" <slices>\n"
" <slice type='storage' offset='10752' size='4063232'/>\n"
" </slices>\n"
"</source>\n", 0);
tests: virstorage: Add test data for json specified raw image with offset/size QEMU allows specifying the offset and size into a raw file to expose a sub-slice of the image to the guest with the raw driver. Libvirt currently doesn't support it but we can add test case for future reference. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-01-16 18:02:15 +03:00
virstoragefile: Add JSON parser for 'sslverify', 'readahead', 'cookies' and 'timeout' Add support for parsing the recently added fields from backing file pseudo-protocol strings. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-06 10:13:06 +03:00
TEST_BACKING_PARSE_FULL("json:{ \"file.cookie\": \"vmware_soap_session=\\\"0c8db85112873a79b7ef74f294cb70ef7f\\\"\","
"\"file.sslverify\": false,"
"\"file.driver\": \"https\","
virStorageSourceParseBackingJSONUri: Handle undocumented value 'off' for sslverify libguestfs abuses a quirk of qemu's parser to accept also other variants of the 'sslverify' field which would be valid on the command line but are not documented in the QMP schema. If we encounter the 'off' string instead of an boolean handle it rather than erroring out to continue support of pre-blockdev configurations. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-06 10:29:59 +03:00
"\"file.url\": \"https://host/folder/esx6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=data&dsName=esx6.5-matrix\","
"\"file.timeout\": 2000"
"}",
virStorageSourceParseBackingURI: Preserve query string of URI for http(s) For http/https URIs we need to preserve the query part as it may be important to refer to the image. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-27 18:26:50 +03:00
"<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk' query='dcPath=data&amp;dsName=esx6.5-matrix'>\n"
virStorageSourceParseBackingJSONUri: Handle undocumented value 'off' for sslverify libguestfs abuses a quirk of qemu's parser to accept also other variants of the 'sslverify' field which would be valid on the command line but are not documented in the QMP schema. If we encounter the 'off' string instead of an boolean handle it rather than erroring out to continue support of pre-blockdev configurations. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-06 10:29:59 +03:00
" <host name='host' port='443'/>\n"
" <ssl verify='no'/>\n"
" <cookies>\n"
" <cookie name='vmware_soap_session'>&quot;0c8db85112873a79b7ef74f294cb70ef7f&quot;</cookie>\n"
" </cookies>\n"
" <timeout seconds='2000'/>\n"
"</source>\n", 0);
TEST_BACKING_PARSE_FULL("json:{ \"file.cookie\": \"vmware_soap_session=\\\"0c8db85112873a79b7ef74f294cb70ef7f\\\"\","
"\"file.sslverify\": \"off\","
"\"file.driver\": \"https\","
virstoragefile: Add JSON parser for 'sslverify', 'readahead', 'cookies' and 'timeout' Add support for parsing the recently added fields from backing file pseudo-protocol strings. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-06 10:13:06 +03:00
"\"file.url\": \"https://host/folder/esx6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=data&dsName=esx6.5-matrix\","
"\"file.timeout\": 2000"
"}",
virStorageSourceParseBackingURI: Preserve query string of URI for http(s) For http/https URIs we need to preserve the query part as it may be important to refer to the image. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-27 18:26:50 +03:00
"<source protocol='https' name='folder/esx6.5-rhel7.7-x86_64/esx6.5-rhel7.7-x86_64-flat.vmdk' query='dcPath=data&amp;dsName=esx6.5-matrix'>\n"
virstoragefile: Add JSON parser for 'sslverify', 'readahead', 'cookies' and 'timeout' Add support for parsing the recently added fields from backing file pseudo-protocol strings. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-06 10:13:06 +03:00
" <host name='host' port='443'/>\n"
" <ssl verify='no'/>\n"
" <cookies>\n"
" <cookie name='vmware_soap_session'>&quot;0c8db85112873a79b7ef74f294cb70ef7f&quot;</cookie>\n"
" </cookies>\n"
" <timeout seconds='2000'/>\n"
"</source>\n", 0);
storage: Parse 'nvme' disk source properties from json:{} pseudo-uri Our code allows snapshots of NVMe based disks which means we create overlay file with a 'json:{}' pseudo-uri refering to the NVME device. Our parser code doesn't handle them though. Add the parser and test it via the XML->json->XML round-trip and reference data. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-03-23 20:06:56 +03:00
TEST_BACKING_PARSE("json:{\"file\":{\"driver\": \"nvme\","
"\"device\": \"0000:01:00.0\","
"\"namespace\": 1"
"}"
"}",
"<source type='pci' namespace='1'>\n"
" <address domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>\n"
"</source>\n");
Revert "Switch from yajl to Jansson" This reverts commit 9cf38263d05ca7f27dbbd9b1a0b48d338d9280e2. Jansson cannot parse QEMU's quirky JSON. Revert back to yajl. https://bugzilla.redhat.com/show_bug.cgi?id=1614569 Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-08-13 14:40:18 +03:00
#endif /* WITH_YAJL */
tests: Add testing of backing store string parser As we already test that the extraction of the backing store string works well additional tests for the backing store string parser can be made simpler. Export virStorageSourceNewFromBackingAbsolute and use it to parse the backing store strings, format them using virDomainDiskSourceFormat and match them against expected XMLs.
2016-07-12 18:04:16 +03:00
storage: test backing chain traversal Testing our backing chain handling will make it much easier to ensure that we avoid issues in the future. If only I had written this test before I first caused several regressions... * tests/virstoragetest.c: New test. * tests/Makefile.am (test_programs): Build it. * .gitignore: Ignore new files.
2013-02-13 22:04:05 +04:00
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
tests: Rename VIRT_TEST_* macros to VIR_TEST_* We use the "vir" prefix pretty consistently in our APIs, both external and internal, which made these macros stood out.
2017-03-29 17:45:42 +03:00
VIR_TEST_MAIN(mymain)
Copy Permalink