virstoragetest: Use strings for storage type and format in output data

Make it easier for the humans to read/compare the outputs.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

tests/virstoragetest.c

@@ -187,8 +187,8 @@ testStorageChain(const void *args)
                           "capacity: %lld\n"
                           "encryption: %d\n"
                           "relPath:%s\n"
-                          "type:%d\n"
+                          "type:%s\n"
-                          "format:%d\n"
+                          "format:%s\n"
                           "protocol:%s\n"
                           "hostname:%s\n\n",
                           strippedPath,
@@ -196,8 +196,8 @@ testStorageChain(const void *args)
                           elt->capacity,
                           !!elt->encryption,
                           strippedRelPath,
-                          elt->type,
+                          NULLSTR(virStorageTypeToString(elt->type)),
-                          elt->format,
+                          NULLSTR(virStorageFileFormatTypeToString(elt->format)),
                           virStorageNetProtocolTypeToString(elt->protocol),
                           NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL));
     }

tests/virstoragetestdata/out/directory-dir

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:3
+type:dir
-format:2
+format:dir
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/directory-none

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:3
+type:dir
-format:2
+format:dir
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/directory-raw

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:3
+type:dir
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw

@@ -3,8 +3,8 @@ backingStoreRaw: nbd+tcp://example.org:6000/blah
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:4
+type:network
-format:1
+format:raw
 protocol:nbd
 hostname:example.org

tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto

@@ -3,8 +3,8 @@ backingStoreRaw: qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 1024
 encryption: 0
 relPath:qcow2
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto

@@ -3,8 +3,8 @@ backingStoreRaw: qcow2_qcow2-auto.qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,8 +13,8 @@ backingStoreRaw: qcow2
 capacity: 1024
 encryption: 0
 relPath:qcow2_qcow2-auto.qcow2
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 1024
 encryption: 0
 relPath:qcow2
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto

@@ -3,8 +3,8 @@ backingStoreRaw: qcow2_raw-auto.qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,8 +13,8 @@ backingStoreRaw: raw
 capacity: 1024
 encryption: 0
 relPath:qcow2_raw-auto.qcow2
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:raw
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw

@@ -3,8 +3,8 @@ backingStoreRaw: ABS_BUILDDIR/virstoragedata/qcow2
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,8 +13,8 @@ backingStoreRaw: ABS_BUILDDIR/virstoragedata/raw
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative

@@ -3,8 +3,8 @@ backingStoreRaw: raw
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:raw
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qcow2-symlinks

@@ -3,8 +3,8 @@ backingStoreRaw: ../sub/link1
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -13,8 +13,8 @@ backingStoreRaw: ../raw
 capacity: 1024
 encryption: 0
 relPath:../sub/link1
-type:1
+type:file
-format:14
+format:qcow2
 protocol:none
 hostname:<null>
 
@@ -23,7 +23,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:../raw
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qed-auto_raw

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/qed-qed_raw

@@ -3,8 +3,8 @@ backingStoreRaw: raw
 capacity: 1024
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:15
+format:qed
 protocol:none
 hostname:<null>
 
@@ -13,7 +13,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:raw
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/raw-auto

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>

tests/virstoragetestdata/out/raw-raw

@@ -3,7 +3,7 @@ backingStoreRaw: <null>
 capacity: 0
 encryption: 0
 relPath:<null>
-type:1
+type:file
-format:1
+format:raw
 protocol:none
 hostname:<null>