python-linstor 1.21.0__tar.gz → 1.27.1__tar.gz

{python-linstor-1.21.0/python_linstor.egg-info → python_linstor-1.27.1}/PKG-INFO

@@ -1,27 +1,32 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-linstor
-Version: 1.21.0
+Version: 1.27.1
 Summary: Linstor python api
 Home-page: https://www.linbit.com
-Author: Robert Altnoeder <robert.altnoeder@linbit.com>, Roland Kammerer <roland.kammerer@linbit.com>, Rene Peinthor <rene.peinthor@linbit.com>, Moritz Wanzenboeck <moritz.wanzenboeck@linbit.com>
-Author-email: rene.peinthor@linbit.com
-Maintainer: LINBIT HA-Solutions GmbH
-Maintainer-email: drbd-user@lists.linbit.com
-License: LGPLv3
-Project-URL: Source Code, https://github.com/LINBIT/linstor-api-py
-Project-URL: Documentation, https://linbit.github.io/linstor-api-py
+Author-email: Rene Peinthor <rene.peinthor@linbit.com>, Roland Kammerer <roland.kammerer@linbit.com>, Gabor Hernadi <gabor.hernadi@linbit.com>, Moritz Wanzenboeck <moritz.wanzenboeck@linbit.com>
+Maintainer-email: Rene Peinthor <rene.peinthor@linbit.com>
+License-Expression: LGPL-3.0-or-later
+Project-URL: Homepage, https://github.com/LINBIT/linstor-api-py
+Project-URL: Documentation, https://linbit.github.io/linstor-api-py/
+Project-URL: Repository, https://github.com/LINBIT/linstor-api-py.git
+Project-URL: Issues, https://github.com/LINBIT/linstor-api-py/issues
+Project-URL: Changelog, https://github.com/LINBIT/linstor-api-py/blob/master/CHANGELOG.md
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: COPYING
-Requires-Dist: enum34; python_version < "3"
+Dynamic: home-page
+Dynamic: license-file
 
 # LINSTOR Python API
 

{python-linstor-1.21.0 → python_linstor-1.27.1}/linstor/config.py

@@ -9,6 +9,8 @@ except ImportError:
 
 
 class Config(object):
+    CONFIG = None  # cache object
+
     @staticmethod
     def read_config(config_file):
         cp = ConfigParser()
@@ -20,20 +22,29 @@ class Config(object):
 
     @staticmethod
     def get_section(section, config_file_name=None):
-        home_dir = os.path.expanduser("~")
-        config_file = "linstor-client.conf"
-        user_conf = os.path.join(home_dir, ".config", "linstor", config_file)
-        sys_conf = os.path.join('/etc', 'linstor', config_file)
-
-        config = None
-        if config_file_name and os.path.exists(config_file_name):
-            config = Config.read_config(config_file_name)
-        elif os.path.exists(user_conf):
-            config = Config.read_config(user_conf)
-        elif os.path.exists(sys_conf):
-            config = Config.read_config(sys_conf)
-
-        entries = config.get(section, []) if config else []
+        if Config.CONFIG is None:
+            home_dir = os.path.expanduser("~")
+            config_file = "linstor-client.conf"
+            user_conf = os.path.join(home_dir, ".config", "linstor", config_file)
+            sys_conf = os.path.join('/etc', 'linstor', config_file)
+            sys_d_conf_dir = os.path.join('/etc', 'linstor', 'linstor-client.d')
+
+            config = {}
+            if os.path.exists(sys_d_conf_dir):
+                conf_files = [x for x in os.listdir(sys_d_conf_dir) if x.endswith('.conf')]
+                conf_files.sort()
+                for file in conf_files:
+                    config.update(Config.read_config(os.path.join(sys_d_conf_dir, file)))
+
+            if config_file_name and os.path.exists(config_file_name):
+                config.update(Config.read_config(config_file_name))
+            elif os.path.exists(user_conf):
+                config.update(Config.read_config(user_conf))
+            elif os.path.exists(sys_conf):
+                config.update(Config.read_config(sys_conf))
+            Config.CONFIG = config
+
+        entries = Config.CONFIG.get(section, []) if Config.CONFIG else []
         return {k: v for k, v in entries}
 
     @staticmethod