Remove nova.flags

Now that options have all moved from nova.flags to nova.config, we can
safely remove the nova.flags imports and replace them with nova.config
imports.

Change-Id: Ic077a72dd6419bbf1e1babe71acfa43c4e8b55c8

74 files changed, 25 insertions, 74 deletions

diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 9adb9f701..f0c117b32 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -33,7 +33,6 @@ import shutil
 
 from nova import config
 from nova.db.sqlalchemy.session import get_engine
-from nova import flags
 from nova.openstack.common import log as logging
 
 import eventlet
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index a9f4f742f..cbdfc3aee 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -28,7 +28,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import test
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 017466ff0..bdf2cbe7c 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -36,7 +36,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.image import s3
 from nova.network import api as network_api
 from nova.openstack.common import log as logging
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py
index 7c16713a4..0f15c66b8 100644
--- a/nova/tests/api/ec2/test_ec2_validate.py
+++ b/nova/tests/api/ec2/test_ec2_validate.py
@@ -25,7 +25,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
diff --git a/nova/tests/api/ec2/test_middleware.py b/nova/tests/api/ec2/test_middleware.py
index fbc10d86d..25cba1c4d 100644
--- a/nova/tests/api/ec2/test_middleware.py
+++ b/nova/tests/api/ec2/test_middleware.py
@@ -25,7 +25,6 @@ from nova.api import ec2
 from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
index f6337f035..9ede7dd17 100644
--- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
+++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
@@ -24,7 +24,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
index 0be17e47a..348816833 100644
--- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
+++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
@@ -20,7 +20,6 @@ from nova.api.openstack import wsgi
 from nova.compute import utils as compute_utils
 from nova import config
 from nova import db
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py
index a08a63efc..07f7f6eec 100644
--- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py
+++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py
@@ -21,9 +21,9 @@ from xml.dom import minidom
 import webob
 
 from nova.compute import api as compute_api
+from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py
index 78ffb62e6..c79fda910 100644
--- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py
+++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py
@@ -18,8 +18,8 @@
 import datetime
 
 from nova.api.openstack import compute
+from nova import config
 import nova.db.api
-from nova import flags
 from nova.openstack.common import jsonutils
 import nova.openstack.common.rpc
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py
index 7154d06bb..e9c0c0bc8 100644
--- a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py
@@ -18,9 +18,9 @@ import webob
 
 from nova.api.openstack.compute.contrib import extended_server_attributes
 from nova import compute
+from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_status.py b/nova/tests/api/openstack/compute/contrib/test_extended_status.py
index bff7773b1..457b8bd32 100644
--- a/nova/tests/api/openstack/compute/contrib/test_extended_status.py
+++ b/nova/tests/api/openstack/compute/contrib/test_extended_status.py
@@ -18,8 +18,8 @@ import webob
 
 from nova.api.openstack.compute.contrib import extended_status
 from nova import compute
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py
index a90fa19c7..b2400bc51 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py
@@ -17,7 +17,7 @@ import webob
 
 from nova.api.openstack.compute.contrib import flavor_disabled
 from nova.compute import instance_types
-from nova import flags
+from nova import config
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py
index 3965fbbd7..a6624e88d 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py
@@ -16,7 +16,7 @@ from lxml import etree
 import webob
 
 from nova.compute import instance_types
-from nova import flags
+from nova import config
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py
index b9f57f8ce..e8c66962a 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py
@@ -16,7 +16,7 @@ from lxml import etree
 import webob
 
 from nova.compute import instance_types
-from nova import flags
+from nova import config
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py
index 944594788..f5bce3184 100644
--- a/nova/tests/api/openstack/compute/contrib/test_hosts.py
+++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py
@@ -21,7 +21,6 @@ from nova.compute import power_state
 from nova.compute import vm_states
 from nova import context
 from nova import db
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import test
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py
index 1ee77c547..2540904ee 100644
--- a/nova/tests/api/openstack/compute/contrib/test_networks.py
+++ b/nova/tests/api/openstack/compute/contrib/test_networks.py
@@ -25,7 +25,6 @@ import webob
 from nova.api.openstack.compute.contrib import networks
 from nova import config
 from nova import exception
-from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py
index 5baff7717..2a7e973ff 100644
--- a/nova/tests/api/openstack/compute/contrib/test_rescue.py
+++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py
@@ -17,7 +17,6 @@ import webob
 from nova import compute
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
index c0d097c7a..6fdeb0fec 100644
--- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
@@ -28,7 +28,6 @@ from nova import compute
 from nova import config
 import nova.db
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import quota
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
index 0c5f029ba..a10ec208c 100644
--- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
+++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
@@ -22,8 +22,8 @@ import webob
 
 from nova.api.openstack.compute.contrib import simple_tenant_usage
 from nova.compute import api
+from nova import config
 from nova import context
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import policy as common_policy
 from nova.openstack.common import timeutils
diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py
index 7bc5d65f3..319991bfa 100644
--- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py
+++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py
@@ -17,9 +17,9 @@ from lxml import etree
 import webob
 
 from nova.api.openstack.compute.contrib import volumes
+from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index d2c0d98da..4272b3011 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -24,7 +24,6 @@ from nova.compute import instance_types
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import timeutils
 from nova import test
diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py
index 15920d2fb..6b8d290c4 100644
--- a/nova/tests/api/openstack/compute/test_consoles.py
+++ b/nova/tests/api/openstack/compute/test_consoles.py
@@ -24,10 +24,10 @@ import webob
 
 from nova.api.openstack.compute import consoles
 from nova.compute import vm_states
+from nova import config
 from nova import console
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 8282c4c19..fe7f03cd6 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -26,7 +26,6 @@ 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 import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index 0fc748fde..16bb74801 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -23,10 +23,10 @@ import urlparse
 from nova.api.openstack.compute import flavors
 from nova.api.openstack import xmlutil
 import nova.compute.instance_types
+from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests import matchers
diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py
index c2f12b4a5..a5ac184ca 100644
--- a/nova/tests/api/openstack/compute/test_image_metadata.py
+++ b/nova/tests/api/openstack/compute/test_image_metadata.py
@@ -19,7 +19,6 @@ import webob
 
 from nova.api.openstack.compute import image_metadata
 from nova import config
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py
index fe49e6c04..1ce2c960e 100644
--- a/nova/tests/api/openstack/compute/test_images.py
+++ b/nova/tests/api/openstack/compute/test_images.py
@@ -28,8 +28,8 @@ import webob
 from nova.api.openstack.compute import images
 from nova.api.openstack.compute.views import images as images_view
 from nova.api.openstack import xmlutil
+from nova import config
 from nova import exception
-from nova import flags
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests import matchers
diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py
index 415313d9a..002f51010 100644
--- a/nova/tests/api/openstack/compute/test_server_actions.py
+++ b/nova/tests/api/openstack/compute/test_server_actions.py
@@ -26,7 +26,6 @@ from nova.compute import vm_states
 from nova import config
 from nova import db
 from nova import exception
-from nova import flags
 from nova.image import glance
 from nova.openstack.common import importutils
 from nova import test
diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py
index 82b7df74c..5f595e3a5 100644
--- a/nova/tests/api/openstack/compute/test_server_metadata.py
+++ b/nova/tests/api/openstack/compute/test_server_metadata.py
@@ -24,7 +24,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova import config
 import nova.db
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 06f6e9ba7..1e514c13e 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -40,7 +40,6 @@ from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova import exception
-from nova import flags
 from nova.network import manager
 from nova.network.quantumv2 import api as quantum_api
 from nova.openstack.common import jsonutils
diff --git a/nova/tests/api/test_sizelimit.py b/nova/tests/api/test_sizelimit.py
index 8f9358b41..0eb46616f 100644
--- a/nova/tests/api/test_sizelimit.py
+++ b/nova/tests/api/test_sizelimit.py
@@ -16,7 +16,6 @@ import webob
 
 import nova.api.sizelimit
 from nova import config
-from nova import flags
 from nova import test
 
 CONF = config.CONF
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py
index 2355c604c..8d6a3c261 100644
--- a/nova/tests/baremetal/test_proxy_bare_metal.py
+++ b/nova/tests/baremetal/test_proxy_bare_metal.py
@@ -20,8 +20,8 @@ import mox
 import StringIO
 
 from nova.compute import power_state
+from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests import fake_utils
diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py
index 36e0d81dc..854c49c9f 100644
--- a/nova/tests/cert/test_rpcapi.py
+++ b/nova/tests/cert/test_rpcapi.py
@@ -21,7 +21,6 @@ Unit Tests for nova.cert.rpcapi
 from nova.cert import rpcapi as cert_rpcapi
 from nova import config
 from nova import context
-from nova import flags
 from nova.openstack.common import rpc
 from nova import test
 
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 451fc3d87..9d23021e3 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -41,7 +41,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.network import api as network_api
 from nova.network import model as network_model
 from nova.openstack.common import importutils
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index 3ef9ac459..53a5b20ae 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -25,7 +25,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.network import api as network_api
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index 82537560b..fac95cc62 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -22,7 +22,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import rpc
 from nova import test
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index 7e4e83d7d..372fbd1df 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -24,7 +24,6 @@ from nova.console import rpcapi as console_rpcapi
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import rpc
 from nova import test
diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py
index ce8bb8a51..0df7491c5 100644
--- a/nova/tests/console/test_rpcapi.py
+++ b/nova/tests/console/test_rpcapi.py
@@ -21,7 +21,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 import flags
 from nova.openstack.common import rpc
 from nova import test
 
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index a8d6ea3d3..5ff15b23b 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -22,9 +22,9 @@ Tests for Consoleauth Code.
 
 import time
 
+from nova import config
 from nova.consoleauth import manager
 from nova import context
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import test
 
diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py
index 8e9153893..428a79e3a 100644
--- a/nova/tests/consoleauth/test_rpcapi.py
+++ b/nova/tests/consoleauth/test_rpcapi.py
@@ -21,7 +21,6 @@ Unit Tests for nova.consoleauth.rpcapi
 from nova import config
 from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import context
-from nova import flags
 from nova.openstack.common import rpc
 from nova import test
 
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 6ded0c5be..65191641d 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -17,7 +17,6 @@
 #    under the License.
 
 from nova import config
-from nova import flags
 
 CONF = config.CONF
 
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index 4cbde5d39..50c6a55a8 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -21,7 +21,6 @@ from nova import config
 import nova.context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.network import api as network_api
 from nova.network import manager as network_manager
 from nova.network import model as network_model
diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py
index b2953526f..58c03b167 100644
--- a/nova/tests/image/fake.py
+++ b/nova/tests/image/fake.py
@@ -24,7 +24,6 @@ import uuid
 
 from nova import config
 from nova import exception
-from nova import flags
 import nova.image.glance
 from nova.openstack.common import log as logging
 
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index 62d49ad0a..933764427 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -27,7 +27,6 @@ from nova.compute import api
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova.network.manager import NetworkManager
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 96c7d47c7..c5897da12 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from nova import config
-from nova import flags
 from nova.openstack.common.log import logging
 from nova.tests.integrated import integrated_helpers
 
diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py
index fd17d52da..fbbf92eec 100644
--- a/nova/tests/integrated/test_multiprocess_api.py
+++ b/nova/tests/integrated/test_multiprocess_api.py
@@ -21,7 +21,7 @@ import signal
 import time
 import traceback
 
-from nova import flags
+from nova import config
 from nova.openstack.common.log import logging
 from nova import service
 from nova.tests.integrated import integrated_helpers
diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py
index c4b99e3e5..666ce6dab 100644
--- a/nova/tests/network/test_linux_net.py
+++ b/nova/tests/network/test_linux_net.py
@@ -22,7 +22,6 @@ import mox
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova.network import linux_net
 from nova.openstack.common import fileutils
 from nova.openstack.common import importutils
diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py
index 3d8e4235c..500cc9583 100644
--- a/nova/tests/network/test_rpcapi.py
+++ b/nova/tests/network/test_rpcapi.py
@@ -20,7 +20,6 @@ Unit Tests for nova.network.rpcapi
 
 from nova import config
 from nova import context
-from nova import flags
 from nova.network import rpcapi as network_rpcapi
 from nova.openstack.common import rpc
 from nova import test
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index 8b160f288..84667eb9e 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -22,7 +22,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.scheduler import filters
 from nova.scheduler.filters import extra_specs_ops
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index 605b0995e..05a792a53 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -20,7 +20,6 @@ Unit Tests for nova.scheduler.rpcapi
 
 from nova import config
 from nova import context
-from nova import flags
 from nova.openstack.common import rpc
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index 5fa3fbacd..76d438f2e 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -26,10 +26,10 @@ from nova.compute import power_state
 from nova.compute import rpcapi as compute_rpcapi
 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
-from nova import flags
 from nova.openstack.common import jsonutils
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index afb366624..63630325b 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -36,9 +36,9 @@ from nova.api import ec2
 from nova.api.ec2 import apirequest
 from nova.api.ec2 import ec2utils
 from nova import block_device
+from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests import matchers
diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py
index c2602b1bd..4973b3712 100644
--- a/nova/tests/test_configdrive2.py
+++ b/nova/tests/test_configdrive2.py
@@ -22,7 +22,7 @@ import tempfile
 
 from nova import test
 
-from nova import flags
+from nova import config
 from nova.openstack.common import log
 from nova import utils
 from nova.virt import configdrive
diff --git a/nova/tests/test_crypto.py b/nova/tests/test_crypto.py
index d11b49b3f..78fa420aa 100644
--- a/nova/tests/test_crypto.py
+++ b/nova/tests/test_crypto.py
@@ -20,10 +20,10 @@ import os
 
 import mox
 
+from nova import config
 from nova import crypto
 from nova import db
 from nova import exception
-from nova import flags
 from nova import test
 from nova import utils
 
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 92eae023a..0bbb410c0 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -26,7 +26,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests import matchers
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index a266c7097..b832c95a4 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -18,7 +18,6 @@
 #    under the License.
 
 from nova import config
-from nova import flags
 from nova.openstack.common import cfg
 from nova import test
 
diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py
index a310cbb97..dab5d027d 100644
--- a/nova/tests/test_hypervapi.py
+++ b/nova/tests/test_hypervapi.py
@@ -29,7 +29,6 @@ from nova.compute import power_state
 from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova.image import glance
 from nova.tests import fake_network
 from nova.tests.hyperv import basetestcase
diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py
index 324b90981..224127f54 100644
--- a/nova/tests/test_imagebackend.py
+++ b/nova/tests/test_imagebackend.py
@@ -18,7 +18,6 @@
 import os
 
 from nova import config
-from nova import flags
 from nova.openstack.common import fileutils
 from nova import test
 from nova.tests import fake_libvirt_utils
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index ee30386c4..3a1b40c4f 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -29,7 +29,6 @@ from nova.compute import manager as compute_manager
 from nova.compute import vm_states
 from nova import config
 from nova import db
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import log
 from nova import utils
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index a52863520..deb165682 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -18,12 +18,12 @@ Unit Tests for instance types code
 import time
 
 from nova.compute import instance_types
+from nova import config
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy import session as sql_session
 from nova import exception
-from nova import flags
 from nova.openstack.common import log as logging
 from nova import test
 
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index f52b7cbe1..1700c3274 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -37,7 +37,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import fileutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py
index d67f47f59..af1c657a7 100644
--- a/nova/tests/test_libvirt_vif.py
+++ b/nova/tests/test_libvirt_vif.py
@@ -17,7 +17,6 @@
 from lxml import etree
 
 from nova import config
-from nova import flags
 from nova import test
 from nova import utils
 from nova.virt.libvirt import config as vconfig
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index 4f2e70abf..a68ac40fd 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -32,7 +32,6 @@ from nova import config
 from nova import db
 from nova.db.sqlalchemy import api
 from nova import exception
-from nova import flags
 from nova.network import api as network_api
 from nova import test
 from nova.tests import fake_network
diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py
index d272a8bbd..21f869d5e 100644
--- a/nova/tests/test_notifications.py
+++ b/nova/tests/test_notifications.py
@@ -22,9 +22,9 @@ import copy
 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 import flags
 from nova.network import api as network_api
 from nova import notifications
 from nova.openstack.common import log as logging
diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py
index d077b605f..3b148b509 100644
--- a/nova/tests/test_objectstore.py
+++ b/nova/tests/test_objectstore.py
@@ -29,7 +29,6 @@ from boto import exception as boto_exception
 from boto.s3 import connection as s3
 
 from nova import config
-from nova import flags
 from nova.objectstore import s3server
 from nova import test
 from nova import wsgi
diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py
index 3baa91e6f..62c97db2f 100644
--- a/nova/tests/test_pipelib.py
+++ b/nova/tests/test_pipelib.py
@@ -17,7 +17,6 @@ from nova.cloudpipe import pipelib
 from nova import config
 from nova import context
 from nova import crypto
-from nova import flags
 from nova import test
 from nova import utils
 
diff --git a/nova/tests/test_policy.py b/nova/tests/test_policy.py
index 7bd6e9434..531dd97f3 100644
--- a/nova/tests/test_policy.py
+++ b/nova/tests/test_policy.py
@@ -21,9 +21,9 @@ import os.path
 import StringIO
 import urllib2
 
+from nova import config
 from nova import context
 from nova import exception
-from nova import flags
 from nova.openstack.common import policy as common_policy
 from nova import policy
 from nova import test
diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py
index 50de428b8..e640d7f01 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/test_powervm.py
@@ -18,9 +18,9 @@
 Test suite for PowerVMDriver.
 """
 
+from nova import config
 from nova import context
 from nova import db
-from nova import flags
 from nova import test
 
 from nova.compute import power_state
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index cf491c57c..bfcc03b0f 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -26,7 +26,6 @@ from nova import db
 from nova.db.sqlalchemy import api as sqa_api
 from nova.db.sqlalchemy import models as sqa_models
 from nova import exception
-from nova import flags
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
 from nova import quota
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index ec7d0333b..a1a28d05a 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -27,7 +27,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova import manager
 from nova.openstack.common import cfg
 from nova import service
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 68e6a6a76..ed38de8c7 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -29,7 +29,6 @@ import mox
 import nova
 from nova import config
 from nova import exception
-from nova import flags
 from nova.openstack.common import timeutils
 from nova import test
 from nova import utils
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index e40297204..67c52ed3d 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -17,8 +17,8 @@
 
 import os
 
+from nova import config
 from nova import exception
-from nova import flags
 from nova import test
 from nova import tests
 from nova import utils
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index 81689a1e5..d6bce87f3 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -20,10 +20,10 @@ Test suite for VMWareAPI.
 """
 
 from nova.compute import power_state
+from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova import test
 import nova.tests.image.fake
 from nova.tests.vmwareapi import db_fakes
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 50ed9cd2a..b188b47b4 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -33,7 +33,6 @@ from nova import config
 from nova import context
 from nova import db
 from nova import exception
-from nova import flags
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
diff --git a/nova/tests/utils.py b/nova/tests/utils.py
index 98342ae3d..d780edc6f 100644
--- a/nova/tests/utils.py
+++ b/nova/tests/utils.py
@@ -19,7 +19,6 @@ import platform
 import nova.config
 import nova.context
 import nova.db
-import nova.flags
 from nova.image import glance
 
 CONF = nova.config.CONF