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

{python-linstor-1.21.0 → python_linstor-1.28.2}/MANIFEST.in

@@ -7,4 +7,3 @@ include MANIFEST.in
 include COPYING
 include README.md
 include Makefile
-include setup.cfg.py2

{python-linstor-1.21.0 → python_linstor-1.28.2}/Makefile

@@ -1,34 +1,23 @@
-GIT = git
 INSTALLFILES=.installfiles
 PYTHON ?= python3
-override GITHEAD := $(shell test -e .git && $(GIT) rev-parse HEAD)
 
-U := $(shell $(PYTHON) ./setup.py versionup2date >/dev/null 2>&1; echo $$?;)
 TESTS = $(wildcard unit-tests/*_test.py)
 
 all:
 	$(PYTHON) setup.py build
 
-install: gensrc linstor/consts_githash.py
+install: gensrc
 	$(PYTHON) setup.py install --record $(INSTALLFILES)
 
 uninstall:
 	test -f $(INSTALLFILES) && cat $(INSTALLFILES) | xargs rm -rf || true
 	rm -f $(INSTALLFILES)
 
-ifneq ($(U),0)
-up2date:
-	$(error "Update your Version strings/Changelogs")
-else
-up2date: linstor/consts_githash.py
-	$(info "Version strings/Changelogs up to date")
-endif
-
 .PHONY: linstor/drbdsetup_options.py
 linstor/drbdsetup_options.py:
 	linstor-common/gendrbdoptions.py python $@
 
-release: up2date clean
+release: clean
 	$(PYTHON) setup.py sdist
 	@echo && echo "Did you run distclean?"
 	@echo && echo "Did you generate and commit the latest drbdsetup options?"
@@ -45,29 +34,16 @@ gensrc:
 	make -C linstor-common python
 
 # no gensrc here, that is in debian/rules
-deb: up2date
+deb:
 	[ -d ./debian ] || (echo "Your checkout/tarball does not contain a debian directory" && false)
 	debuild -i -us -uc -b
 
 # it is up to you (or the buildenv) to provide a distri specific setup.cfg
-rpm: gensrc up2date
+rpm: gensrc
 	$(PYTHON) setup.py bdist_rpm
 
-.PHONY: linstor/consts_githash.py
-ifdef GITHEAD
-override GITDIFF := $(shell $(GIT) diff --name-only HEAD 2>/dev/null | \
-			grep -vxF "MANIFEST.in" | \
-			tr -s '\t\n' '  ' | \
-			sed -e 's/^/ /;s/ *$$//')
-linstor/consts_githash.py:
-	@echo "GITHASH = 'GIT-hash: $(GITHEAD)$(GITDIFF)'" > $@
-else
-linstor/consts_githash.py:
-	@echo >&2 "Need a git checkout to regenerate $@"; test -s $@
-endif
-
 md5sums:
-	CURDATE=$$(date +%s); for i in $$(${GIT} ls-files | sort); do md5sum $$i >> md5sums.$${CURDATE}; done
+	CURDATE=$$(date +%s); for i in $$(git ls-files | sort); do md5sum $$i >> md5sums.$${CURDATE}; done
 
 clean:
 	$(PYTHON) setup.py clean
@@ -75,10 +51,6 @@ clean:
 distclean: clean
 	git clean -d -f || true
 
-check:
-	# currently none
-	# $(PYTHON) $(TESTS)
-
 .PHONY: doc upload-doc
 doc: gensrc
 	make -C doc html

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

@@ -1,27 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-linstor
-Version: 1.21.0
+Version: 1.28.2
 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: 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.6
 Description-Content-Type: text/markdown
 License-File: COPYING
-Requires-Dist: enum34; python_version < "3"
+Dynamic: home-page
+Dynamic: license-file
 
 # LINSTOR Python API
 
@@ -32,6 +35,23 @@ LVM/ZFS volumes across a group of machines. It maintains DRBD configuration on t
 creates/deletes the backing LVM/ZFS volumes. It automatically places the backing LVM/ZFS volumes among the
 participating machines.
 
+# Building
+
+To build the package, install the `build` module and run it from the project root:
+
+```bash
+pip install build
+python -m build
+```
+
+This will create both source distribution (`.tar.gz`) and wheel (`.whl`) files in the `dist/` directory.
+
+To install the package locally for development:
+
+```bash
+pip install -e .
+```
+
 # Online API documentation
 A rendered html documentation for the LINSTOR Python API can be found [here](https://linbit.github.io/linstor-api-py/).
 

{python-linstor-1.21.0 → python_linstor-1.28.2}/README.md

@@ -7,6 +7,23 @@ LVM/ZFS volumes across a group of machines. It maintains DRBD configuration on t
 creates/deletes the backing LVM/ZFS volumes. It automatically places the backing LVM/ZFS volumes among the
 participating machines.
 
+# Building
+
+To build the package, install the `build` module and run it from the project root:
+
+```bash
+pip install build
+python -m build
+```
+
+This will create both source distribution (`.tar.gz`) and wheel (`.whl`) files in the `dist/` directory.
+
+To install the package locally for development:
+
+```bash
+pip install -e .
+```
+
 # Online API documentation
 A rendered html documentation for the LINSTOR Python API can be found [here](https://linbit.github.io/linstor-api-py/).
 

python_linstor-1.28.2/linstor/config.py

@@ -0,0 +1,92 @@
+import os
+from enum import Enum
+from configparser import ConfigParser
+
+from linstor.linstorapi import MultiLinstor
+
+
+class ConfigFileLevel(Enum):
+    USER = 1
+    SYS = 2
+
+    def to_config_path(self):
+        config_file = "linstor-client.conf"
+        if self.value == 1:
+            home_dir = os.path.expanduser("~")
+            return os.path.join(home_dir, ".config", "linstor", config_file)
+        elif self.value == 2:
+            return os.path.join('/etc', 'linstor', config_file)
+        else:
+            return None
+
+
+class Config(object):
+    CONFIG = None  # cache object
+
+    @staticmethod
+    def read_config(config_file):
+        cp = ConfigParser()
+        cp.read(config_file)
+        config = {}
+        for section in cp.sections():
+            config[section] = cp.items(section)
+        return config
+
+    @staticmethod
+    def get_section(section, config_file_name=None):
+        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
+    def set_value(section: str, key: str, value: str, level: ConfigFileLevel = ConfigFileLevel.USER):
+        config_path = level.to_config_path()
+        cp = ConfigParser()
+        cp.read(config_path)
+        if section not in cp.sections():
+            cp.add_section(section)
+        cp.set(section, key, value)
+        config_dir = os.path.dirname(config_path)
+        if config_dir:
+            os.makedirs(config_dir, exist_ok=True)
+        with open(config_path, 'w') as f:
+            cp.write(f)
+
+    @staticmethod
+    def get_controllers(section='global', config_file_name=None, fallback='linstor://localhost'):
+        """
+        :param str section: Section to parse, defaults to 'global'
+        :param str config_file_name: Config file to parse, if not set, the default files in /etc and $HOME are
+         parsed
+        :param str fallback: Fallback controller if none was found in the environment or the config. Defaults
+         to 'linstor://localhost'.
+        :return: List of linstor uris. This list is intended to be used via the MultiLinstor class.
+        :rtype: list[str]
+        """
+        controllers = os.environ.get('LS_CONTROLLERS', None)
+        if not controllers:
+            cfg = Config.get_section(section, config_file_name)
+            controllers = cfg.get('controllers', fallback)
+
+        return MultiLinstor.controller_uri_list(controllers)