Merge "Use CONF.import_opt() for nova.config opts"

33 files changed, 50 insertions, 32 deletions

diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 852fbddf1..d7edb7cf6 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -31,7 +31,6 @@ setattr(__builtin__, '_', lambda x: x)
 import os
 import shutil
 
-from nova import config
 from nova.db.sqlalchemy.session import get_engine
 from nova.openstack.common import cfg
 from nova.openstack.common import log as logging
@@ -42,6 +41,9 @@ import eventlet
 eventlet.monkey_patch(os=False)
 
 CONF = cfg.CONF
+CONF.import_opt('sql_connection', 'nova.config')
+CONF.import_opt('sqlite_db', 'nova.config')
+CONF.import_opt('state_path', 'nova.config')
 CONF.set_override('use_stderr', False)
 
 logging.setup('nova')
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index f4355a5f0..da5bfa762 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -24,7 +24,6 @@ from nova.api.ec2 import cloud
 from nova.api.ec2 import ec2utils
 from nova.compute import api as compute_api
 from nova.compute import utils as compute_utils
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -38,6 +37,8 @@ from nova.tests import matchers
 from nova import volume
 
 CONF = cfg.CONF
+CONF.import_opt('default_instance_type', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 54437e93e..fdd8fc90d 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -32,7 +32,6 @@ from nova.compute import api as compute_api
 from nova.compute import power_state
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -50,6 +49,9 @@ from nova.virt import fake as fake_virt
 from nova import volume
 
 CONF = cfg.CONF
+CONF.import_opt('default_image', 'nova.config')
+CONF.import_opt('default_instance_type', 'nova.config')
+CONF.import_opt('use_ipv6', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
index 368ede41c..5f92d521e 100644
--- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
+++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
@@ -18,7 +18,6 @@ from lxml import etree
 from nova.api.openstack.compute.contrib import cloudpipe
 from nova.api.openstack import wsgi
 from nova.compute import utils as compute_utils
-from nova import config
 from nova import db
 from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
@@ -29,6 +28,7 @@ from nova.tests import matchers
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('vpn_image_id', 'nova.config')
 
 
 def fake_vpn_instance():
diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py
index 7aeb9465e..0d735d5ec 100644
--- a/nova/tests/api/openstack/compute/contrib/test_rescue.py
+++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py
@@ -15,7 +15,6 @@
 import webob
 
 from nova import compute
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
@@ -23,6 +22,7 @@ from nova import test
 from nova.tests.api.openstack import fakes
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 
 
 def rescue(self, context, instance, rescue_password=None):
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 85ab411a5..17ac244ff 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -21,7 +21,6 @@ import webob
 from nova.api.openstack.compute.contrib import volumes
 from nova.compute import api as compute_api
 from nova.compute import instance_types
-from nova import config
 from nova import context
 from nova import db
 from nova.openstack.common import cfg
@@ -33,6 +32,7 @@ from nova.volume import cinder
 from webob import exc
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
 FAKE_UUID_A = '00000000-aaaa-aaaa-aaaa-000000000000'
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 1d0bfcd1a..e71833916 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -25,7 +25,6 @@ from nova.api.openstack.compute import extensions as compute_extensions
 from nova.api.openstack import extensions as base_extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova import test
@@ -33,6 +32,7 @@ from nova.tests.api.openstack import fakes
 from nova.tests import matchers
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension', 'nova.config')
 
 NS = "{http://docs.openstack.org/common/api/v1.0}"
 ATOMNS = "{http://www.w3.org/2005/Atom}"
diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py
index 204979da1..dbb854c58 100644
--- a/nova/tests/api/openstack/compute/test_server_actions.py
+++ b/nova/tests/api/openstack/compute/test_server_actions.py
@@ -23,7 +23,6 @@ from nova.api.openstack.compute import servers
 from nova.compute import api as compute_api
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova import exception
 from nova.image import glance
@@ -36,6 +35,7 @@ from nova.tests import matchers
 
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
 FAKE_UUID = fakes.FAKE_UUID
 INSTANCE_IDS = {FAKE_UUID: 1}
 
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 3ac10c968..79a7e8cd7 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -35,7 +35,6 @@ from nova.compute import api as compute_api
 from nova.compute import instance_types
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
@@ -53,6 +52,8 @@ from nova.tests import matchers
 
 
 CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.config')
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 FAKE_UUID = fakes.FAKE_UUID
 NS = "{http://docs.openstack.org/compute/api/v1.1}"
diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py
index 820fe46e4..8db8a0f6c 100644
--- a/nova/tests/cert/test_rpcapi.py
+++ b/nova/tests/cert/test_rpcapi.py
@@ -19,13 +19,13 @@ Unit Tests for nova.cert.rpcapi
 """
 
 from nova.cert import rpcapi as cert_rpcapi
-from nova import config
 from nova import context
 from nova.openstack.common import cfg
 from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('cert_topic', 'nova.config')
 
 
 class CertRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 368bdcbda..1a31f12ad 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -37,7 +37,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -70,6 +69,9 @@ from nova.volume import cinder
 QUOTAS = quota.QUOTAS
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('compute_topic', 'nova.config')
+CONF.import_opt('host', 'nova.config')
 CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
 
 
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index ee78ba62f..a85b4fa8a 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -21,7 +21,6 @@ import string
 
 from nova.compute import instance_types
 from nova.compute import utils as compute_utils
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -38,6 +37,7 @@ from nova import utils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
 
 
 class ComputeValidateDeviceTestCase(test.TestCase):
diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py
index 0b6b05cf1..9ff0c993c 100644
--- a/nova/tests/compute/test_multiple_nodes.py
+++ b/nova/tests/compute/test_multiple_nodes.py
@@ -18,7 +18,6 @@
 
 import mox
 
-from nova import config
 from nova import context
 from nova import exception
 from nova.openstack.common import cfg
@@ -28,6 +27,7 @@ from nova.virt import fake
 
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
 
 
 class BaseTestCase(test.TestCase):
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index cba206f9e..6af92044b 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -19,7 +19,6 @@ Unit Tests for nova.compute.rpcapi
 """
 
 from nova.compute import rpcapi as compute_rpcapi
-from nova import config
 from nova import context
 from nova import db
 from nova.openstack.common import cfg
@@ -28,6 +27,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('compute_topic', 'nova.config')
 
 
 class ComputeRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index d8fd9be1e..9094b8154 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -18,7 +18,6 @@
 
 """Tests For Console proxy."""
 
-from nova import config
 from nova.console import api as console_api
 from nova.console import rpcapi as console_rpcapi
 from nova import context
@@ -30,6 +29,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('console_manager', 'nova.config')
 CONF.import_opt('console_driver', 'nova.console.manager')
 
 
diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py
index e98aee32f..ef4bc4ae7 100644
--- a/nova/tests/console/test_rpcapi.py
+++ b/nova/tests/console/test_rpcapi.py
@@ -18,7 +18,6 @@
 Unit Tests for nova.console.rpcapi
 """
 
-from nova import config
 from nova.console import rpcapi as console_rpcapi
 from nova import context
 from nova.openstack.common import cfg
@@ -26,6 +25,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('console_topic', 'nova.config')
 
 
 class ConsoleRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index e6ef3f7de..c4c17e01a 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -16,10 +16,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova.openstack.common import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('state_path', 'nova.config')
 
 CONF.import_opt('scheduler_driver', 'nova.scheduler.manager')
 CONF.import_opt('fake_network', 'nova.network.manager')
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index abbd0be79..fc8e4c249 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -17,7 +17,6 @@
 
 from nova.compute import api as compute_api
 from nova.compute import manager as compute_manager
-from nova import config
 import nova.context
 from nova import db
 from nova import exception
@@ -32,6 +31,7 @@ from nova.virt.libvirt import config as libvirt_config
 
 HOST = "testhost"
 CONF = cfg.CONF
+CONF.import_opt('use_ipv6', 'nova.config')
 
 
 class FakeIptablesFirewallDriver(object):
diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py
index d495ee2fb..20da3a883 100644
--- a/nova/tests/image/fake.py
+++ b/nova/tests/image/fake.py
@@ -22,7 +22,6 @@ import copy
 import datetime
 import uuid
 
-from nova import config
 from nova import exception
 import nova.image.glance
 from nova.openstack.common import cfg
@@ -30,6 +29,7 @@ from nova.openstack.common import log as logging
 
 
 CONF = cfg.CONF
+CONF.import_opt('null_kernel', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index b8dbdb99d..e8d01299a 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -24,7 +24,6 @@ from lxml import etree
 
 from nova.cloudpipe.pipelib import CloudPipe
 from nova.compute import api
-from nova import config
 from nova import context
 from nova import db
 from nova.network.manager import NetworkManager
@@ -40,6 +39,9 @@ from nova.tests.image import fake
 from nova.tests.integrated import integrated_helpers
 
 CONF = cfg.CONF
+CONF.import_opt('allow_resize_to_same_host', 'nova.config')
+CONF.import_opt('osapi_compute_extension', 'nova.config')
+CONF.import_opt('vpn_image_id', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 24ac1750e..61e4e32d0 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -15,12 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import config
 from nova.openstack.common import cfg
 from nova.openstack.common.log import logging
 from nova.tests.integrated import integrated_helpers
 
 CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py
index 6ebf92f19..0c4057472 100644
--- a/nova/tests/network/test_linux_net.py
+++ b/nova/tests/network/test_linux_net.py
@@ -19,7 +19,6 @@ import os
 
 import mox
 
-from nova import config
 from nova import context
 from nova import db
 from nova.network import linux_net
@@ -31,6 +30,7 @@ from nova import test
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('network_driver', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 HOST = "testhost"
diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py
index 250dd9d65..760db7ecb 100644
--- a/nova/tests/network/test_rpcapi.py
+++ b/nova/tests/network/test_rpcapi.py
@@ -18,7 +18,6 @@
 Unit Tests for nova.network.rpcapi
 """
 
-from nova import config
 from nova import context
 from nova.network import rpcapi as network_rpcapi
 from nova.openstack.common import cfg
@@ -26,6 +25,7 @@ from nova.openstack.common import rpc
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('network_topic', 'nova.config')
 
 
 class NetworkRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index ae81c84dd..518b2054f 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -18,7 +18,6 @@ Tests For Scheduler Host Filters.
 import httplib
 import stubout
 
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -32,6 +31,7 @@ from nova.tests.scheduler import fakes
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('my_ip', 'nova.config')
 DATA = ''
 
 
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index bb6465d3c..112a41105 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -18,7 +18,6 @@
 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
@@ -26,6 +25,7 @@ from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test
 
 CONF = cfg.CONF
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 
 class SchedulerRpcAPITestCase(test.TestCase):
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index 3ea99d53b..72c58104a 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -27,7 +27,6 @@ from nova import test
 
 from nova.compute import manager as compute_manager
 from nova.compute import vm_states
-from nova import config
 from nova import db
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
@@ -37,6 +36,8 @@ from nova.virt.libvirt import imagecache
 from nova.virt.libvirt import utils as virtutils
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('host', 'nova.config')
 
 LOG = log.getLogger(__name__)
 
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index aecd766cd..070024fac 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -33,7 +33,6 @@ from nova.compute import instance_types
 from nova.compute import power_state
 from nova.compute import vm_mode
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -71,6 +70,9 @@ libvirt_driver.libvirt = libvirt
 
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('my_ip', 'nova.config')
 LOG = logging.getLogger(__name__)
 
 _fake_network_info = fake_network.fake_get_instance_nw_info
diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index 55490e860..ae23c30b2 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -28,13 +28,14 @@ import tempfile
 from boto import exception as boto_exception
 from boto.s3 import connection as s3
 
-from nova import config
 from nova.objectstore import s3server
 from nova.openstack.common import cfg
 from nova import test
 from nova import wsgi
 
 CONF = cfg.CONF
+CONF.import_opt('s3_host', 'nova.config')
+CONF.import_opt('s3_port', 'nova.config')
 
 # Create a unique temporary directory. We don't delete after test to
 # allow checking the contents after running tests. Users and/or tools
diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py
index b52f0d698..b38b2238e 100644
--- a/nova/tests/test_pipelib.py
+++ b/nova/tests/test_pipelib.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 from nova.cloudpipe import pipelib
-from nova import config
 from nova import context
 from nova import crypto
 from nova.openstack.common import cfg
@@ -22,6 +21,7 @@ from nova import test
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('vpn_key_suffix', 'nova.config')
 
 
 class PipelibTest(test.TestCase):
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 0949239ab..b29ef59d4 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -20,7 +20,6 @@ import datetime
 
 from nova import compute
 from nova.compute import instance_types
-from nova import config
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import api as sqa_api
@@ -35,6 +34,7 @@ from nova import test
 import nova.tests.image.fake
 
 CONF = cfg.CONF
+CONF.import_opt('scheduler_topic', 'nova.config')
 
 
 class QuotaIntegrationTestCase(test.TestCase):
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 82de6114b..b0f3e9fac 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -27,7 +27,6 @@ from eventlet import greenpool
 import mox
 
 import nova
-from nova import config
 from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
@@ -35,6 +34,7 @@ from nova import test
 from nova import utils
 
 CONF = cfg.CONF
+CONF.import_opt('glance_port', 'nova.config')
 
 
 class ByteConversionTest(test.TestCase):
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index bc3c1dd38..5253d6292 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -29,7 +29,6 @@ from nova.compute import instance_types
 from nova.compute import power_state
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import config
 from nova import context
 from nova import db
 from nova import exception
@@ -58,6 +57,10 @@ from nova.virt.xenapi import volume_utils
 LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
+CONF.import_opt('compute_manager', 'nova.config')
+CONF.import_opt('host', 'nova.config')
+CONF.import_opt('network_manager', 'nova.config')
+CONF.import_opt('node_availability_zone', 'nova.config')
 
 IMAGE_MACHINE = '1'
 IMAGE_KERNEL = '2'
diff --git a/nova/tests/utils.py b/nova/tests/utils.py
index 9d5eb3144..f88135e3c 100644
--- a/nova/tests/utils.py
+++ b/nova/tests/utils.py
@@ -22,6 +22,7 @@ from nova.image import glance
 from nova.openstack.common import cfg
 
 CONF = cfg.CONF
+CONF.import_opt('use_ipv6', 'nova.config')
 
 
 def get_test_admin_context():