diff --git a/neat/locals/manager.py b/neat/locals/manager.py index c22828e..d1df558 100644 --- a/neat/locals/manager.py +++ b/neat/locals/manager.py @@ -157,8 +157,8 @@ def init_state(config): physical_cpu_mhz_total = common.physical_cpu_mhz_total(vir_connection) return {'previous_time': 0., - 'vir_connect': vir_connection, - 'db': init_db(['sql_connection']), + 'vir_connection': vir_connection, + 'db': init_db(config['sql_connection']), 'physical_cpu_mhz_total': physical_cpu_mhz_total} @@ -204,7 +204,7 @@ def execute(config, state): """ path = common.build_local_vm_path(config['local_data_directory']) vm_cpu_mhz = get_local_data(path) - vm_ram = get_ram(config['vir_connection'], vm_cpu_mhz.keys()) + vm_ram = get_ram(state['vir_connection'], vm_cpu_mhz.keys()) vm_cpu_mhz = cleanup_vm_data(vm_cpu_mhz, vm_ram.keys()) if not vm_cpu_mhz: @@ -351,7 +351,7 @@ def get_max_ram(vir_connection, uuid): """ domain = vir_connection.lookupByUUIDString(uuid) if domain: - return domain.getMaxMemory() / 1024 + return domain.maxMemory() / 1024 return None diff --git a/tests/locals/test_manager.py b/tests/locals/test_manager.py index 476512d..d57f0ec 100644 --- a/tests/locals/test_manager.py +++ b/tests/locals/test_manager.py @@ -128,7 +128,7 @@ class LocalManager(TestCase): domain = mock('domain') expect(connection).lookupByUUIDString(uuid). \ and_return(domain).once() - expect(domain).getMaxMemory().and_return(x).once() + expect(domain).maxMemory().and_return(x).once() assert manager.get_max_ram(connection, uuid) == int(x / 1024) @qc(1)