From 94d87bce212f91c54370784a5544f1a07625938a Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sat, 17 Nov 2012 22:50:17 +0000 Subject: Remove nova.config.CONF Modules import nova.config for two reasons right now - firstly, to reference nova.config.CONF and, secondly, if they use one of the options defined in nova.config. Often modules import nova.openstack.common.cfg and nova.config which is a bit pointless since they could just use cfg.CONF if they just want to nova.config in order to reference CONF. Let's just use cfg.CONF everywhere and we can explicitly state where we actually require options defined in nova.config. Change-Id: Ie4184a74e3e78c99658becb18dce1c2087e450bb --- nova/tests/scheduler/test_rpcapi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/tests/scheduler/test_rpcapi.py') diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index 05a792a53..bb6465d3c 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -20,11 +20,12 @@ Unit Tests for nova.scheduler.rpcapi from nova import config from nova import context +from nova.openstack.common import cfg from nova.openstack.common import rpc from nova.scheduler import rpcapi as scheduler_rpcapi from nova import test -CONF = config.CONF +CONF = cfg.CONF class SchedulerRpcAPITestCase(test.TestCase): -- cgit