From e364883416785d51ff8eb132b63bd802ab0ccfe9 Mon Sep 17 00:00:00 2001

From: Vojtech Trefny <vtrefny@redhat.com>

Date: Tue, 13 Jul 2021 13:22:05 +0200

Subject: [PATCH 1/8] lvm: Allow configuring global "device filter" for LVM

 commands

Starting with 2.03.12 LVM introduces a new system for telling LVM

which devices it should use. The old device filters in config are

no longer working and we need to use either the system.devices

config file in /etc/lvm/devices (default behaviour) or specify

all allowed devices using the new --devices option. Because this

option must be specified for every call which might be incovenient

for our users, this commit introduces a new function to configure

this globally, which we already do for the --config option.

---

 src/lib/plugin_apis/lvm.api |  23 +++

 src/plugins/lvm-dbus.c      |  74 ++++++++-

 src/plugins/lvm.c           |  97 ++++++++++--

 src/plugins/lvm.h           |   4 +

 tests/library_test.py       | 304 ++++++++++++++++++++----------------

 tests/lvm_dbus_tests.py     |  47 +++++-

 tests/lvm_test.py           |  50 ++++++

 tests/overrides_test.py     |  23 ++-

 8 files changed, 469 insertions(+), 153 deletions(-)

diff --git a/src/lib/plugin_apis/lvm.api b/src/lib/plugin_apis/lvm.api

index 563c104..62f602f 100644

--- a/src/lib/plugin_apis/lvm.api

+++ b/src/lib/plugin_apis/lvm.api

@@ -601,6 +601,7 @@ typedef enum {

     BD_LVM_TECH_CACHE_CALCS,

     BD_LVM_TECH_GLOB_CONF,

     BD_LVM_TECH_VDO,

+    BD_LVM_TECH_DEVICES,

 } BDLVMTech;

 typedef enum {

@@ -1214,6 +1215,28 @@ gboolean bd_lvm_set_global_config (const gchar *new_config, GError **error);

  */

 gchar* bd_lvm_get_global_config (GError **error);

+/**

+ * bd_lvm_set_devices_filter:

+ * @devices: (allow-none) (array zero-terminated=1): list of devices for lvm commands to work on

+ * @error: (out): place to store error (if any)

+ *

+ * Returns: whether the devices filter was successfully set or not

+ *

+ * Tech category: %BD_LVM_TECH_DEVICES no mode (it is ignored)

+ */

+gboolean bd_lvm_set_devices_filter (const gchar **devices, GError **error);

+

+/**

+ * bd_lvm_get_devices_filter:

+ * @error: (out): place to store error (if any)

+ *

+ * Returns: (transfer full) (array zero-terminated=1): a copy of a string representation of

+ *                                                     the currently set LVM devices filter

+ *

+ * Tech category: %BD_LVM_TECH_DEVICES no mode (it is ignored)

+ */

+gchar** bd_lvm_get_devices_filter (GError **error);

+

 /**

  * bd_lvm_cache_get_default_md_size:

  * @cache_size: size of the cache to determine MD size for

diff --git a/src/plugins/lvm-dbus.c b/src/plugins/lvm-dbus.c

index 144551f..d1726ed 100644

--- a/src/plugins/lvm-dbus.c

+++ b/src/plugins/lvm-dbus.c

@@ -35,6 +35,8 @@

 static GMutex global_config_lock;

 static gchar *global_config_str = NULL;

+static gchar *global_devices_str = NULL;

+

 #define LVM_BUS_NAME "com.redhat.lvmdbus1"

 #define LVM_OBJ_PREFIX "/com/redhat/lvmdbus1"

 #define MANAGER_OBJ "/com/redhat/lvmdbus1/Manager"

@@ -247,6 +249,14 @@ static volatile guint avail_features = 0;

 static volatile guint avail_module_deps = 0;

 static GMutex deps_check_lock;

+#define DEPS_LVMDEVICES 0

+#define DEPS_LVMDEVICES_MASK (1 << DEPS_LVMDEVICES)

+#define DEPS_LAST 1

+

+static const UtilDep deps[DEPS_LAST] = {

+    {"lvmdevices", NULL, NULL, NULL},

+};

+

 #define DBUS_DEPS_LVMDBUSD 0

 #define DBUS_DEPS_LVMDBUSD_MASK (1 << DBUS_DEPS_LVMDBUSD)

 #define DBUS_DEPS_LAST 1

@@ -385,6 +395,8 @@ gboolean bd_lvm_is_tech_avail (BDLVMTech tech, guint64 mode, GError **error) {

             return check_dbus_deps (&avail_dbus_deps, DBUS_DEPS_LVMDBUSD_MASK, dbus_deps, DBUS_DEPS_LAST, &deps_check_lock, error) &&

                    check_features (&avail_features, FEATURES_VDO_MASK, features, FEATURES_LAST, &deps_check_lock, error) &&

                    check_module_deps (&avail_module_deps, MODULE_DEPS_VDO_MASK, module_deps, MODULE_DEPS_LAST, &deps_check_lock, error);

+    case BD_LVM_TECH_DEVICES:

+        return check_deps (&avail_deps, DEPS_LVMDEVICES_MASK, deps, DEPS_LAST, &deps_check_lock, error);

     default:

         /* everything is supported by this implementation of the plugin */

         return check_dbus_deps (&avail_dbus_deps, DBUS_DEPS_LVMDBUSD_MASK, dbus_deps, DBUS_DEPS_LAST, &deps_check_lock, error);

@@ -522,6 +534,7 @@ static gboolean unbox_params_and_add (GVariant *params, GVariantBuilder *builder

 static GVariant* call_lvm_method (const gchar *obj, const gchar *intf, const gchar *method, GVariant *params, GVariant *extra_params, const BDExtraArg **extra_args, guint64 *task_id, guint64 *progress_id, gboolean lock_config, GError **error) {

     GVariant *config = NULL;

+    GVariant *devices = NULL;

     GVariant *param = NULL;

     GVariantIter iter;

     GVariantBuilder builder;

@@ -543,8 +556,8 @@ static GVariant* call_lvm_method (const gchar *obj, const gchar *intf, const gch

     if (lock_config)

         g_mutex_lock (&global_config_lock);

-    if (global_config_str || extra_params || extra_args) {

-        if (global_config_str || extra_args) {

+    if (global_config_str || global_devices_str || extra_params || extra_args) {

+        if (global_config_str || global_devices_str || extra_args) {

             /* add the global config to the extra_params */

             g_variant_builder_init (&extra_builder, G_VARIANT_TYPE_DICTIONARY);

@@ -565,6 +578,11 @@ static GVariant* call_lvm_method (const gchar *obj, const gchar *intf, const gch

                 g_variant_builder_add (&extra_builder, "{sv}", "--config", config);

                 added_extra = TRUE;

             }

+            if (global_devices_str) {

+                devices = g_variant_new ("s", global_devices_str);

+                g_variant_builder_add (&extra_builder, "{sv}", "--devices", devices);

+                added_extra = TRUE;

+            }

             if (added_extra)

                 config_extra_params = g_variant_builder_end (&extra_builder);

@@ -2651,6 +2669,58 @@ gchar* bd_lvm_get_global_config (GError **error UNUSED) {

     return ret;

 }

+/**

+ * bd_lvm_set_devices_filter:

+ * @devices: (allow-none) (array zero-terminated=1): list of devices for lvm commands to work on

+ * @error: (out): place to store error (if any)

+ *

+ * Returns: whether the devices filter was successfully set or not

+ *

+ * Tech category: %BD_LVM_TECH_DEVICES no mode (it is ignored)

+ */

+gboolean bd_lvm_set_devices_filter (const gchar **devices, GError **error) {

+    if (!bd_lvm_is_tech_avail (BD_LVM_TECH_DEVICES, 0, error))

+        return FALSE;

+

+    g_mutex_lock (&global_config_lock);

+

+    /* first free the old value */

+    g_free (global_devices_str);

+

+    /* now store the new one */

+    if (!devices || !(*devices))

+        global_devices_str = NULL;

+    else

+        global_devices_str = g_strjoinv (",", (gchar **) devices);

+

+    g_mutex_unlock (&global_config_lock);

+    return TRUE;

+}

+

+/**

+ * bd_lvm_get_devices_filter:

+ * @error: (out): place to store error (if any)

+ *

+ * Returns: (transfer full) (array zero-terminated=1): a copy of a string representation of

+ *                                                     the currently set LVM devices filter

+ *

+ * Tech category: %BD_LVM_TECH_DEVICES no mode (it is ignored)

+ */

+gchar** bd_lvm_get_devices_filter (GError **error UNUSED) {

+    gchar **ret = NULL;

+

+    g_mutex_lock (&global_config_lock);

+

+    if (global_devices_str)

+        ret = g_strsplit (global_devices_str, ",", -1);

+    else

+        ret = NULL;

+

+    g_mutex_unlock (&global_config_lock);

+

+    return ret;

+}

+

 /**

  * bd_lvm_cache_get_default_md_size:

  * @cache_size: size of the cache to determine MD size for

diff --git a/src/plugins/lvm.c b/src/plugins/lvm.c

index 2be1dbd..c0d8198 100644

--- a/src/plugins/lvm.c

+++ b/src/plugins/lvm.c

@@ -34,6 +34,8 @@

 static GMutex global_config_lock;

 static gchar *global_config_str = NULL;

+static gchar *global_devices_str = NULL;

+

 /**

  * SECTION: lvm

  * @short_description: plugin for operations with LVM

@@ -212,10 +214,13 @@ static GMutex deps_check_lock;

 #define DEPS_LVM 0

 #define DEPS_LVM_MASK (1 << DEPS_LVM)

-#define DEPS_LAST 1

+#define DEPS_LVMDEVICES 1

+#define DEPS_LVMDEVICES_MASK (1 << DEPS_LVMDEVICES)

+#define DEPS_LAST 2

 static const UtilDep deps[DEPS_LAST] = {

     {"lvm", LVM_MIN_VERSION, "version", "LVM version:\\s+([\\d\\.]+)"},

+    {"lvmdevices", NULL, NULL, NULL},

 };

 #define FEATURES_VDO 0

@@ -327,6 +332,8 @@ gboolean bd_lvm_is_tech_avail (BDLVMTech tech, guint64 mode, GError **error) {

     case BD_LVM_TECH_VDO:

             return check_features (&avail_features, FEATURES_VDO_MASK, features, FEATURES_LAST, &deps_check_lock, error) &&

                    check_module_deps (&avail_module_deps, MODULE_DEPS_VDO_MASK, module_deps, MODULE_DEPS_LAST, &deps_check_lock, error);

+    case BD_LVM_TECH_DEVICES:

+            return check_deps (&avail_deps, DEPS_LVMDEVICES_MASK, deps, DEPS_LAST, &deps_check_lock, error);

     default:

         /* everything is supported by this implementation of the plugin */

         return check_deps (&avail_deps, DEPS_LVM_MASK, deps, DEPS_LAST, &deps_check_lock, error);

@@ -337,6 +344,8 @@ static gboolean call_lvm_and_report_error (const gchar **args, const BDExtraArg

     gboolean success = FALSE;

     guint i = 0;

     guint args_length = g_strv_length ((gchar **) args);

+    g_autofree gchar *config_arg = NULL;

+    g_autofree gchar *devices_arg = NULL;

     if (!check_deps (&avail_deps, DEPS_LVM_MASK, deps, DEPS_LAST, &deps_check_lock, error))

         return FALSE;

@@ -345,20 +354,26 @@ static gboolean call_lvm_and_report_error (const gchar **args, const BDExtraArg

     if (lock_config)

         g_mutex_lock (&global_config_lock);

-    /* allocate enough space for the args plus "lvm", "--config" and NULL */

-    const gchar **argv = g_new0 (const gchar*, args_length + 3);

+    /* allocate enough space for the args plus "lvm", "--config", "--devices" and NULL */

+    const gchar **argv = g_new0 (const gchar*, args_length + 4);

     /* construct argv from args with "lvm" prepended */

     argv[0] = "lvm";

     for (i=0; i < args_length; i++)

         argv[i+1] = args[i];

-    argv[args_length + 1] = global_config_str ? g_strdup_printf("--config=%s", global_config_str) : NULL;

-    argv[args_length + 2] = NULL;

+    if (global_config_str) {

+        config_arg = g_strdup_printf("--config=%s", global_config_str);

+        argv[++args_length] = config_arg;

+    }

+    if (global_devices_str) {

+        devices_arg = g_strdup_printf("--devices=%s", global_devices_str);

+        argv[++args_length] = devices_arg;

+    }

+    argv[++args_length] = NULL;

     success = bd_utils_exec_and_report_error (argv, extra, error);

     if (lock_config)

         g_mutex_unlock (&global_config_lock);

-    g_free ((gchar *) argv[args_length + 1]);

     g_free (argv);

     return success;

@@ -368,6 +383,8 @@ static gboolean call_lvm_and_capture_output (const gchar **args, const BDExtraAr

     gboolean success = FALSE;

     guint i = 0;

     guint args_length = g_strv_length ((gchar **) args);

+    g_autofree gchar *config_arg = NULL;

+    g_autofree gchar *devices_arg = NULL;

     if (!check_deps (&avail_deps, DEPS_LVM_MASK, deps, DEPS_LAST, &deps_check_lock, error))

         return FALSE;

@@ -375,19 +392,25 @@ static gboolean call_lvm_and_capture_output (const gchar **args, const BDExtraAr

     /* don't allow global config string changes during the run */

     g_mutex_lock (&global_config_lock);

-    /* allocate enough space for the args plus "lvm", "--config" and NULL */

-    const gchar **argv = g_new0 (const gchar*, args_length + 3);

+    /* allocate enough space for the args plus "lvm", "--config", "--devices" and NULL */

+    const gchar **argv = g_new0 (const gchar*, args_length + 4);

     /* construct argv from args with "lvm" prepended */

     argv[0] = "lvm";

     for (i=0; i < args_length; i++)

         argv[i+1] = args[i];

-    argv[args_length + 1] = global_config_str ? g_strdup_printf("--config=%s", global_config_str) : NULL;

-    argv[args_length + 2] = NULL;

+    if (global_config_str) {

+        config_arg = g_strdup_printf("--config=%s", global_config_str);

+        argv[++args_length] = config_arg;

+    }

+    if (global_devices_str) {

+        devices_arg = g_strdup_printf("--devices=%s", global_devices_str);

+        argv[++args_length] = devices_arg;

+    }

+    argv[++args_length] = NULL;

     success = bd_utils_exec_and_capture_output (argv, extra, output, error);

     g_mutex_unlock (&global_config_lock);

-    g_free ((gchar *) argv[args_length + 1]);

     g_free (argv);

     return success;

@@ -2018,6 +2041,58 @@ gchar* bd_lvm_get_global_config (GError **error UNUSED) {

     return ret;

 }

+/**

+ * bd_lvm_set_devices_filter:

+ * @devices: (allow-none) (array zero-terminated=1): list of devices for lvm commands to work on

+ * @error: (out): place to store error (if any)

+ *

+ * Returns: whether the devices filter was successfully set or not

+ *

+ * Tech category: %BD_LVM_TECH_DEVICES no mode (it is ignored)

+ */

+gboolean bd_lvm_set_devices_filter (const gchar **devices, GError **error) {

+    if (!bd_lvm_is_tech_avail (BD_LVM_TECH_DEVICES, 0, error))

+        return FALSE;

+

+    g_mutex_lock (&global_config_lock);

+

+    /* first free the old value */

+    g_free (global_devices_str);

+

+    /* now store the new one */

+    if (!devices || !(*devices))

+        global_devices_str = NULL;

+    else

+        global_devices_str = g_strjoinv (",", (gchar **) devices);

+

+    g_mutex_unlock (&global_config_lock);

+    return TRUE;

+}

+

+/**

+ * bd_lvm_get_devices_filter:

+ * @error: (out): place to store error (if any)

+ *

+ * Returns: (transfer full) (array zero-terminated=1): a copy of a string representation of

+ *                                                     the currently set LVM devices filter

+ *

+ * Tech category: %BD_LVM_TECH_DEVICES no mode (it is ignored)

+ */

+gchar** bd_lvm_get_devices_filter (GError **error UNUSED) {

+    gchar **ret = NULL;

+

+    g_mutex_lock (&global_config_lock);

+

+    if (global_devices_str)

+        ret = g_strsplit (global_devices_str, ",", -1);

+    else

+        ret = NULL;

+

+    g_mutex_unlock (&global_config_lock);

+

+    return ret;

+}

+

 /**

  * bd_lvm_cache_get_default_md_size:

  * @cache_size: size of the cache to determine MD size for

diff --git a/src/plugins/lvm.h b/src/plugins/lvm.h

index 2162d76..8063693 100644

--- a/src/plugins/lvm.h

+++ b/src/plugins/lvm.h

@@ -216,6 +216,7 @@ typedef enum {

     BD_LVM_TECH_CACHE_CALCS,

     BD_LVM_TECH_GLOB_CONF,

     BD_LVM_TECH_VDO,

+    BD_LVM_TECH_DEVICES,

 } BDLVMTech;

 typedef enum {

@@ -289,6 +290,9 @@ gboolean bd_lvm_thsnapshotcreate (const gchar *vg_name, const gchar *origin_name

 gboolean bd_lvm_set_global_config (const gchar *new_config, GError **error);

 gchar* bd_lvm_get_global_config (GError **error);

+gboolean bd_lvm_set_devices_filter (const gchar **devices, GError **error);

+gchar** bd_lvm_get_devices_filter (GError **error);

+

 guint64 bd_lvm_cache_get_default_md_size (guint64 cache_size, GError **error);

 const gchar* bd_lvm_cache_get_mode_str (BDLVMCacheMode mode, GError **error);

 BDLVMCacheMode bd_lvm_cache_get_mode_from_str (const gchar *mode_str, GError **error);

diff --git a/tests/library_test.py b/tests/library_test.py

index 08e44fd..efd17bd 100644

--- a/tests/library_test.py

+++ b/tests/library_test.py

@@ -13,18 +13,178 @@ class LibraryOpsTestCase(unittest.TestCase):

     # all plugins except for 'btrfs', 'fs' and 'mpath' -- these don't have all

     # the dependencies on CentOS/Debian and we don't need them for this test

     requested_plugins = BlockDev.plugin_specs_from_names(("crypto", "dm",

-                                                          "kbd", "loop", "lvm",

+                                                          "kbd", "loop",

                                                           "mdraid", "part", "swap"))

+    @classmethod

+    def setUpClass(cls):

+        if not BlockDev.is_initialized():

+            BlockDev.init(cls.requested_plugins, None)

+        else:

+            BlockDev.reinit(cls.requested_plugins, True, None)

+

+    @classmethod

+    def tearDownClass(cls):

+        BlockDev.switch_init_checks(True)

+

+    def my_log_func(self, level, msg):

+        # not much to verify here

+        self.assertTrue(isinstance(level, int))

+        self.assertTrue(isinstance(msg, str))

+

+        self.log += msg + "\n"

+

+    @tag_test(TestTags.CORE)

+    def test_logging_setup(self):

+        """Verify that setting up logging works as expected"""

+

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, False, self.my_log_func))

+

+        succ = BlockDev.utils_exec_and_report_error(["true"])

+        self.assertTrue(succ)

+

+        # reinit with no logging function should change nothing about logging

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, False, None))

+

+        succ, out = BlockDev.utils_exec_and_capture_output(["echo", "hi"])

+        self.assertTrue(succ)

+        self.assertEqual(out, "hi\n")

+

+        match = re.search(r'Running \[(\d+)\] true', self.log)

+        self.assertIsNot(match, None)

+        task_id1 = match.group(1)

+        match = re.search(r'Running \[(\d+)\] echo hi', self.log)

+        self.assertIsNot(match, None)

+        task_id2 = match.group(1)

+

+        self.assertIn("...done [%s] (exit code: 0)" % task_id1, self.log)

+        self.assertIn("stdout[%s]:" % task_id1, self.log)

+        self.assertIn("stderr[%s]:" % task_id1, self.log)

+

+        self.assertIn("stdout[%s]: hi" % task_id2, self.log)

+        self.assertIn("stderr[%s]:" % task_id2, self.log)

+        self.assertIn("...done [%s] (exit code: 0)" % task_id2, self.log)

+

+    @tag_test(TestTags.CORE)

+    def test_require_plugins(self):

+        """Verify that loading only required plugins works as expected"""

+

+        ps = BlockDev.PluginSpec()

+        ps.name = BlockDev.Plugin.SWAP

+        ps.so_name = ""

+        self.assertTrue(BlockDev.reinit([ps], True, None))

+        self.assertEqual(BlockDev.get_available_plugin_names(), ["swap"])

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

+

+    @tag_test(TestTags.CORE)

+    def test_not_implemented(self):

+        """Verify that unloaded/unimplemented functions report errors"""

+

+        # should be loaded and working

+        self.assertTrue(BlockDev.md_canonicalize_uuid("3386ff85:f5012621:4a435f06:1eb47236"))

+

+        ps = BlockDev.PluginSpec()

+        ps.name = BlockDev.Plugin.SWAP

+        ps.so_name = ""

+        self.assertTrue(BlockDev.reinit([ps], True, None))

+        self.assertEqual(BlockDev.get_available_plugin_names(), ["swap"])

+

+        # no longer loaded

+        with self.assertRaises(GLib.GError):

+            BlockDev.md_canonicalize_uuid("3386ff85:f5012621:4a435f06:1eb47236")

+

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

+

+        # loaded again

+        self.assertTrue(BlockDev.md_canonicalize_uuid("3386ff85:f5012621:4a435f06:1eb47236"))

+

+    def test_ensure_init(self):

+        """Verify that ensure_init just returns when already initialized"""

+

+        # the library is already initialized, ensure_init() shonuld do nothing

+        avail_plugs = BlockDev.get_available_plugin_names()

+        self.assertTrue(BlockDev.ensure_init(self.requested_plugins, None))

+        self.assertEqual(avail_plugs, BlockDev.get_available_plugin_names())

+

+        # reinit with a subset of plugins

+        plugins = BlockDev.plugin_specs_from_names(["swap", "part"])

+        self.assertTrue(BlockDev.reinit(plugins, True, None))

+        self.assertEqual(set(BlockDev.get_available_plugin_names()), set(["swap", "part"]))

+

+        # ensure_init with the same subset -> nothing should change

+        self.assertTrue(BlockDev.ensure_init(plugins, None))

+        self.assertEqual(set(BlockDev.get_available_plugin_names()), set(["swap", "part"]))

+

+        # ensure_init with more plugins -> extra plugins should be loaded

+        plugins = BlockDev.plugin_specs_from_names(["swap", "part", "crypto"])

+        self.assertTrue(BlockDev.ensure_init(plugins, None))

+        self.assertEqual(set(BlockDev.get_available_plugin_names()), set(["swap", "part", "crypto"]))

+

+        # reinit to unload all plugins

+        self.assertTrue(BlockDev.reinit([], True, None))

+        self.assertEqual(BlockDev.get_available_plugin_names(), [])

+

+        # ensure_init to load all plugins back

+        self.assertTrue(BlockDev.ensure_init(self.requested_plugins, None))

+        self.assertGreaterEqual(len(BlockDev.get_available_plugin_names()), 7)

+

+    def test_try_reinit(self):

+        """Verify that try_reinit() works as expected"""

+

+        # try reinitializing with only some utilities being available and thus

+        # only some plugins able to load

+        with fake_path("tests/lib_missing_utils", keep_utils=["swapon", "swapoff", "mkswap", "swaplabel"]):

+            succ, loaded = BlockDev.try_reinit(self.requested_plugins, True, None)

+            self.assertFalse(succ)

+            for plug_name in ("swap", "crypto"):

+                self.assertIn(plug_name, loaded)

+

+        # reset back to all plugins

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

+

+        # now the same with a subset of plugins requested

+        plugins = BlockDev.plugin_specs_from_names(["swap", "crypto"])

+        with fake_path("tests/lib_missing_utils", keep_utils=["swapon", "swapoff", "mkswap", "swaplabel"]):

+            succ, loaded = BlockDev.try_reinit(plugins, True, None)

+            self.assertTrue(succ)

+            self.assertEqual(set(loaded), set(["swap", "crypto"]))

+

+    def test_non_en_init(self):

+        """Verify that the library initializes with lang different from en_US"""

+

+        orig_lang = os.environ.get("LANG")

+        os.environ["LANG"] = "cs.CZ_UTF-8"

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

+        if orig_lang:

+            os.environ["LANG"] = orig_lang

+        else:

+            del os.environ["LANG"]

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

+

+

+class PluginsTestCase(unittest.TestCase):

+    # only LVM plugin for this test

+    requested_plugins = BlockDev.plugin_specs_from_names(("lvm",))

+

     orig_config_dir = ""

     @classmethod

     def setUpClass(cls):

+        BlockDev.switch_init_checks(False)

         if not BlockDev.is_initialized():

             BlockDev.init(cls.requested_plugins, None)

         else:

             BlockDev.reinit(cls.requested_plugins, True, None)

+        try:

+            cls.devices_avail = BlockDev.lvm_is_tech_avail(BlockDev.LVMTech.DEVICES, 0)

+        except:

+            cls.devices_avail = False

+

+    @classmethod

+    def tearDownClass(cls):

+        BlockDev.switch_init_checks(True)

+

     def setUp(self):

         self.orig_config_dir = os.environ.get("LIBBLOCKDEV_CONFIG_DIR", "")

         self.addCleanup(self._clean_up)

@@ -185,6 +345,12 @@ class LibraryOpsTestCase(unittest.TestCase):

     def test_plugin_fallback(self):

         """Verify that fallback when loading plugins works as expected"""

+        if not self.devices_avail:

+            self.skipTest("skipping plugin fallback test: missing some LVM dependencies")

+

+        BlockDev.switch_init_checks(True)

+        self.addCleanup(BlockDev.switch_init_checks, False)

+

         # library should be successfully initialized

         self.assertTrue(BlockDev.is_initialized())

@@ -206,7 +372,7 @@ class LibraryOpsTestCase(unittest.TestCase):

         # now reinit the library with the config preferring the new build

         orig_conf_dir = os.environ.get("LIBBLOCKDEV_CONFIG_DIR")

-        os.environ["LIBBLOCKDEV_CONFIG_DIR"] = "tests/plugin_prio_conf.d"

+        os.environ["LIBBLOCKDEV_CONFIG_DIR"] = "tests/test_configs/plugin_prio_conf.d"

         self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

         # the original plugin should be loaded because the new one should fail

@@ -243,139 +409,9 @@ class LibraryOpsTestCase(unittest.TestCase):

         self.assertEqual(BlockDev.lvm_get_max_lv_size(), orig_max_size)

-    def my_log_func(self, level, msg):

-        # not much to verify here

-        self.assertTrue(isinstance(level, int))

-        self.assertTrue(isinstance(msg, str))

-

-        self.log += msg + "\n"

-

-    @tag_test(TestTags.CORE)

-    def test_logging_setup(self):

-        """Verify that setting up logging works as expected"""

-

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, False, self.my_log_func))

-

-        succ = BlockDev.utils_exec_and_report_error(["true"])

-        self.assertTrue(succ)

-

-        # reinit with no logging function should change nothing about logging

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, False, None))

-

-        succ, out = BlockDev.utils_exec_and_capture_output(["echo", "hi"])

-        self.assertTrue(succ)

-        self.assertEqual(out, "hi\n")

-

-        match = re.search(r'Running \[(\d+)\] true', self.log)

-        self.assertIsNot(match, None)

-        task_id1 = match.group(1)

-        match = re.search(r'Running \[(\d+)\] echo hi', self.log)

-        self.assertIsNot(match, None)

-        task_id2 = match.group(1)

-

-        self.assertIn("...done [%s] (exit code: 0)" % task_id1, self.log)

-        self.assertIn("stdout[%s]:" % task_id1, self.log)

-        self.assertIn("stderr[%s]:" % task_id1, self.log)

-

-        self.assertIn("stdout[%s]: hi" % task_id2, self.log)

-        self.assertIn("stderr[%s]:" % task_id2, self.log)

-        self.assertIn("...done [%s] (exit code: 0)" % task_id2, self.log)

-

-    @tag_test(TestTags.CORE)

-    def test_require_plugins(self):

-        """Verify that loading only required plugins works as expected"""

-

-        ps = BlockDev.PluginSpec()

-        ps.name = BlockDev.Plugin.SWAP

-        ps.so_name = ""

-        self.assertTrue(BlockDev.reinit([ps], True, None))

-        self.assertEqual(BlockDev.get_available_plugin_names(), ["swap"])

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

-

-    @tag_test(TestTags.CORE)

-    def test_not_implemented(self):

-        """Verify that unloaded/unimplemented functions report errors"""

-

-        # should be loaded and working

-        self.assertTrue(BlockDev.lvm_get_max_lv_size() > 0)

-        ps = BlockDev.PluginSpec()

-        ps.name = BlockDev.Plugin.SWAP

-        ps.so_name = ""

-        self.assertTrue(BlockDev.reinit([ps], True, None))

-        self.assertEqual(BlockDev.get_available_plugin_names(), ["swap"])

-

-        # no longer loaded

-        with self.assertRaises(GLib.GError):

-            BlockDev.lvm_get_max_lv_size()

-

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

-

-        # loaded again

-        self.assertTrue(BlockDev.lvm_get_max_lv_size() > 0)

-

-    def test_ensure_init(self):

-        """Verify that ensure_init just returns when already initialized"""

-

-        # the library is already initialized, ensure_init() shonuld do nothing

-        avail_plugs = BlockDev.get_available_plugin_names()

-        self.assertTrue(BlockDev.ensure_init(self.requested_plugins, None))

-        self.assertEqual(avail_plugs, BlockDev.get_available_plugin_names())

-

-        # reinit with a subset of plugins

-        plugins = BlockDev.plugin_specs_from_names(["swap", "lvm"])

-        self.assertTrue(BlockDev.reinit(plugins, True, None))

-        self.assertEqual(set(BlockDev.get_available_plugin_names()), set(["swap", "lvm"]))

-

-        # ensure_init with the same subset -> nothing should change

-        self.assertTrue(BlockDev.ensure_init(plugins, None))

-        self.assertEqual(set(BlockDev.get_available_plugin_names()), set(["swap", "lvm"]))

-

-        # ensure_init with more plugins -> extra plugins should be loaded

-        plugins = BlockDev.plugin_specs_from_names(["swap", "lvm", "crypto"])

-        self.assertTrue(BlockDev.ensure_init(plugins, None))

-        self.assertEqual(set(BlockDev.get_available_plugin_names()), set(["swap", "lvm", "crypto"]))

-

-        # reinit to unload all plugins

-        self.assertTrue(BlockDev.reinit([], True, None))

-        self.assertEqual(BlockDev.get_available_plugin_names(), [])

-

-        # ensure_init to load all plugins back

-        self.assertTrue(BlockDev.ensure_init(self.requested_plugins, None))

-        self.assertGreaterEqual(len(BlockDev.get_available_plugin_names()), 8)

-

-    def test_try_reinit(self):

-        """Verify that try_reinit() works as expected"""

-

-        # try reinitializing with only some utilities being available and thus

-        # only some plugins able to load

-        with fake_path("tests/lib_missing_utils", keep_utils=["swapon", "swapoff", "mkswap", "lvm", "swaplabel"]):

-            succ, loaded = BlockDev.try_reinit(self.requested_plugins, True, None)

-            self.assertFalse(succ)

-            for plug_name in ("swap", "lvm", "crypto"):

-                self.assertIn(plug_name, loaded)

-

-        # reset back to all plugins

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

-

-        # now the same with a subset of plugins requested

-        plugins = BlockDev.plugin_specs_from_names(["lvm", "swap", "crypto"])

-        with fake_path("tests/lib_missing_utils", keep_utils=["swapon", "swapoff", "mkswap", "lvm","swaplabel"]):

-            succ, loaded = BlockDev.try_reinit(plugins, True, None)

-            self.assertTrue(succ)

-            self.assertEqual(set(loaded), set(["swap", "lvm", "crypto"]))

-

-    def test_non_en_init(self):

-        """Verify that the library initializes with lang different from en_US"""

-

-        orig_lang = os.environ.get("LANG")

-        os.environ["LANG"] = "cs.CZ_UTF-8"

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

-        if orig_lang:

-            os.environ["LANG"] = orig_lang

-        else:

-            del os.environ["LANG"]

-        self.assertTrue(BlockDev.reinit(self.requested_plugins, True, None))

+class DepChecksTestCase(unittest.TestCase):

+    requested_plugins = BlockDev.plugin_specs_from_names(( "swap",))

     def test_dep_checks_disabled(self):

         """Verify that disabling runtime dep checks works"""

diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py

index 4882da8..35ace37 100644

--- a/tests/lvm_dbus_tests.py

+++ b/tests/lvm_dbus_tests.py

@@ -33,6 +33,11 @@ class LVMTestCase(unittest.TestCase):

             else:

                 BlockDev.reinit([cls.ps, cls.ps2], True, None)

+        try:

+            cls.devices_avail = BlockDev.lvm_is_tech_avail(BlockDev.LVMTech.DEVICES, 0)

+        except:

+            cls.devices_avail = False

+

     @classmethod

     def _get_lvm_version(cls):

         _ret, out, _err = run_command("lvm version")

@@ -44,8 +49,7 @@ class LVMTestCase(unittest.TestCase):

 @unittest.skipUnless(lvm_dbus_running, "LVM DBus not running")

 class LvmNoDevTestCase(LVMTestCase):

-    def __init__(self, *args, **kwargs):

-        super(LvmNoDevTestCase, self).__init__(*args, **kwargs)

+    def setUp(self):

         self._log = ""

     @tag_test(TestTags.NOSTORAGE)

@@ -227,6 +231,45 @@ class LvmNoDevTestCase(LVMTestCase):

         succ = BlockDev.lvm_set_global_config(None)

         self.assertTrue(succ)

+    @tag_test(TestTags.NOSTORAGE)

+    def test_get_set_global_devices_filter(self):

+        """Verify that getting and setting LVM devices filter works as expected"""

+        if not self.devices_avail:

+            self.skipTest("skipping LVM devices filter test: not supported")

+

+        # setup logging

+        self.assertTrue(BlockDev.reinit([self.ps], False, self._store_log))

+

+        # no global config set initially

+        self.assertListEqual(BlockDev.lvm_get_devices_filter(), [])

+

+        # set and try to get back

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sda"])

+        self.assertTrue(succ)

+        self.assertListEqual(BlockDev.lvm_get_devices_filter(), ["/dev/sda"])

+

+        # reset and try to get back

+        succ = BlockDev.lvm_set_devices_filter(None)

+        self.assertTrue(succ)

+        self.assertListEqual(BlockDev.lvm_get_devices_filter(), [])

+

+        # set twice and try to get back twice

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sda"])

+        self.assertTrue(succ)

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sdb"])

+        self.assertTrue(succ)

+        self.assertEqual(BlockDev.lvm_get_devices_filter(), ["/dev/sdb"])

+

+        # set something sane and check it's really used

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sdb", "/dev/sdc"])

+        BlockDev.lvm_pvscan()

+        self.assertIn("'--devices'", self._log)

+        self.assertIn("'/dev/sdb,/dev/sdc'", self._log)

+

+        # reset back to default

+        succ = BlockDev.lvm_set_devices_filter(None)

+        self.assertTrue(succ)

+

     @tag_test(TestTags.NOSTORAGE)

     def test_cache_get_default_md_size(self):

         """Verify that default cache metadata size is calculated properly"""

diff --git a/tests/lvm_test.py b/tests/lvm_test.py

index eb94c91..b37a879 100644

--- a/tests/lvm_test.py

+++ b/tests/lvm_test.py

@@ -22,10 +22,17 @@ class LVMTestCase(unittest.TestCase):

         ps.so_name = "libbd_lvm.so.2"

         cls.requested_plugins = [ps]

+        BlockDev.switch_init_checks(False)

         if not BlockDev.is_initialized():

             BlockDev.init(cls.requested_plugins, None)

         else:

             BlockDev.reinit(cls.requested_plugins, True, None)

+        BlockDev.switch_init_checks(True)

+

+        try:

+            cls.devices_avail = BlockDev.lvm_is_tech_avail(BlockDev.LVMTech.DEVICES, 0)

+        except:

+            cls.devices_avail = False

     @classmethod

     def _get_lvm_version(cls):

@@ -39,6 +46,8 @@ class LVMTestCase(unittest.TestCase):

 class LvmNoDevTestCase(LVMTestCase):

     def __init__(self, *args, **kwargs):

         super(LvmNoDevTestCase, self).__init__(*args, **kwargs)

+

+    def setUp(self):

         self._log = ""

     @tag_test(TestTags.NOSTORAGE)

@@ -213,6 +222,44 @@ class LvmNoDevTestCase(LVMTestCase):

         succ = BlockDev.lvm_set_global_config(None)

         self.assertTrue(succ)

+    @tag_test(TestTags.NOSTORAGE)

+    def test_get_set_global_devices_filter(self):

+        """Verify that getting and setting LVM devices filter works as expected"""

+        if not self.devices_avail:

+            self.skipTest("skipping LVM devices filter test: not supported")

+

+        # setup logging

+        self.assertTrue(BlockDev.reinit(self.requested_plugins, False, self._store_log))

+

+        # no global config set initially

+        self.assertListEqual(BlockDev.lvm_get_devices_filter(), [])

+

+        # set and try to get back

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sda"])

+        self.assertTrue(succ)

+        self.assertListEqual(BlockDev.lvm_get_devices_filter(), ["/dev/sda"])

+

+        # reset and try to get back

+        succ = BlockDev.lvm_set_devices_filter(None)

+        self.assertTrue(succ)

+        self.assertListEqual(BlockDev.lvm_get_devices_filter(), [])

+

+        # set twice and try to get back twice

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sda"])

+        self.assertTrue(succ)

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sdb"])

+        self.assertTrue(succ)

+        self.assertEqual(BlockDev.lvm_get_devices_filter(), ["/dev/sdb"])

+

+        # set something sane and check it's really used

+        succ = BlockDev.lvm_set_devices_filter(["/dev/sdb", "/dev/sdc"])

+        BlockDev.lvm_lvs(None)