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
This commit is contained in:
@@ -1,26 +0,0 @@
|
|||||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
||||||
|
|
||||||
# Copyright 2010 United States Government as represented by the
|
|
||||||
# Administrator of the National Aeronautics and Space Administration.
|
|
||||||
# All Rights Reserved.
|
|
||||||
# Copyright 2012 Red Hat, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""
|
|
||||||
Deprecated module. One should use nova.config instead.
|
|
||||||
|
|
||||||
This is left to support backwards compatibility.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from nova import config
|
|
||||||
@@ -20,8 +20,8 @@ import mox
|
|||||||
import StringIO
|
import StringIO
|
||||||
|
|
||||||
from nova.compute import power_state
|
from nova.compute import power_state
|
||||||
|
from nova import config
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import jsonutils
|
from nova.openstack.common import jsonutils
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova.tests import fake_utils
|
from nova.tests import fake_utils
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import flags
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ Unit Tests for nova.scheduler.rpcapi
|
|||||||
|
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import rpc
|
from nova.openstack.common import rpc
|
||||||
from nova.scheduler import rpcapi as scheduler_rpcapi
|
from nova.scheduler import rpcapi as scheduler_rpcapi
|
||||||
from nova import test
|
from nova import test
|
||||||
|
|||||||
@@ -36,9 +36,9 @@ from nova.api import ec2
|
|||||||
from nova.api.ec2 import apirequest
|
from nova.api.ec2 import apirequest
|
||||||
from nova.api.ec2 import ec2utils
|
from nova.api.ec2 import ec2utils
|
||||||
from nova import block_device
|
from nova import block_device
|
||||||
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import timeutils
|
from nova.openstack.common import timeutils
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova.tests import matchers
|
from nova.tests import matchers
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ from nova import config
|
|||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import timeutils
|
from nova.openstack.common import timeutils
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova.tests import matchers
|
from nova.tests import matchers
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import cfg
|
from nova.openstack.common import cfg
|
||||||
from nova import test
|
from nova import test
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ from nova.compute import power_state
|
|||||||
from nova import config
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import flags
|
|
||||||
from nova.image import glance
|
from nova.image import glance
|
||||||
from nova.tests import fake_network
|
from nova.tests import fake_network
|
||||||
from nova.tests.hyperv import basetestcase
|
from nova.tests.hyperv import basetestcase
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import fileutils
|
from nova.openstack.common import fileutils
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova.tests import fake_libvirt_utils
|
from nova.tests import fake_libvirt_utils
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ from nova.compute import manager as compute_manager
|
|||||||
from nova.compute import vm_states
|
from nova.compute import vm_states
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import importutils
|
from nova.openstack.common import importutils
|
||||||
from nova.openstack.common import log
|
from nova.openstack.common import log
|
||||||
from nova import utils
|
from nova import utils
|
||||||
|
|||||||
@@ -18,12 +18,12 @@ Unit Tests for instance types code
|
|||||||
import time
|
import time
|
||||||
|
|
||||||
from nova.compute import instance_types
|
from nova.compute import instance_types
|
||||||
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova.db.sqlalchemy import models
|
from nova.db.sqlalchemy import models
|
||||||
from nova.db.sqlalchemy import session as sql_session
|
from nova.db.sqlalchemy import session as sql_session
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import log as logging
|
from nova.openstack.common import log as logging
|
||||||
from nova import test
|
from nova import test
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ from nova import config
|
|||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import fileutils
|
from nova.openstack.common import fileutils
|
||||||
from nova.openstack.common import importutils
|
from nova.openstack.common import importutils
|
||||||
from nova.openstack.common import jsonutils
|
from nova.openstack.common import jsonutils
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
from lxml import etree
|
from lxml import etree
|
||||||
|
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import flags
|
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova import utils
|
from nova import utils
|
||||||
from nova.virt.libvirt import config as vconfig
|
from nova.virt.libvirt import config as vconfig
|
||||||
|
|||||||
@@ -18,9 +18,9 @@
|
|||||||
Test suite for PowerVMDriver.
|
Test suite for PowerVMDriver.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import flags
|
|
||||||
from nova import test
|
from nova import test
|
||||||
|
|
||||||
from nova.compute import power_state
|
from nova.compute import power_state
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
from nova import config
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova import tests
|
from nova import tests
|
||||||
from nova import utils
|
from nova import utils
|
||||||
|
|||||||
@@ -20,10 +20,10 @@ Test suite for VMWareAPI.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
from nova.compute import power_state
|
from nova.compute import power_state
|
||||||
|
from nova import config
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova import test
|
from nova import test
|
||||||
import nova.tests.image.fake
|
import nova.tests.image.fake
|
||||||
from nova.tests.vmwareapi import db_fakes
|
from nova.tests.vmwareapi import db_fakes
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ from nova import config
|
|||||||
from nova import context
|
from nova import context
|
||||||
from nova import db
|
from nova import db
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova import flags
|
|
||||||
from nova.openstack.common import importutils
|
from nova.openstack.common import importutils
|
||||||
from nova.openstack.common import jsonutils
|
from nova.openstack.common import jsonutils
|
||||||
from nova.openstack.common import log as logging
|
from nova.openstack.common import log as logging
|
||||||
|
|||||||
Reference in New Issue
Block a user