mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-11 09:17:52 +03:00
e6f53e7a4b
Turns out there some build platforms that must not define MOUNT or VGCHANGE in config.h... So moving the commands from the storage backend specific module into a common storage_util module causes issues for those platforms. So instead of assuming they are there, let's just pass the command string to the storage util API's from the storage backend specific code (as would have been successful before). Also modify the test to determine whether the MOUNT and/or VGCHANGE doesn't exist and just define it to (for example) what Fedora has for the path. Could have just used "mount" and "vgchange" in the call, but that defeats the purpose of adding the call to virTestClearCommandPath. Signed-off-by: John Ferlan <jferlan@redhat.com>
184 lines
4.8 KiB
C
184 lines
4.8 KiB
C
#include <config.h>
|
|
|
|
#include "internal.h"
|
|
#include "testutils.h"
|
|
#include "datatypes.h"
|
|
#include "storage/storage_util.h"
|
|
#include "testutilsqemu.h"
|
|
#include "virstring.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
#ifndef MOUNT
|
|
# define MOUNT "/usr/bin/mount"
|
|
#endif
|
|
|
|
#ifndef VGCHANGE
|
|
# define VGCHANGE "/usr/sbin/vgchange"
|
|
#endif
|
|
|
|
static int
|
|
testCompareXMLToArgvFiles(bool shouldFail,
|
|
const char *poolxml,
|
|
const char *cmdline)
|
|
{
|
|
VIR_AUTOFREE(char *) actualCmdline = NULL;
|
|
VIR_AUTOFREE(char *) src = NULL;
|
|
int ret = -1;
|
|
virCommandPtr cmd = NULL;
|
|
virStoragePoolDefPtr def = NULL;
|
|
virStoragePoolObjPtr pool = NULL;
|
|
|
|
if (!(def = virStoragePoolDefParseFile(poolxml)))
|
|
goto cleanup;
|
|
|
|
switch ((virStoragePoolType)def->type) {
|
|
case VIR_STORAGE_POOL_FS:
|
|
case VIR_STORAGE_POOL_NETFS:
|
|
if (!(pool = virStoragePoolObjNew())) {
|
|
VIR_TEST_DEBUG("pool type %d alloc pool obj fails\n", def->type);
|
|
virStoragePoolDefFree(def);
|
|
goto cleanup;
|
|
}
|
|
virStoragePoolObjSetDef(pool, def);
|
|
|
|
if (!(src = virStorageBackendFileSystemGetPoolSource(pool))) {
|
|
VIR_TEST_DEBUG("pool type %d has no pool source\n", def->type);
|
|
goto cleanup;
|
|
}
|
|
|
|
cmd = virStorageBackendFileSystemMountCmd(MOUNT, def, src);
|
|
break;
|
|
|
|
case VIR_STORAGE_POOL_LOGICAL:
|
|
cmd = virStorageBackendLogicalChangeCmd(VGCHANGE, def, true);
|
|
break;
|
|
|
|
case VIR_STORAGE_POOL_DIR:
|
|
case VIR_STORAGE_POOL_DISK:
|
|
case VIR_STORAGE_POOL_ISCSI:
|
|
case VIR_STORAGE_POOL_ISCSI_DIRECT:
|
|
case VIR_STORAGE_POOL_SCSI:
|
|
case VIR_STORAGE_POOL_MPATH:
|
|
case VIR_STORAGE_POOL_RBD:
|
|
case VIR_STORAGE_POOL_SHEEPDOG:
|
|
case VIR_STORAGE_POOL_GLUSTER:
|
|
case VIR_STORAGE_POOL_ZFS:
|
|
case VIR_STORAGE_POOL_VSTORAGE:
|
|
case VIR_STORAGE_POOL_LAST:
|
|
default:
|
|
VIR_TEST_DEBUG("pool type %d has no xml2argv test\n", def->type);
|
|
goto cleanup;
|
|
};
|
|
|
|
if (!(actualCmdline = virCommandToString(cmd))) {
|
|
VIR_TEST_DEBUG("pool type %d failed to get commandline\n", def->type);
|
|
goto cleanup;
|
|
}
|
|
|
|
virTestClearCommandPath(actualCmdline);
|
|
if (virTestCompareToFile(actualCmdline, cmdline) < 0)
|
|
goto cleanup;
|
|
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
virCommandFree(cmd);
|
|
VIR_FREE(actualCmdline);
|
|
virStoragePoolObjEndAPI(&pool);
|
|
if (shouldFail) {
|
|
virResetLastError();
|
|
ret = 0;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
struct testInfo {
|
|
bool shouldFail;
|
|
const char *pool;
|
|
};
|
|
|
|
static int
|
|
testCompareXMLToArgvHelper(const void *data)
|
|
{
|
|
int result = -1;
|
|
const struct testInfo *info = data;
|
|
char *poolxml = NULL;
|
|
char *cmdline = NULL;
|
|
|
|
if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml",
|
|
abs_srcdir, info->pool) < 0)
|
|
goto cleanup;
|
|
|
|
if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s.argv",
|
|
abs_srcdir, info->pool) < 0 && !info->shouldFail)
|
|
goto cleanup;
|
|
|
|
result = testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdline);
|
|
|
|
cleanup:
|
|
VIR_FREE(poolxml);
|
|
VIR_FREE(cmdline);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
#define DO_TEST_FULL(shouldFail, pool) \
|
|
do { \
|
|
struct testInfo info = { shouldFail, pool }; \
|
|
if (virTestRun("Storage Pool XML-2-argv " pool, \
|
|
testCompareXMLToArgvHelper, &info) < 0) \
|
|
ret = -1; \
|
|
} \
|
|
while (0);
|
|
|
|
#define DO_TEST(pool, ...) \
|
|
DO_TEST_FULL(false, pool)
|
|
|
|
#define DO_TEST_FAIL(pool, ...) \
|
|
DO_TEST_FULL(true, pool)
|
|
|
|
DO_TEST_FAIL("pool-dir");
|
|
DO_TEST_FAIL("pool-dir-naming");
|
|
DO_TEST("pool-fs");
|
|
DO_TEST("pool-logical");
|
|
DO_TEST("pool-logical-nopath");
|
|
DO_TEST("pool-logical-create");
|
|
DO_TEST("pool-logical-noname");
|
|
DO_TEST_FAIL("pool-disk");
|
|
DO_TEST_FAIL("pool-disk-device-nopartsep");
|
|
DO_TEST_FAIL("pool-iscsi");
|
|
DO_TEST_FAIL("pool-iscsi-auth");
|
|
DO_TEST("pool-netfs");
|
|
DO_TEST("pool-netfs-auto");
|
|
DO_TEST("pool-netfs-gluster");
|
|
DO_TEST("pool-netfs-cifs");
|
|
DO_TEST_FAIL("pool-scsi");
|
|
DO_TEST_FAIL("pool-scsi-type-scsi-host");
|
|
DO_TEST_FAIL("pool-scsi-type-fc-host");
|
|
DO_TEST_FAIL("pool-scsi-type-fc-host-managed");
|
|
DO_TEST_FAIL("pool-mpath");
|
|
DO_TEST_FAIL("pool-iscsi-multiiqn");
|
|
DO_TEST_FAIL("pool-iscsi-vendor-product");
|
|
DO_TEST_FAIL("pool-sheepdog");
|
|
DO_TEST_FAIL("pool-gluster");
|
|
DO_TEST_FAIL("pool-gluster-sub");
|
|
DO_TEST_FAIL("pool-scsi-type-scsi-host-stable");
|
|
DO_TEST_FAIL("pool-zfs");
|
|
DO_TEST_FAIL("pool-zfs-sourcedev");
|
|
DO_TEST_FAIL("pool-rbd");
|
|
DO_TEST_FAIL("pool-vstorage");
|
|
DO_TEST_FAIL("pool-iscsi-direct-auth");
|
|
DO_TEST_FAIL("pool-iscsi-direct");
|
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIR_TEST_MAIN(mymain)
|