[libvirt PATCH 12/14] tests: Set TLSx509certdirs to default values

For almost all directories, the value we set matches the one a standard deployment would use, but in a couple of cases they deviate from that. Keep things consistent. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../disk-network-tlsx509-nbd-hostname.x86_64-latest.args | 2 +- .../disk-network-tlsx509-nbd.x86_64-5.2.0.args | 2 +- .../disk-network-tlsx509-nbd.x86_64-latest.args | 2 +- .../disk-network-tlsx509-vxhs.x86_64-5.0.0.args | 4 ++-- tests/testutilsqemu.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args index 870ec42482..f1fc42404c 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \ --object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd/dummy,path","endpoint":"client","verify-peer":true,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ +-object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd","endpoint":"client","verify-peer":true,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","tls-hostname":"test-hostname","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args index 8ed921dda6..9dae69a016 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -object secret,id=objlibvirt-1-storage_tls0-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --object tls-creds-x509,id=objlibvirt-1-storage_tls0,dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=on,passwordid=objlibvirt-1-storage_tls0-secret0 \ +-object tls-creds-x509,id=objlibvirt-1-storage_tls0,dir=/etc/pki/libvirt-nbd,endpoint=client,verify-peer=on,passwordid=objlibvirt-1-storage_tls0-secret0 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,id=virtio-disk3,bootindex=1,write-cache=on \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args index 6df20bc6f5..80fc289a22 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \ --object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd/dummy,path","endpoint":"client","verify-peer":true,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ +-object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","dir":"/etc/pki/libvirt-nbd","endpoint":"client","verify-peer":true,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args index f57bd6aa7d..0a0c500356 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args @@ -28,12 +28,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -object secret,id=objlibvirt-3-storage_tls0-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --object tls-creds-x509,id=objlibvirt-3-storage_tls0,dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=on,passwordid=objlibvirt-3-storage_tls0-secret0 \ +-object tls-creds-x509,id=objlibvirt-3-storage_tls0,dir=/etc/pki/libvirt-vxhs,endpoint=client,verify-peer=on,passwordid=objlibvirt-3-storage_tls0-secret0 \ -blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251","server":{"host":"192.168.0.1","port":"9999"},"node-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-3-storage"}' \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-3-format,id=virtio-disk0,bootindex=1,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \ -object secret,id=objlibvirt-2-storage_tls0-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --object tls-creds-x509,id=objlibvirt-2-storage_tls0,dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=on,passwordid=objlibvirt-2-storage_tls0-secret0 \ +-object tls-creds-x509,id=objlibvirt-2-storage_tls0,dir=/etc/pki/libvirt-vxhs,endpoint=client,verify-peer=on,passwordid=objlibvirt-2-storage_tls0-secret0 \ -blockdev '{"driver":"vxhs","tls-creds":"objlibvirt-2-storage_tls0","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252","server":{"host":"192.168.0.2","port":"9999"},"node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-2-format,id=virtio-disk1,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 1ce76ac855..663ea44e89 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -690,9 +690,9 @@ int qemuTestDriverInit(virQEMUDriver *driver) VIR_FREE(cfg->chardevTLSx509certdir); cfg->chardevTLSx509certdir = g_strdup("/etc/pki/libvirt-chardev"); VIR_FREE(cfg->vxhsTLSx509certdir); - cfg->vxhsTLSx509certdir = g_strdup("/etc/pki/libvirt-vxhs/dummy,path"); + cfg->vxhsTLSx509certdir = g_strdup("/etc/pki/libvirt-vxhs"); VIR_FREE(cfg->nbdTLSx509certdir); - cfg->nbdTLSx509certdir = g_strdup("/etc/pki/libvirt-nbd/dummy,path"); + cfg->nbdTLSx509certdir = g_strdup("/etc/pki/libvirt-nbd"); VIR_FREE(cfg->migrateTLSx509certdir); cfg->migrateTLSx509certdir = g_strdup("/etc/pki/libvirt-migrate"); VIR_FREE(cfg->backupTLSx509certdir); -- 2.39.2