From b3e26767defa1c6adc0a82d59288cb4afd3253c3 Mon Sep 17 00:00:00 2001 From: Anton Beloglazov Date: Tue, 2 Oct 2012 15:21:11 +1000 Subject: [PATCH] Fixed service --- neat/globals/manager.py | 4 ++-- tests/globals/test_manager.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neat/globals/manager.py b/neat/globals/manager.py index 23927c2..73acd82 100644 --- a/neat/globals/manager.py +++ b/neat/globals/manager.py @@ -180,8 +180,8 @@ def get_params(request): def service(): params = get_params(bottle.request) state = bottle.app().state - validate_params(state['hashed_username'], - state['hashed_password'], + validate_params(state['state']['hashed_username'], + state['state']['hashed_password'], params) if params['reason'] == 0: log.info('Processing an underload of a host %s', params['host']) diff --git a/tests/globals/test_manager.py b/tests/globals/test_manager.py index f9853f3..df1b2df 100644 --- a/tests/globals/test_manager.py +++ b/tests/globals/test_manager.py @@ -177,7 +177,7 @@ class GlobalManager(TestCase): 'host': 'host'} expect(manager).get_params(Any).and_return(params).once() expect(bottle).app().and_return(app).once() - expect(manager).validate_params(config, params). \ + expect(manager).validate_params('user', 'password', params). \ and_return(True).once() expect(manager).execute_underload(config, state, 'host').once() manager.service() @@ -187,7 +187,7 @@ class GlobalManager(TestCase): 'vm_uuids': 'vm_uuids'} expect(manager).get_params(Any).and_return(params).once() expect(bottle).app().and_return(app).once() - expect(manager).validate_params(config, params). \ + expect(manager).validate_params('user', 'password', params). \ and_return(True).once() expect(manager).execute_overload(config, state, 'vm_uuids'). \ once()