diff --git a/frappyman.py b/frappyman.py index 1e415b9..7d63e86 100644 --- a/frappyman.py +++ b/frappyman.py @@ -178,12 +178,11 @@ def summarize_server_state(givencfgs, ourcfgs, sealist, sea_info, strict=False): :param sealist: list of running sea configuration :param sea_info: dict of with info about sea configs :param strict: when True return empty cfg result on error - :return: tuple (, , (, ), (, ) where: + :return: tuple (, , (, ), where: : proposed config not sure : dict of proposed cfg : dict of items runnning in frappy servers (addons are separated) : dict of items running on the sea server - : dict of given items (addons are separated) : dict of actions / remarks """ givencfgs = dict(givencfgs) @@ -274,7 +273,7 @@ def summarize_server_state(givencfgs, ourcfgs, sealist, sea_info, strict=False): prop = result.get(service, '') if prop == cfg and service not in restart: result[service] = True - return error, result, (ourcfgs, seacfgs), (givencfgs, remarks) + return error, result, (ourcfgs, seacfgs), remarks class FrappyManager(ServiceManager): @@ -545,13 +544,12 @@ class FrappyManager(ServiceManager): :param ins: the instance to be checked for :param givencfgs: a dict of cfg given by the ECS - :return: tuple (, , (, ), (, ) where: + :return: tuple (, , (, ), where: : proposed config not sure : dict of proposed cfg : dict of items runnning in frappy servers (addons are separated) : dict of items running on the sea server - : dict of given items (addons are separated) - : dict of actions / remarks + : dict of actions to do / remarks """ ourcfgs = self.get_cfg(ins, None) sea = SeaManager() diff --git a/test_proposed.py b/test_proposed.py index 4aafb58..3cc471c 100644 --- a/test_proposed.py +++ b/test_proposed.py @@ -1,5 +1,5 @@ import pytest -from servicemanager.frappyman import make_proposed +from servicemanager.frappyman import summarize_server_state sea_info = { 'ma10': 'ma10.config', @@ -15,19 +15,13 @@ given = dict(main='ma10', stick='ma10stick') cfgs = dict(given) seacfg = ['ma10', 'ma10'] -@pytest.mark.parametrize('given, current, seacfg, output, proposed, proposedstrict', [ +@pytest.mark.parametrize('given, current, seacfg, state, proposed', [ ]) -def test_proposed(given, current, seacfg, output, proposed, proposedstrict): - prop, overview = make_proposed(given, current, seacfg, sea_info) - assert overview == output - assert prop == proposed - props, overview = make_proposed(given, current, seacfg, sea_info, True) - assert overview == output - assert props == proposedstrict +def test_proposed(given, current, seacfg, result): + assert result == summarize_server_state(given, current, seacfg, sea_info) def do(): - prop, tab = make_proposed(given, cfgs, seacfg, sea_info) - print(prop) - print('\n'.join(tab)) \ No newline at end of file + result = summarize_server_state(given, cfgs, seacfg, sea_info) + print(result)