[checkmk-commits] Started moving packaging module to cmk_base

Module: check_mk Branch: master Commit: 6541dd59bbfd202cdbf5e4a7590e1b8ea306fced URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6541dd59bbfd20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 16:08:21 2016 +0200 Started moving packaging module to cmk_base --- {modules => cmk_base}/packaging.py | 6 +++++- modules/automation.py | 42 +++++++++++++++++++------------------- modules/check_mk.py | 4 ++-- modules/check_mk_base.py | 2 ++ tests/testlib/pylint_cmk.py | 1 - 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/modules/packaging.py b/cmk_base/packaging.py similarity index 99% rename from modules/packaging.py rename to cmk_base/packaging.py index c10c686..24dabb0 100644 --- a/modules/packaging.py +++ b/cmk_base/packaging.py @@ -24,8 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import os import ast -import pprint, tarfile +import pprint +import sys +import tarfile +import time import cmk.tty as tty import cmk.paths diff --git a/modules/automation.py b/modules/automation.py index 13450a8..d19908e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1118,47 +1118,47 @@ def automation_get_agent_output(args): def automation_get_package_info(args): - load_module("packaging") + import cmk_base.packaging packages = {} - for package_name in all_package_names(): - packages[package_name] = read_package_info(package_name) + for package_name in cmk_base.packaging.all_package_names(): + packages[package_name] = cmk_base.packaging.read_package_info(package_name) return { - "installed" : packages, - "unpackaged" : unpackaged_files(), - "parts" : package_part_info(), + "installed" : packages, + "unpackaged" : cmk_base.packaging.unpackaged_files(), + "parts" : cmk_base.packaging.package_part_info(), } def automation_get_package(args): - load_module("packaging") + import cmk_base.packaging package_name = args[0] - package = read_package_info(package_name) + package = cmk_base.packaging.read_package_info(package_name) if not package: raise MKAutomationError("Package not installed or corrupt") output_file = fake_file() - create_mkp_file(package, file_object=output_file) + cmk_base.packaging.create_mkp_file(package, file_object=output_file) return package, output_file.content() def automation_create_or_edit_package(args, mode): - load_module("packaging") + import cmk_base.packaging package_name = args[0] new_package_info = eval(sys.stdin.read()) if mode == "create": - create_package(new_package_info) + cmk_base.packaging.create_package(new_package_info) else: - edit_package(package_name, new_package_info) + cmk_base.packaging.edit_package(package_name, new_package_info) return None def automation_install_package(args): - load_module("packaging") + import cmk_base.packaging file_content = sys.stdin.read() input_file = fake_file(file_content) try: - return install_package(file_object=input_file) + return cmk_base.packaging.install_package(file_object=input_file) except Exception, e: if cmk.debug.enabled(): raise @@ -1166,29 +1166,29 @@ def automation_install_package(args): def automation_remove_or_release_package(args, mode): - load_module("packaging") + import cmk_base.packaging package_name = args[0] - package = read_package_info(package_name) + package = cmk_base.packaging.read_package_info(package_name) if not package: raise MKAutomationError("Package not installed or corrupt") if mode == "remove": - remove_package(package) + cmk_base.packaging.remove_package(package) else: - remove_package_info(package_name) + cmk_base.packaging.remove_package_info(package_name) return None def automation_remove_unpackaged_file(args): - load_module("packaging") + import cmk_base.packaging part_name = args[0] - if part_name not in [ p[0] for p in package_parts ]: + if part_name not in [ p[0] for p in cmk_base.packaging.package_parts ]: raise MKAutomationError("Invalid package part") rel_path = args[1] if "../" in rel_path or rel_path.startswith("/"): raise MKAutomationError("Invalid file name") - for part, _unused_title, _unused_perm, dir in package_parts: + for part, _unused_title, _unused_perm, dir in cmk_base.packaging.package_parts: if part == part_name: abspath = dir + "/" + rel_path if not os.path.isfile(abspath): diff --git a/modules/check_mk.py b/modules/check_mk.py index 3217d6d..aa7334d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4773,8 +4773,8 @@ try: show_paths() done = True elif o in ['-P', '--package']: - load_module("packaging") - do_packaging(args) + import cmk_base.packaging + cmk_base.packaging.do_packaging(args) done = True elif o in ['--localize']: import cmk_base.localize diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3f39a25..815d984 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1346,10 +1346,12 @@ def is_expected_agent_version(agent_version, expected_version): (agent_version, expected_version, e)) +# Works with Check_MK version (without tailing .cee and/or .demo) def is_daily_build_version(v): return len(v) == 10 or '-' in v +# Works with Check_MK version (without tailing .cee and/or .demo) def branch_of_daily_build(v): if len(v) == 10: return "master" diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 228ca43..48d97dd 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -24,7 +24,6 @@ def ordered_module_files(): "modules/notify.py", "modules/events.py", "modules/nagios.py", - "modules/packaging.py", "modules/prediction.py", "modules/automation.py", "modules/inventory.py",