From f918b5bfdf94899e70e07c310e53233843e87f8d Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 20 Nov 2012 09:52:30 +0100 Subject: [PATCH] Fix latest nova changes Change-Id: I08fa2ce3fca4b5c66e77a42d00b94067abfef7c7 Signed-off-by: Julien Danjou --- ceilometer/compute/libvirt.py | 2 +- tests/compute/test_libvirt.py | 2 +- tests/compute/test_nova_notifier.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ceilometer/compute/libvirt.py b/ceilometer/compute/libvirt.py index 719c30b97..e1ba251e5 100644 --- a/ceilometer/compute/libvirt.py +++ b/ceilometer/compute/libvirt.py @@ -51,7 +51,7 @@ def get_compute_driver(): flags.parse_args([]) return flags.FLAGS.compute_driver nova_config.parse_args([]) - return nova_config.CONF.compute_driver or "" + return nova_config.cfg.CONF.compute_driver or "" def get_libvirt_connection(): diff --git a/tests/compute/test_libvirt.py b/tests/compute/test_libvirt.py index 235e45739..ba2a04fc5 100644 --- a/tests/compute/test_libvirt.py +++ b/tests/compute/test_libvirt.py @@ -31,7 +31,7 @@ import time try: from nova import config - nova_CONF = config.CONF + nova_CONF = config.cfg.CONF except ImportError: # XXX Folsom compat from nova import flags diff --git a/tests/compute/test_nova_notifier.py b/tests/compute/test_nova_notifier.py index 621f07630..f8e5d72b8 100644 --- a/tests/compute/test_nova_notifier.py +++ b/tests/compute/test_nova_notifier.py @@ -26,7 +26,7 @@ from stevedore.tests import manager as test_manager try: from nova import config - nova_CONF = config.CONF + nova_CONF = config.cfg.CONF except ImportError: # XXX Folsom compat from nova import flags @@ -99,6 +99,7 @@ class TestNovaNotifier(base.TestCase): "user_id": "FAKE", "project_id": "FAKE", "display_name": "FAKE NAME", + "hostname": "abcdef", "reservation_id": "FAKE RID", "instance_type_id": 1, "architecture": "x86",