External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-03 20:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
a6ba59db9e
libvirt/tests/viriscsitest.c

371 lines
14 KiB
C
Raw Normal View History

Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
/*
* Copyright (C) 2014 Red Hat, Inc.
*
* 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>
Fix build on mingw32 tests/viriscsitest.c:27:12: error: 'EXIT_AM_SKIP' undeclared (first use in this function)
2014-03-21 11:14:12 +00:00
#include "testutils.h"
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
#ifdef WIN32
int
main(void)
{
return EXIT_AM_SKIP;
}
#else
Enforce a standard header file guard symbol name Require that all headers are guarded by a symbol named LIBVIRT_$FILENAME where $FILENAME is the uppercased filename, with all characters outside a-z changed into '_'. Note we do not use a leading __ because that is technically a namespace reserved for the toolchain. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-12-13 14:53:50 +00:00
# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
# include "vircommandpriv.h"
# include "viriscsi.h"
# define VIR_FROM_THIS VIR_FROM_NONE
static const char *iscsiadmSessionOutput =
"tcp: [1] 10.20.30.40:3260,1 iqn.2004-06.example:example1:iscsi.test\n"
"tcp: [2] 10.20.30.41:3260,1 iqn.2005-05.example:example1:iscsi.hello\n"
"tcp: [3] 10.20.30.42:3260,1 iqn.2006-04.example:example1:iscsi.world\n"
"tcp: [5] 10.20.30.43:3260,1 iqn.2007-04.example:example1:iscsi.foo\n"
"tcp: [6] 10.20.30.44:3260,1 iqn.2008-04.example:example1:iscsi.bar\n"
"tcp: [7] 10.20.30.45:3260,1 iqn.2009-04.example:example1:iscsi.seven\n";
static const char *iscsiadmSessionOutputNonFlash =
"tcp: [1] 10.20.30.40:3260,1 iqn.2004-06.example:example1:iscsi.test (non-flash)\n"
"tcp: [2] 10.20.30.41:3260,1 iqn.2005-05.example:example1:iscsi.hello (non-flash)\n"
"tcp: [3] 10.20.30.42:3260,1 iqn.2006-04.example:example1:iscsi.world (non-flash)\n"
"tcp: [5] 10.20.30.43:3260,1 iqn.2007-04.example:example1:iscsi.foo (non-flash)\n"
"tcp: [6] 10.20.30.44:3260,1 iqn.2008-04.example:example1:iscsi.bar (non-flash)\n"
"tcp: [7] 10.20.30.45:3260,1 iqn.2009-04.example:example1:iscsi.seven (non-flash)\n";
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
const char *iscsiadmSendtargetsOutput =
"10.20.30.40:3260,1 iqn.2004-06.example:example1:iscsi.test\n"
"10.20.30.40:3260,1 iqn.2005-05.example:example1:iscsi.hello\n"
"10.20.30.40:3260,1 iqn.2006-04.example:example1:iscsi.world\n"
"10.20.30.40:3260,1 iqn.2007-04.example:example1:iscsi.foo\n"
"10.20.30.40:3260,1 iqn.2008-04.example:example1:iscsi.bar\n"
"10.20.30.40:3260,1 iqn.2009-04.example:example1:iscsi.seven\n";
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
const char *iscsiadmIfaceDefaultOutput =
"default tcp,<empty>,<empty>,<empty>,<empty>\n"
"iser iser,<empty>,<empty>,<empty>,<empty>\n";
const char *iscsiadmIfaceIfaceOutput =
"default tcp,<empty>,<empty>,<empty>,<empty>\n"
"iser iser,<empty>,<empty>,<empty>,<empty>\n"
"libvirt-iface-03020100 tcp,<empty>,<empty>,<empty>,iqn.2004-06.example:example1:initiator\n";
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
struct testIscsiadmCbData {
bool output_version;
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
bool iface_created;
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
};
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
static void testIscsiadmCb(const char *const*args,
tests: use G_GNUC_UNUSED Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-14 12:45:03 +00:00
const char *const*env G_GNUC_UNUSED,
const char *input G_GNUC_UNUSED,
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
char **output,
tests: use G_GNUC_UNUSED Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-14 12:45:03 +00:00
char **error G_GNUC_UNUSED,
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
int *status,
void *opaque)
{
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
struct testIscsiadmCbData *data = opaque;
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "session") &&
args[3] == NULL) {
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
if (data->output_version)
Use g_strdup instead of ignoring VIR_STRDUP's value Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-18 11:27:03 +00:00
*output = g_strdup(iscsiadmSessionOutputNonFlash);
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
else
Use g_strdup instead of ignoring VIR_STRDUP's value Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-18 11:27:03 +00:00
*output = g_strdup(iscsiadmSessionOutput);
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "discovery") &&
args[3] && STREQ(args[3], "--type") &&
args[4] && STREQ(args[4], "sendtargets") &&
args[5] && STREQ(args[5], "--portal") &&
args[6] && STREQ(args[6], "10.20.30.40:3260,1") &&
util: Remove disabling of autologin for iscsi-targets https://bugzilla.redhat.com/show_bug.cgi?id=1331552 Instead of disabling auto-login of all scsi targets (even those that do not "belong" to libvirt), use iscsiadm's "--op nonpersistent" during discovery of iSCSI targets (e.g. "iscsiadm --mode discovery --type sendtargets") in order to avoid the node database being altered which led to the need for the "large hammer" approach taken by commit id '3c12b654'. This commit removes the virISCSITargetAutologin adjustment (eg. the setting of node.startup to "manual"). The iscsiadm command has supported this mode of operation as of commit id 'ad873767' to open-iscsi.
2016-05-13 15:19:09 +00:00
args[7] && STREQ(args[7], "--op") &&
args[8] && STREQ(args[8], "nonpersistent") &&
args[9] == NULL) {
Use g_strdup instead of ignoring VIR_STRDUP's value Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-18 11:27:03 +00:00
*output = g_strdup(iscsiadmSendtargetsOutput);
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "node") &&
args[3] && STREQ(args[3], "--portal") &&
args[4] && STREQ(args[4], "10.20.30.40:3260,1") &&
args[5] && STREQ(args[5], "--targetname") &&
args[6] && STREQ(args[6], "iqn.2004-06.example:example1:iscsi.test") &&
args[7] && STREQ(args[7], "--login") &&
args[8] == NULL) {
/* Mocking real environment output is not needed for now.
* Example output from real environment:
*
* Logging in to [iface: default, \
* target: iqn.2004-06.example:example1:iscsi.test, \
* portal: 10.20.30.40:3260,1] (multiple)
* Login to [iface: default, \
* target: iqn.2004-06.example:example1:iscsi.test, \
* portal: 10.20.30.40:3260,1] successful.
*/
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "iface") &&
args[3] == NULL) {
if (data->iface_created)
Use g_strdup instead of ignoring VIR_STRDUP's value Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-18 11:27:03 +00:00
*output = g_strdup(iscsiadmIfaceIfaceOutput);
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
else
Use g_strdup instead of ignoring VIR_STRDUP's value Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-18 11:27:03 +00:00
*output = g_strdup(iscsiadmIfaceDefaultOutput);
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "iface") &&
args[3] && STREQ(args[3], "--interface") &&
args[4] && STREQ(args[4], "libvirt-iface-03020100") &&
args[5] && STREQ(args[5], "--op") &&
args[6] && STREQ(args[6], "new") &&
args[7] == NULL) {
/* Mocking real environment output is not needed for now.
* Example output from real environment:
*
* New interface libvirt-iface-03020100 added
*/
data->iface_created = true;
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "iface") &&
args[3] && STREQ(args[3], "--interface") &&
args[4] && STREQ(args[4], "libvirt-iface-03020100") &&
args[5] && STREQ(args[5], "--op") &&
args[6] && STREQ(args[6], "update") &&
args[7] && STREQ(args[7], "--name") &&
args[8] && STREQ(args[8], "iface.initiatorname") &&
args[9] && STREQ(args[9], "--value") &&
args[10] && STREQ(args[10], "iqn.2004-06.example:example1:initiator") &&
args[11] == NULL &&
data->iface_created) {
/* Mocking real environment output is not needed for now.
* Example output from real environment:
*
* libvirt-iface-03020100 updated.
*/
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "discovery") &&
args[3] && STREQ(args[3], "--type") &&
args[4] && STREQ(args[4], "sendtargets") &&
args[5] && STREQ(args[5], "--portal") &&
args[6] && STREQ(args[6], "10.20.30.40:3260,1") &&
args[7] && STREQ(args[7], "--interface") &&
args[8] && STREQ(args[8], "libvirt-iface-03020100") &&
args[9] == NULL &&
data->iface_created) {
Use g_strdup instead of ignoring VIR_STRDUP's value Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-10-18 11:27:03 +00:00
*output = g_strdup(iscsiadmSendtargetsOutput);
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
} else if (args[0] && STREQ(args[0], ISCSIADM) &&
args[1] && STREQ(args[1], "--mode") &&
args[2] && STREQ(args[2], "node") &&
args[3] && STREQ(args[3], "--portal") &&
args[4] && STREQ(args[4], "10.20.30.40:3260,1") &&
args[5] && STREQ(args[5], "--targetname") &&
args[6] && STREQ(args[6], "iqn.2004-06.example:example1:iscsi.test") &&
args[7] && STREQ(args[7], "--login") &&
args[8] && STREQ(args[8], "--interface") &&
args[9] && STREQ(args[9], "libvirt-iface-03020100") &&
args[10] == NULL &&
data->iface_created) {
/* Mocking real environment output is not needed for now.
* Example output from real environment:
*
* Logging in to [iface: libvirt-iface-03020100, \
* target: iqn.2004-06.example:example1:iscsi.test, \
* portal: 10.20.30.40:3260,1] (multiple)
* Login to [iface: libvirt-iface-03020100, \
* target: iqn.2004-06.example:example1:iscsi.test, \
* portal: 10.20.30.40:3260,1] successful.
*/
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
} else {
*status = -1;
}
}
viriscsitest: Move testSessionInfo struct This struct has nothing to do with testIscsiadmCb() rather than testISCSIGetSession(). Move it closer to the latter. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:43:36 +00:00
struct testSessionInfo {
const char *device_path;
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
bool output_version;
viriscsitest: Move testSessionInfo struct This struct has nothing to do with testIscsiadmCb() rather than testISCSIGetSession(). Move it closer to the latter. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:43:36 +00:00
const char *expected_session;
};
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
static int
testISCSIGetSession(const void *data)
{
const struct testSessionInfo *info = data;
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
struct testIscsiadmCbData cbData = { 0 };
tests: vir: use g_autofree Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Laine Stump <laine@redhat.com>
2021-09-04 20:37:31 +00:00
g_autofree char *actual_session = NULL;
virCommandSetDryRun: Rework resetting of the dry run data While virCommandSetDryRun is used in tests only, there were some cases when error paths would not call the function with NULL arguments to reset the dry run infrastructure. Introduce virCommandDryRunToken type which must be allocated via virCommandDryRunTokenNew and passed to virCommandSetDryRun. This way we can use automatic variable cleaning to trigger the cleanup of virCommandSetDryRun parameters and also the use of the token variable ensures that all callers of virCommandSetDryRun clean up after themselves and also that the token isn't left unused in the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-04-01 15:54:09 +00:00
g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
cbData.output_version = info->output_version;
virCommandSetDryRun: Add flags to linebreak and strip prefix from the command buffer virCommandToStringFull used internally when virCommandSetDryRun is requested allows to strip command path and wrap lines nicely. Expose these via virCommandSetDryRun so that tests can use those features instead of local hacks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-04-06 08:56:23 +00:00
virCommandSetDryRun(dryRunToken, NULL, false, false, testIscsiadmCb, &cbData);
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
actual_session = virISCSIGetSession(info->device_path, true);
if (STRNEQ_NULLABLE(actual_session, info->expected_session)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Expected session: '%s' got: '%s'",
NULLSTR(info->expected_session),
NULLSTR(actual_session));
tests: vir: remove pointless labels Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Laine Stump <laine@redhat.com>
2021-09-04 20:41:36 +00:00
return -1;
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
}
tests: vir: remove pointless labels Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Laine Stump <laine@redhat.com>
2021-09-04 20:41:36 +00:00
return 0;
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
}
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
struct testScanTargetsInfo {
const char *fake_cmd_output;
const char *portal;
const char **expected_targets;
size_t nexpected;
};
static int
testISCSIScanTargets(const void *data)
{
const struct testScanTargetsInfo *info = data;
size_t ntargets = 0;
char **targets = NULL;
int ret = -1;
size_t i;
virCommandSetDryRun: Rework resetting of the dry run data While virCommandSetDryRun is used in tests only, there were some cases when error paths would not call the function with NULL arguments to reset the dry run infrastructure. Introduce virCommandDryRunToken type which must be allocated via virCommandDryRunTokenNew and passed to virCommandSetDryRun. This way we can use automatic variable cleaning to trigger the cleanup of virCommandSetDryRun parameters and also the use of the token variable ensures that all callers of virCommandSetDryRun clean up after themselves and also that the token isn't left unused in the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-04-01 15:54:09 +00:00
g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
virCommandSetDryRun: Add flags to linebreak and strip prefix from the command buffer virCommandToStringFull used internally when virCommandSetDryRun is requested allows to strip command path and wrap lines nicely. Expose these via virCommandSetDryRun so that tests can use those features instead of local hacks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-04-06 08:56:23 +00:00
virCommandSetDryRun(dryRunToken, NULL, false, false, testIscsiadmCb, NULL);
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
virISCSIScanTargets: Allow making targets persistent After a new iSCSI interface is successfully set up, we issue a sendtargets command. However, after 56057900dc53df490d we don't update the host config which in turn makes login fail because iscsiadm is unable to find any matching record for the interface. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-06-29 14:18:23 +00:00
if (virISCSIScanTargets(info->portal, NULL,
false, &ntargets, &targets) < 0)
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
goto cleanup;
if (info->nexpected != ntargets) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Expected %zu targets, got %zu",
info->nexpected, ntargets);
goto cleanup;
}
for (i = 0; i < ntargets; i++) {
if (STRNEQ(info->expected_targets[i], targets[i])) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"Expected target '%s', got '%s'",
info->expected_targets[i], targets[i]);
goto cleanup;
}
}
ret = 0;
Indent top-level labels by one space in tests/
2014-03-25 06:53:44 +00:00
cleanup:
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
for (i = 0; i < ntargets; i++)
VIR_FREE(targets[i]);
VIR_FREE(targets);
return ret;
}
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
struct testConnectionInfoLogin {
const char *portal;
const char *initiatoriqn;
const char *target;
};
static int
testISCSIConnectionLogin(const void *data)
{
const struct testConnectionInfoLogin *info = data;
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
struct testIscsiadmCbData cbData = { 0 };
virCommandSetDryRun: Rework resetting of the dry run data While virCommandSetDryRun is used in tests only, there were some cases when error paths would not call the function with NULL arguments to reset the dry run infrastructure. Introduce virCommandDryRunToken type which must be allocated via virCommandDryRunTokenNew and passed to virCommandSetDryRun. This way we can use automatic variable cleaning to trigger the cleanup of virCommandSetDryRun parameters and also the use of the token variable ensures that all callers of virCommandSetDryRun clean up after themselves and also that the token isn't left unused in the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-04-01 15:54:09 +00:00
g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
virCommandSetDryRun: Add flags to linebreak and strip prefix from the command buffer virCommandToStringFull used internally when virCommandSetDryRun is requested allows to strip command path and wrap lines nicely. Expose these via virCommandSetDryRun so that tests can use those features instead of local hacks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-04-06 08:56:23 +00:00
virCommandSetDryRun(dryRunToken, NULL, false, false, testIscsiadmCb, &cbData);
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
if (virISCSIConnectionLogin(info->portal, info->initiatoriqn, info->target) < 0)
tests: vir: remove pointless labels Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Laine Stump <laine@redhat.com>
2021-09-04 20:41:36 +00:00
return -1;
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
tests: vir: remove pointless labels Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Laine Stump <laine@redhat.com>
2021-09-04 20:41:36 +00:00
return 0;
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
}
tests: iscsitest: split out testISCSIScanTargetsTests The ScanTargets testing code declares some variables in the middle of main. Split it out into a separate function. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-07-28 18:11:09 +00:00
static int
testISCSIScanTargetsTests(void)
{
const char *targets[] = {
"iqn.2004-06.example:example1:iscsi.test",
"iqn.2005-05.example:example1:iscsi.hello",
"iqn.2006-04.example:example1:iscsi.world",
"iqn.2007-04.example:example1:iscsi.foo",
"iqn.2008-04.example:example1:iscsi.bar",
"iqn.2009-04.example:example1:iscsi.seven"
};
struct testScanTargetsInfo infoTargets = {
.fake_cmd_output = "iscsiadm_sendtargets",
.portal = "10.20.30.40:3260,1",
.expected_targets = targets,
.nexpected = G_N_ELEMENTS(targets),
};
if (virTestRun("ISCSI scan targets", testISCSIScanTargets, &infoTargets) < 0)
return -1;
return 0;
}
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
static int
mymain(void)
{
int rv = 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 12:09:47 +00:00
# define DO_SESSION_TEST(name, session) \
do { \
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
struct testSessionInfo info = {name, false, session}; \
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 12:09:47 +00:00
if (virTestRun("ISCSI get session test" name, \
testISCSIGetSession, &info) < 0) \
rv = -1; \
viriscsitest: Introduce testIscsiadmCbData struct Some tests will want to pass their own callback data into the testIscsiadmCbData callback. Introduce testIscsiadmCbData struct to give this some form and order. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:47:07 +00:00
info.output_version = true; \
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 12:09:47 +00:00
if (virTestRun("ISCSI get (non-flash) session test" name, \
testISCSIGetSession, &info) < 0) \
rv = -1; \
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
} while (0)
DO_SESSION_TEST("iqn.2004-06.example:example1:iscsi.test", "1");
DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.seven", "7");
DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.eight", NULL);
tests: iscsitest: split out testISCSIScanTargetsTests The ScanTargets testing code declares some variables in the middle of main. Split it out into a separate function. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-07-28 18:11:09 +00:00
if (testISCSIScanTargetsTests() < 0)
Add test for virISCSIScanTargets
2014-03-19 13:02:09 +00:00
rv = -1;
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
# define DO_LOGIN_TEST(portal, iqn, target) \
do { \
struct testConnectionInfoLogin info = {portal, iqn, target }; \
if (virTestRun("ISCSI login " portal, \
testISCSIConnectionLogin, &info) < 0) \
rv = -1; \
} while (0)
DO_LOGIN_TEST("10.20.30.40:3260,1", NULL, "iqn.2004-06.example:example1:iscsi.test");
viriscsitest: Extend virISCSIConnectionLogin test Extend this existing test so that a case when IQN is provided is tested too. Since a special iSCSI interface is created and its name is randomly generated at runtime we need to link with virrandommock to have predictable names. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:41:54 +00:00
DO_LOGIN_TEST("10.20.30.40:3260,1", "iqn.2004-06.example:example1:initiator",
"iqn.2004-06.example:example1:iscsi.test");
viriscsitest: Test virISCSIConnectionLogin Introduce one basic test that tests the simplest case: logging into portal without any IQN. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2018-07-04 08:08:48 +00:00
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
if (rv < 0)
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
tests: Add lib- prefix to all mocks In preparation libtool "-module" flag removal, add lib prefix to all mock shared objects. While at it, introduce VIR_TEST_MOCK macros that makes path out of mock name to be used with VIR_TEST_PRELOAD or VIR_TEST_MAIN_PRELOAD. That, hopefully, improves readability, reduces line length and allows to tailor VIR_TEST_MOCK for specific platform if it has shared library suffix different from ".so". Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
2019-08-21 16:13:16 +00:00
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virrandom"))
Add test for virISCSIGetSession Parse iscsiadm output with and without the recently introduced flashnode info. [1] This should check that commits like 57e17a7 (fixing [2]) do not break iscsiadm output parsing. [1] https://github.com/mikechristie/open-iscsi/commit/181af9a [2] https://bugzilla.redhat.com/show_bug.cgi?id=1067173
2014-02-21 09:59:10 +00:00
#endif /* WIN32 */
Reference in New Issue Copy Permalink