External/libvirt
1
0
Fork 0
Code

storage: Add tests for logical backend startup

Browse Source 
Add the logical storage pool startup validation (xml2argv) tests.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
John Ferlan 2018-12-04 11:12:37 -05:00
parent df1a9c7380
commit a15fe1247d
8 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/storage_backend_logical.c
View File

@ -52,11 +52,7 @@ virStorageBackendLogicalSetActive(virStoragePoolObjPtr pool,
{ {
int ret; int ret;
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
virCommandPtr cmd = virCommandPtr cmd = virStorageBackendLogicalChangeCmd(def, on);
virCommandNewArgList(VGCHANGE,
on ? "-aly" : "-aln",
def->source.name,
NULL);
ret = virCommandRun(cmd, NULL); ret = virCommandRun(cmd, NULL);
virCommandFree(cmd); virCommandFree(cmd);

11
src/storage/storage_util.c
View File

@ -4337,3 +4337,14 @@ virStorageBackendFileSystemMountCmd(virStoragePoolDefPtr def,
virStorageBackendFileSystemMountDefaultArgs(cmd, src, def); virStorageBackendFileSystemMountDefaultArgs(cmd, src, def);
return cmd; return cmd;
} }
virCommandPtr
virStorageBackendLogicalChangeCmd(virStoragePoolDefPtr def,
bool on)
{
return virCommandNewArgList(VGCHANGE,
on ? "-aly" : "-aln",
def->source.name,
NULL);
}

4
src/storage/storage_util.h
View File

@ -184,4 +184,8 @@ virCommandPtr
virStorageBackendFileSystemMountCmd(virStoragePoolDefPtr def, virStorageBackendFileSystemMountCmd(virStoragePoolDefPtr def,
const char *src); const char *src);
virCommandPtr
virStorageBackendLogicalChangeCmd(virStoragePoolDefPtr def,
bool on);
#endif /* __VIR_STORAGE_UTIL_H__ */ #endif /* __VIR_STORAGE_UTIL_H__ */

1
tests/storagepoolxml2argvdata/pool-logical-create.argv Normal file
View File

@ -0,0 +1 @@
vgchange -aly HostVG

1
tests/storagepoolxml2argvdata/pool-logical-noname.argv Normal file
View File

@ -0,0 +1 @@
vgchange -aly zily

1
tests/storagepoolxml2argvdata/pool-logical-nopath.argv Normal file
View File

@ -0,0 +1 @@
vgchange -aly HostVG

1
tests/storagepoolxml2argvdata/pool-logical.argv Normal file
View File

@ -0,0 +1 @@
vgchange -aly HostVG

13
tests/storagepoolxml2argvtest.c
View File

@ -43,8 +43,11 @@ testCompareXMLToArgvFiles(bool shouldFail,
cmd = virStorageBackendFileSystemMountCmd(def, src); cmd = virStorageBackendFileSystemMountCmd(def, src);
break; break;
case VIR_STORAGE_POOL_DIR:
case VIR_STORAGE_POOL_LOGICAL: case VIR_STORAGE_POOL_LOGICAL:
cmd = virStorageBackendLogicalChangeCmd(def, true);
break;
case VIR_STORAGE_POOL_DIR:
case VIR_STORAGE_POOL_DISK: case VIR_STORAGE_POOL_DISK:
case VIR_STORAGE_POOL_ISCSI: case VIR_STORAGE_POOL_ISCSI:
case VIR_STORAGE_POOL_ISCSI_DIRECT: case VIR_STORAGE_POOL_ISCSI_DIRECT:
@ -137,10 +140,10 @@ mymain(void)
DO_TEST_FAIL("pool-dir"); DO_TEST_FAIL("pool-dir");
DO_TEST_FAIL("pool-dir-naming"); DO_TEST_FAIL("pool-dir-naming");
DO_TEST("pool-fs"); DO_TEST("pool-fs");
DO_TEST_FAIL("pool-logical"); DO_TEST("pool-logical");
DO_TEST_FAIL("pool-logical-nopath"); DO_TEST("pool-logical-nopath");
DO_TEST_FAIL("pool-logical-create"); DO_TEST("pool-logical-create");
DO_TEST_FAIL("pool-logical-noname"); DO_TEST("pool-logical-noname");
DO_TEST_FAIL("pool-disk"); DO_TEST_FAIL("pool-disk");
DO_TEST_FAIL("pool-disk-device-nopartsep"); DO_TEST_FAIL("pool-disk-device-nopartsep");
DO_TEST_FAIL("pool-iscsi"); DO_TEST_FAIL("pool-iscsi");