diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-12 14:56:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-12 14:56:05 +0000 |
| commit | 24e86f40f7230544666ef99650353da76a1b9297 (patch) | |
| tree | bee96469b732a178a29db01b8d78c57ccd96e649 | |
| parent | afd8c7e9d7c598887f52224e505945fbb7ff6921 (diff) | |
| parent | f0cd357d96b346db2ab10370dd2b914d6881aa06 (diff) | |
| download | nova-24e86f40f7230544666ef99650353da76a1b9297.tar.gz nova-24e86f40f7230544666ef99650353da76a1b9297.tar.xz nova-24e86f40f7230544666ef99650353da76a1b9297.zip | |
Merge "Switch from FLAGS to CONF in tests"
77 files changed, 395 insertions, 465 deletions
diff --git a/nova/test.py b/nova/test.py index feb489b30..52f63d64b 100644 --- a/nova/test.py +++ b/nova/test.py @@ -49,8 +49,8 @@ test_opts = [ help='should we use everything for testing'), ] -FLAGS = flags.FLAGS -FLAGS.register_opts(test_opts) +CONF = config.CONF +CONF.register_opts(test_opts) LOG = logging.getLogger(__name__) @@ -66,7 +66,7 @@ class TestCase(testtools.TestCase): """Run before each test method to initialize test environment.""" super(TestCase, self).setUp() - fake_flags.set_defaults(FLAGS) + fake_flags.set_defaults(CONF) config.parse_args([], default_config_files=[]) # NOTE(vish): We need a better method for creating fixtures for tests @@ -93,7 +93,7 @@ class TestCase(testtools.TestCase): super(TestCase, self).tearDown() finally: # Reset any overridden flags - FLAGS.reset() + CONF.reset() # Unstub modules for name, mod in self._modules.iteritems(): @@ -131,7 +131,7 @@ class TestCase(testtools.TestCase): def flags(self, **kw): """Override flag variables for a test.""" for k, v in kw.iteritems(): - FLAGS.set_override(k, v) + CONF.set_override(k, v) def start_service(self, name, host=None, **kwargs): host = host and host or uuid.uuid4().hex diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index ee2d17afa..9adb9f701 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -31,6 +31,7 @@ setattr(__builtin__, '_', lambda x: x) import os 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 @@ -40,8 +41,8 @@ import eventlet eventlet.monkey_patch(os=False) -FLAGS = flags.FLAGS -FLAGS.use_stderr = False +CONF = config.CONF +CONF.set_override('use_stderr', False) logging.setup('nova') @@ -49,7 +50,7 @@ _DB = None def reset_db(): - if FLAGS.sql_connection == "sqlite://": + if CONF.sql_connection == "sqlite://": engine = get_engine() engine.dispose() conn = engine.connect() @@ -58,8 +59,8 @@ def reset_db(): else: setup() else: - shutil.copyfile(os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db), - os.path.join(FLAGS.state_path, FLAGS.sqlite_db)) + shutil.copyfile(os.path.join(CONF.state_path, CONF.sqlite_clean_db), + os.path.join(CONF.state_path, CONF.sqlite_db)) def setup(): @@ -70,41 +71,41 @@ def setup(): from nova.db import migration from nova.network import manager as network_manager from nova.tests import fake_flags - fake_flags.set_defaults(FLAGS) + fake_flags.set_defaults(CONF) - if FLAGS.sql_connection == "sqlite://": + if CONF.sql_connection == "sqlite://": if migration.db_version() > migration.INIT_VERSION: return else: - testdb = os.path.join(FLAGS.state_path, FLAGS.sqlite_db) + testdb = os.path.join(CONF.state_path, CONF.sqlite_db) if os.path.exists(testdb): return migration.db_sync() ctxt = context.get_admin_context() network = network_manager.VlanManager() - bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface + bridge_interface = CONF.flat_interface or CONF.vlan_interface network.create_networks(ctxt, label='test', - cidr=FLAGS.fixed_range, - multi_host=FLAGS.multi_host, - num_networks=FLAGS.num_networks, - network_size=FLAGS.network_size, - cidr_v6=FLAGS.fixed_range_v6, - gateway=FLAGS.gateway, - gateway_v6=FLAGS.gateway_v6, - bridge=FLAGS.flat_network_bridge, + cidr=CONF.fixed_range, + multi_host=CONF.multi_host, + num_networks=CONF.num_networks, + network_size=CONF.network_size, + cidr_v6=CONF.fixed_range_v6, + gateway=CONF.gateway, + gateway_v6=CONF.gateway_v6, + bridge=CONF.flat_network_bridge, bridge_interface=bridge_interface, - vpn_start=FLAGS.vpn_start, - vlan_start=FLAGS.vlan_start, - dns1=FLAGS.flat_network_dns) + vpn_start=CONF.vpn_start, + vlan_start=CONF.vlan_start, + dns1=CONF.flat_network_dns) for net in db.network_get_all(ctxt): network.set_network_host(ctxt, net) - if FLAGS.sql_connection == "sqlite://": + if CONF.sql_connection == "sqlite://": global _DB engine = get_engine() conn = engine.connect() _DB = "".join(line for line in conn.connection.iterdump()) else: - cleandb = os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db) + cleandb = os.path.join(CONF.state_path, CONF.sqlite_clean_db) shutil.copyfile(testdb, cleandb) diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index 47f78ab75..a858d6f2e 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -24,6 +24,7 @@ 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 @@ -35,9 +36,8 @@ from nova.tests import fake_network from nova.tests.image import fake from nova import volume - +CONF = config.CONF LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS def get_fake_cache(): @@ -59,7 +59,7 @@ def get_fake_cache(): floats=['1.2.3.4', '5.6.7.8']), _ip('192.168.0.4')]}]}}] - if FLAGS.use_ipv6: + if CONF.use_ipv6: ipv6_addr = 'fe80:b33f::a8bb:ccff:fedd:eeff' info[0]['network']['subnets'].append({'cidr': 'fe80:b33f::/64', 'ips': [_ip(ipv6_addr)]}) @@ -668,7 +668,7 @@ class CinderCloudTestCase(test.TestCase): self._restart_compute_service(periodic_interval=0.3) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, 'block_device_mapping': [{'device_name': '/dev/sdb', 'volume_id': vol1_uuid, @@ -750,7 +750,7 @@ class CinderCloudTestCase(test.TestCase): # enforce periodic tasks run in short time to avoid wait for 60s. self._restart_compute_service(periodic_interval=0.3) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, 'block_device_mapping': [{'device_name': '/dev/sdb', 'volume_id': vol1_uuid, @@ -831,7 +831,7 @@ class CinderCloudTestCase(test.TestCase): snap2_uuid = ec2utils.ec2_snap_id_to_uuid(snap2['snapshotId']) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, 'block_device_mapping': [{'device_name': '/dev/vdb', 'snapshot_id': snap1_uuid, @@ -891,7 +891,7 @@ class CinderCloudTestCase(test.TestCase): create_volumes_and_snapshots=True) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1} ec2_instance_id = self._run_instance(**kwargs) diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index e4c423fcc..b378ef98d 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -32,6 +32,7 @@ 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 @@ -47,9 +48,8 @@ from nova import utils from nova.virt import fake as fake_virt from nova import volume - +CONF = config.CONF LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS def get_fake_cache(): @@ -71,7 +71,7 @@ def get_fake_cache(): floats=['1.2.3.4', '5.6.7.8']), _ip('192.168.0.4')]}]}}] - if FLAGS.use_ipv6: + if CONF.use_ipv6: ipv6_addr = 'fe80:b33f::a8bb:ccff:fedd:eeff' info[0]['network']['subnets'].append({'cidr': 'fe80:b33f::/64', 'ips': [_ip(ipv6_addr)]}) @@ -381,7 +381,7 @@ class CloudTestCase(test.TestCase): def test_security_group_quota_limit(self): self.flags(quota_security_groups=10) - for i in range(1, FLAGS.quota_security_groups + 1): + for i in range(1, CONF.quota_security_groups + 1): name = 'test name %i' % i descript = 'test description %i' % i create = self.cloud.create_security_group @@ -1333,7 +1333,7 @@ class CloudTestCase(test.TestCase): def test_console_output(self): instance_id = self._run_instance( image_id='ami-1', - instance_type=FLAGS.default_instance_type, + instance_type=CONF.default_instance_type, max_count=1) output = self.cloud.get_console_output(context=self.context, instance_id=[instance_id]) @@ -1446,7 +1446,7 @@ class CloudTestCase(test.TestCase): def test_run_instances(self): kwargs = {'image_id': 'ami-00000001', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1} run_instances = self.cloud.run_instances @@ -1478,7 +1478,7 @@ class CloudTestCase(test.TestCase): def test_run_instances_availability_zone(self): kwargs = {'image_id': 'ami-00000001', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, 'placement': {'availability_zone': 'fake'}, } @@ -1514,7 +1514,7 @@ class CloudTestCase(test.TestCase): def test_run_instances_image_state_none(self): kwargs = {'image_id': 'ami-00000001', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1} run_instances = self.cloud.run_instances @@ -1533,7 +1533,7 @@ class CloudTestCase(test.TestCase): def test_run_instances_image_state_invalid(self): kwargs = {'image_id': 'ami-00000001', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1} run_instances = self.cloud.run_instances @@ -1553,8 +1553,8 @@ class CloudTestCase(test.TestCase): self.context, **kwargs) def test_run_instances_image_status_active(self): - kwargs = {'image_id': FLAGS.default_image, - 'instance_type': FLAGS.default_instance_type, + kwargs = {'image_id': CONF.default_image, + 'instance_type': CONF.default_instance_type, 'max_count': 1} run_instances = self.cloud.run_instances @@ -1593,7 +1593,7 @@ class CloudTestCase(test.TestCase): self._restart_compute_service(periodic_interval=0.3) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1622,7 +1622,7 @@ class CloudTestCase(test.TestCase): def test_start_instances(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1644,7 +1644,7 @@ class CloudTestCase(test.TestCase): def test_stop_instances(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1663,7 +1663,7 @@ class CloudTestCase(test.TestCase): def test_terminate_instances(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1684,7 +1684,7 @@ class CloudTestCase(test.TestCase): def test_terminate_instances_invalid_instance_id(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1695,7 +1695,7 @@ class CloudTestCase(test.TestCase): def test_terminate_instances_disable_terminate(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1728,7 +1728,7 @@ class CloudTestCase(test.TestCase): def test_terminate_instances_two_instances(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } inst1 = self._run_instance(**kwargs) inst2 = self._run_instance(**kwargs) @@ -1753,7 +1753,7 @@ class CloudTestCase(test.TestCase): def test_reboot_instances(self): kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1, } instance_id = self._run_instance(**kwargs) @@ -1799,7 +1799,7 @@ class CloudTestCase(test.TestCase): create_volumes_and_snapshots=True) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1} ec2_instance_id = self._run_instance(**kwargs) @@ -1907,7 +1907,7 @@ class CloudTestCase(test.TestCase): create_volumes_and_snapshots=True) kwargs = {'image_id': 'ami-1', - 'instance_type': FLAGS.default_instance_type, + 'instance_type': CONF.default_instance_type, 'max_count': 1} ec2_instance_id = self._run_instance(**kwargs) @@ -2074,7 +2074,7 @@ class CloudTestCase(test.TestCase): def test_dia_iisb(expected_result, **kwargs): """test describe_instance_attribute attribute instance_initiated_shutdown_behavior""" - kwargs.update({'instance_type': FLAGS.default_instance_type, + kwargs.update({'instance_type': CONF.default_instance_type, 'max_count': 1}) instance_id = self._run_instance(**kwargs) diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py index c9c11d547..7c16713a4 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/api/ec2/test_ec2_validate.py @@ -21,6 +21,7 @@ import datetime from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils from nova.compute import utils as compute_utils +from nova import config from nova import context from nova import db from nova import exception @@ -32,8 +33,8 @@ from nova import test from nova.tests import fake_network from nova.tests.image import fake +CONF = config.CONF LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS class EC2ValidateTestCase(test.TestCase): diff --git a/nova/tests/api/ec2/test_middleware.py b/nova/tests/api/ec2/test_middleware.py index a618817bd..fbc10d86d 100644 --- a/nova/tests/api/ec2/test_middleware.py +++ b/nova/tests/api/ec2/test_middleware.py @@ -22,13 +22,14 @@ import webob.dec import webob.exc 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 -FLAGS = flags.FLAGS +CONF = config.CONF @webob.dec.wsgify @@ -62,28 +63,28 @@ class LockoutTestCase(test.TestCase): return (req.get_response(self.lockout).status_int == 403) def test_lockout(self): - self._send_bad_attempts('test', FLAGS.lockout_attempts) + self._send_bad_attempts('test', CONF.lockout_attempts) self.assertTrue(self._is_locked_out('test')) def test_timeout(self): - self._send_bad_attempts('test', FLAGS.lockout_attempts) + self._send_bad_attempts('test', CONF.lockout_attempts) self.assertTrue(self._is_locked_out('test')) - timeutils.advance_time_seconds(FLAGS.lockout_minutes * 60) + timeutils.advance_time_seconds(CONF.lockout_minutes * 60) self.assertFalse(self._is_locked_out('test')) def test_multiple_keys(self): - self._send_bad_attempts('test1', FLAGS.lockout_attempts) + self._send_bad_attempts('test1', CONF.lockout_attempts) self.assertTrue(self._is_locked_out('test1')) self.assertFalse(self._is_locked_out('test2')) - timeutils.advance_time_seconds(FLAGS.lockout_minutes * 60) + timeutils.advance_time_seconds(CONF.lockout_minutes * 60) self.assertFalse(self._is_locked_out('test1')) self.assertFalse(self._is_locked_out('test2')) def test_window_timeout(self): - self._send_bad_attempts('test', FLAGS.lockout_attempts - 1) + self._send_bad_attempts('test', CONF.lockout_attempts - 1) self.assertFalse(self._is_locked_out('test')) - timeutils.advance_time_seconds(FLAGS.lockout_window * 60) - self._send_bad_attempts('test', FLAGS.lockout_attempts - 1) + timeutils.advance_time_seconds(CONF.lockout_window * 60) + self._send_bad_attempts('test', CONF.lockout_attempts - 1) self.assertFalse(self._is_locked_out('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 c412b2c5c..337e1e4e7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -20,6 +20,7 @@ from nova.api.openstack import compute from nova.api.openstack.compute.contrib import admin_actions from nova.compute import api as compute_api from nova.compute import vm_states +from nova import config from nova import context from nova import exception from nova import flags @@ -29,8 +30,7 @@ from nova import test from nova.tests.api.openstack import fakes from nova import utils - -FLAGS = flags.FLAGS +CONF = config.CONF INSTANCE = { "id": 1, @@ -216,7 +216,7 @@ class CreateBackupTests(test.TestCase): 'metadata': {'123': 'asdf'}, }, } - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): body['createBackup']['metadata']['foo%i' % num] = "bar" request = self._get_request(body) diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index 97b78f81e..12a6c508d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -18,6 +18,7 @@ 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 import flags from nova.openstack.common import timeutils @@ -26,13 +27,12 @@ from nova.tests.api.openstack import fakes from nova.tests import fake_network from nova import utils - -FLAGS = flags.FLAGS +CONF = config.CONF def fake_vpn_instance(): return { - 'id': 7, 'image_ref': FLAGS.vpn_image_id, 'vm_state': 'active', + 'id': 7, 'image_ref': CONF.vpn_image_id, 'vm_state': 'active', 'created_at': timeutils.parse_strtime('1981-10-20T00:00:00.000000'), 'uuid': 7777, 'project_id': 'other', } diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py index 74af62e60..a08a63efc 100644 --- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py @@ -28,9 +28,6 @@ from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - FAKE_UUID = fakes.FAKE_UUID FAKE_NETWORKS = [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', '10.0.1.12'), 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 9206899d6..78ffb62e6 100644 --- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py @@ -31,8 +31,6 @@ MANUAL_INSTANCE_UUID = fakes.FAKE_UUID AUTO_INSTANCE_UUID = fakes.FAKE_UUID.replace('a', 'b') stub_instance = fakes.stub_instance -FLAGS = flags.FLAGS - API_DISK_CONFIG = 'OS-DCF:diskConfig' 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 31e40d7ca..7154d06bb 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 @@ -25,10 +25,6 @@ from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - - UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' UUID3 = '00000000-0000-0000-0000-000000000003' 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 3ca4000e5..bff7773b1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_status.py @@ -24,10 +24,6 @@ from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - - UUID1 = '00000000-0000-0000-0000-000000000001' UUID2 = '00000000-0000-0000-0000-000000000002' UUID3 = '00000000-0000-0000-0000-000000000003' 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 1225b56b9..a90fa19c7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py @@ -22,10 +22,6 @@ from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - - FAKE_FLAVORS = { 'flavor 1': { "flavorid": '1', 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 52163c700..3965fbbd7 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -21,10 +21,6 @@ from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - - FAKE_FLAVORS = { 'flavor 1': { "flavorid": '1', 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 75e9cd76b..b9f57f8ce 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py @@ -21,10 +21,6 @@ from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - - FAKE_FLAVORS = { 'flavor 1': { "flavorid": '1', diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index b2b5407f5..944594788 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -25,8 +25,6 @@ from nova import flags from nova.openstack.common import log as logging from nova import test - -FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) HOST_LIST = [ {"host_name": "host_c1", "service": "compute", "zone": "nova"}, diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py index 808493f1b..1ee77c547 100644 --- a/nova/tests/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/api/openstack/compute/contrib/test_networks.py @@ -23,15 +23,13 @@ import uuid 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 -from nova import flags - - -FLAGS = flags.FLAGS - +CONF = config.CONF FAKE_NETWORKS = [ { @@ -137,12 +135,12 @@ class FakeNetworkAPI(object): def create(self, context, **kwargs): subnet_bits = int(math.ceil(math.log(kwargs.get( - 'network_size', FLAGS.network_size), 2))) + 'network_size', CONF.network_size), 2))) fixed_net_v4 = netaddr.IPNetwork(kwargs['cidr']) prefixlen_v4 = 32 - subnet_bits subnets_v4 = list(fixed_net_v4.subnet( prefixlen_v4, - count=kwargs.get('num_networks', FLAGS.num_networks))) + count=kwargs.get('num_networks', CONF.num_networks))) new_networks = [] new_id = max((net['id'] for net in self.networks)) for index, subnet_v4 in enumerate(subnets_v4): diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py index 88e9141f7..5baff7717 100644 --- a/nova/tests/api/openstack/compute/contrib/test_rescue.py +++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py @@ -15,13 +15,14 @@ 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 -FLAGS = flags.FLAGS +CONF = config.CONF def rescue(self, context, instance, rescue_password=None): @@ -71,7 +72,7 @@ class RescueTest(test.TestCase): resp = req.get_response(self.app) self.assertEqual(resp.status_int, 200) resp_json = jsonutils.loads(resp.body) - self.assertEqual(FLAGS.password_length, len(resp_json['adminPass'])) + self.assertEqual(CONF.password_length, len(resp_json['adminPass'])) def test_rescue_of_rescued_instance(self): body = dict(rescue=None) 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 d33da9ca5..c0d097c7a 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py @@ -25,6 +25,7 @@ from nova.api.openstack.compute.contrib import security_groups from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute +from nova import config import nova.db from nova import exception from nova import flags @@ -33,11 +34,9 @@ from nova import quota from nova import test from nova.tests.api.openstack import fakes - +CONF = config.CONF FAKE_UUID = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16' -FLAGS = flags.FLAGS - class AttrDict(dict): def __getattr__(self, k): @@ -259,7 +258,7 @@ class TestSecurityGroups(test.TestCase): def test_create_security_group_quota_limit(self): req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') - for num in range(1, FLAGS.quota_security_groups + 1): + for num in range(1, CONF.quota_security_groups + 1): name = 'test%s' % num sg = security_group_template(name=name) res_dict = self.controller.create(req, {'security_group': sg}) @@ -1000,7 +999,7 @@ class TestSecurityGroupRules(test.TestCase): def test_create_rule_quota_limit(self): req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') - for num in range(100, 100 + FLAGS.quota_security_group_rules): + for num in range(100, 100 + CONF.quota_security_group_rules): rule = { 'ip_protocol': 'tcp', 'from_port': num, 'to_port': num, 'parent_group_id': '2', 'group_id': '1' 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 0a4610aea..0c5f029ba 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 @@ -31,9 +31,6 @@ from nova import policy from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - SERVERS = 5 TENANTS = 2 HOURS = 24 diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py index 6e76fc04a..7bc5d65f3 100644 --- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py @@ -27,8 +27,6 @@ from nova import test from nova.tests.api.openstack import fakes from nova.volume import cinder -FLAGS = flags.FLAGS - LOG = logging.getLogger(__name__) _last_param = {} diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py index e91952728..d2c0d98da 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py @@ -21,6 +21,7 @@ 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 import flags @@ -31,8 +32,7 @@ from nova.tests.api.openstack import fakes from nova.volume import cinder from webob import exc - -FLAGS = flags.FLAGS +CONF = config.CONF FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' FAKE_UUID_A = '00000000-aaaa-aaaa-aaaa-000000000000' @@ -129,7 +129,7 @@ class BootFromVolumeTest(test.TestCase): self.assertEqual(res.status_int, 202) server = jsonutils.loads(res.body)['server'] self.assertEqual(FAKE_UUID, server['id']) - self.assertEqual(FLAGS.password_length, len(server['adminPass'])) + self.assertEqual(CONF.password_length, len(server['adminPass'])) self.assertEqual(len(_block_device_mapping_seen), 1) self.assertEqual(_block_device_mapping_seen[0]['volume_id'], 1) self.assertEqual(_block_device_mapping_seen[0]['device_name'], diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py index 6ea8149cf..90bd06e3b 100644 --- a/nova/tests/api/openstack/compute/test_consoles.py +++ b/nova/tests/api/openstack/compute/test_consoles.py @@ -32,8 +32,6 @@ from nova import test from nova.tests.api.openstack import fakes from nova import utils - -FLAGS = flags.FLAGS FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index ceb90d24c..282c6d122 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -25,13 +25,13 @@ 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 import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS +CONF = config.CONF NS = "{http://docs.openstack.org/common/api/v1.0}" ATOMNS = "{http://www.w3.org/2005/Atom}" @@ -141,7 +141,7 @@ class StubExtensionManager(object): class ExtensionTestCase(test.TestCase): def setUp(self): super(ExtensionTestCase, self).setUp() - ext_list = FLAGS.osapi_compute_extension[:] + ext_list = CONF.osapi_compute_extension[:] fox = ('nova.tests.api.openstack.compute.extensions.' 'foxinsocks.Foxinsocks') if fox not in ext_list: diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py index 77d40df03..6726aa579 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/api/openstack/compute/test_flavors.py @@ -30,10 +30,6 @@ from nova import flags from nova import test from nova.tests.api.openstack import fakes - -FLAGS = flags.FLAGS - - NS = "{http://docs.openstack.org/compute/api/v1.1}" ATOMNS = "{http://www.w3.org/2005/Atom}" diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py index 1cd46902b..c2f12b4a5 100644 --- a/nova/tests/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/api/openstack/compute/test_image_metadata.py @@ -18,13 +18,13 @@ 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 - -FLAGS = flags.FLAGS +CONF = config.CONF class ImageMetaDataTest(test.TestCase): @@ -134,7 +134,7 @@ class ImageMetaDataTest(test.TestCase): req = fakes.HTTPRequest.blank('/v2/fake/images/123/metadata/key1') req.method = 'PUT' overload = {} - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): overload['key%s' % num] = 'value%s' % num body = {'meta': overload} req.body = jsonutils.dumps(body) @@ -176,7 +176,7 @@ class ImageMetaDataTest(test.TestCase): def test_too_many_metadata_items_on_create(self): data = {"metadata": {}} - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): data['metadata']['key%i' % num] = "blah" req = fakes.HTTPRequest.blank('/v2/fake/images/123/metadata') req.method = 'POST' diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index af1dee30b..34dc2682d 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -34,10 +34,6 @@ from nova import test from nova.tests.api.openstack import fakes from nova import utils - -FLAGS = flags.FLAGS - - NS = "{http://docs.openstack.org/compute/api/v1.1}" ATOMNS = "{http://www.w3.org/2005/Atom}" NOW_API_FORMAT = "2010-10-11T10:30:22Z" diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py index 0afa00f2b..de08c6124 100644 --- a/nova/tests/api/openstack/compute/test_server_actions.py +++ b/nova/tests/api/openstack/compute/test_server_actions.py @@ -22,6 +22,7 @@ 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 import flags @@ -32,8 +33,7 @@ from nova.tests.api.openstack import fakes from nova.tests.image import fake from nova import utils - -FLAGS = flags.FLAGS +CONF = config.CONF FAKE_UUID = fakes.FAKE_UUID INSTANCE_IDS = {FAKE_UUID: 1} @@ -209,7 +209,7 @@ class ServerActionsControllerTest(test.TestCase): self.assertEqual(body['server']['image']['id'], '2') self.assertEqual(len(body['server']['adminPass']), - FLAGS.password_length) + CONF.password_length) self.assertEqual(robj['location'], self_href) @@ -825,7 +825,7 @@ class ServerActionsControllerTest(test.TestCase): 'metadata': {}, }, } - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): body['createImage']['metadata']['foo%i' % num] = "bar" req = fakes.HTTPRequest.blank(self.url) diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py index bcce624d7..093c1efda 100644 --- a/nova/tests/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/api/openstack/compute/test_server_metadata.py @@ -19,6 +19,7 @@ import webob from nova.api.openstack.compute import server_metadata from nova.compute import rpcapi as compute_rpcapi +from nova import config import nova.db from nova import exception from nova import flags @@ -27,8 +28,7 @@ from nova import test from nova.tests.api.openstack import fakes from nova import utils - -FLAGS = flags.FLAGS +CONF = config.CONF def return_create_instance_metadata_max(context, server_id, metadata, delete): @@ -65,7 +65,7 @@ def stub_server_metadata(): def stub_max_server_metadata(): metadata = {"metadata": {}} - for num in range(FLAGS.quota_metadata_items): + for num in range(CONF.quota_metadata_items): metadata['metadata']['key%i' % num] = "blah" return metadata @@ -416,7 +416,7 @@ class ServerMetaDataTest(test.TestCase): self.stubs.Set(nova.db, 'instance_metadata_update', return_create_instance_metadata) data = {"metadata": {}} - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): data['metadata']['key%i' % num] = "blah" req = fakes.HTTPRequest.blank(self.url) req.method = 'POST' @@ -455,7 +455,7 @@ class ServerMetaDataTest(test.TestCase): self.stubs.Set(nova.db, 'instance_metadata_update', return_create_instance_metadata) data = {"metadata": {}} - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): data['metadata']['key%i' % num] = "blah" req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' @@ -469,7 +469,7 @@ class ServerMetaDataTest(test.TestCase): self.stubs.Set(nova.db, 'instance_metadata_update', return_create_instance_metadata) data = {"metadata": {}} - for num in range(FLAGS.quota_metadata_items + 1): + for num in range(CONF.quota_metadata_items + 1): data['metadata']['key%i' % num] = "blah" req = fakes.HTTPRequest.blank(self.url) req.method = 'PUT' diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index afa181ee3..4ef89806a 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -34,6 +34,7 @@ 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 @@ -49,8 +50,8 @@ from nova.tests import fake_network from nova.tests.image import fake from nova import utils +CONF = config.CONF -FLAGS = flags.FLAGS FAKE_UUID = fakes.FAKE_UUID NS = "{http://docs.openstack.org/compute/api/v1.1}" ATOMNS = "{http://www.w3.org/2005/Atom}" @@ -1670,7 +1671,7 @@ class ServersControllerCreateTest(test.TestCase): def rpc_call_wrapper(context, topic, msg, timeout=None): """Stub out the scheduler creating the instance entry""" - if (topic == FLAGS.scheduler_topic and + if (topic == CONF.scheduler_topic and msg['method'] == 'run_instance'): request_spec = msg['args']['request_spec'] num_instances = request_spec.get('num_instances', 1) @@ -1720,7 +1721,7 @@ class ServersControllerCreateTest(test.TestCase): length. """ - self.assertEqual(FLAGS.password_length, + self.assertEqual(CONF.password_length, len(server_dict["adminPass"])) def _check_admin_pass_missing(self, server_dict): diff --git a/nova/tests/api/test_sizelimit.py b/nova/tests/api/test_sizelimit.py index 170198b6b..8f9358b41 100644 --- a/nova/tests/api/test_sizelimit.py +++ b/nova/tests/api/test_sizelimit.py @@ -15,11 +15,12 @@ import webob import nova.api.sizelimit +from nova import config from nova import flags from nova import test -FLAGS = flags.FLAGS -MAX_REQUEST_BODY_SIZE = FLAGS.osapi_max_request_body_size +CONF = config.CONF +MAX_REQUEST_BODY_SIZE = CONF.osapi_max_request_body_size class TestRequestBodySizeLimiter(test.TestCase): diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py index e9184ee5d..2355c604c 100644 --- a/nova/tests/baremetal/test_proxy_bare_metal.py +++ b/nova/tests/baremetal/test_proxy_bare_metal.py @@ -29,10 +29,6 @@ from nova.tests import fake_utils from nova.virt.baremetal import dom from nova.virt.baremetal import driver - -FLAGS = flags.FLAGS - - # Same fake_domains is used by different classes, # but different fake_file is used by different classes for unit test. fake_domains = [{'status': 1, 'name': 'instance-00000001', diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py index 58b07ff75..36e0d81dc 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 import flags from nova.openstack.common import rpc from nova import test - -FLAGS = flags.FLAGS +CONF = config.CONF class CertRpcAPITestCase(test.TestCase): @@ -54,7 +54,7 @@ class CertRpcAPITestCase(test.TestCase): self.assertEqual(retval, expected_retval) self.assertEqual(self.call_ctxt, ctxt) - self.assertEqual(self.call_topic, FLAGS.cert_topic) + self.assertEqual(self.call_topic, CONF.cert_topic) self.assertEqual(self.call_msg, expected_msg) self.assertEqual(self.call_timeout, None) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index d47a861c3..f894f3305 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -67,7 +67,6 @@ from nova.volume import cinder QUOTAS = quota.QUOTAS LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS CONF = config.CONF CONF.import_opt('live_migration_retry_count', 'nova.compute.manager') @@ -105,7 +104,7 @@ class BaseTestCase(test.TestCase): notification_driver=[test_notifier.__name__], network_manager='nova.network.manager.FlatManager') fake.set_nodes([NODENAME]) - self.compute = importutils.import_object(FLAGS.compute_manager) + self.compute = importutils.import_object(CONF.compute_manager) # override tracker with a version that doesn't need the database: fake_rt = fake_resource_tracker.FakeResourceTracker(self.compute.host, @@ -2101,7 +2100,7 @@ class ComputeTestCase(BaseTestCase): self.compute._get_compute_info( self.context, inst_ref['host']).AndReturn(compute_info) self.compute._get_compute_info( - self.context, FLAGS.host).AndReturn(compute_info) + self.context, CONF.host).AndReturn(compute_info) self.compute.driver.check_can_live_migrate_destination(self.context, inst_ref, compute_info, compute_info, @@ -2130,7 +2129,7 @@ class ComputeTestCase(BaseTestCase): self.compute._get_compute_info( self.context, inst_ref['host']).AndReturn(compute_info) self.compute._get_compute_info( - self.context, FLAGS.host).AndReturn(compute_info) + self.context, CONF.host).AndReturn(compute_info) self.compute.driver.check_can_live_migrate_destination(self.context, inst_ref, compute_info, compute_info, @@ -2161,7 +2160,7 @@ class ComputeTestCase(BaseTestCase): self.compute._get_compute_info( self.context, inst_ref['host']).AndReturn(compute_info) self.compute._get_compute_info( - self.context, FLAGS.host).AndReturn(compute_info) + self.context, CONF.host).AndReturn(compute_info) self.compute.driver.check_can_live_migrate_destination(self.context, inst_ref, compute_info, compute_info, @@ -2228,7 +2227,7 @@ class ComputeTestCase(BaseTestCase): inst_id = instance['id'] c = context.get_admin_context() - topic = rpc.queue_get_for(c, FLAGS.compute_topic, instance['host']) + topic = rpc.queue_get_for(c, CONF.compute_topic, instance['host']) # creating volume testdata volume_id = 'fake' @@ -2300,7 +2299,7 @@ class ComputeTestCase(BaseTestCase): # create self.mox.StubOutWithMock(rpc, 'call') - topic = rpc.queue_get_for(c, FLAGS.compute_topic, instance['host']) + topic = rpc.queue_get_for(c, CONF.compute_topic, instance['host']) rpc.call(c, topic, {"method": "pre_live_migration", "args": {'instance': instance, @@ -2344,7 +2343,7 @@ class ComputeTestCase(BaseTestCase): self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance') self.compute.driver.unfilter_instance(inst_ref, []) self.mox.StubOutWithMock(rpc, 'call') - rpc.call(c, rpc.queue_get_for(c, FLAGS.compute_topic, dest), + rpc.call(c, rpc.queue_get_for(c, CONF.compute_topic, dest), {"method": "post_live_migration_at_destination", "args": {'instance': inst_ref, 'block_migration': False}, "version": compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION}, @@ -2548,7 +2547,7 @@ class ComputeTestCase(BaseTestCase): self.mox.StubOutWithMock(timeutils, 'is_older_than') timeutils.is_older_than('sometimeago', - FLAGS.running_deleted_instance_timeout).AndReturn(True) + CONF.running_deleted_instance_timeout).AndReturn(True) self.mox.StubOutWithMock(self.compute.db, "instance_get_all_by_host") self.compute.db.instance_get_all_by_host('context', @@ -2568,7 +2567,7 @@ class ComputeTestCase(BaseTestCase): instances = [] for x in xrange(5): uuid = 'fake-uuid-%s' % x - instance_map[uuid] = {'uuid': uuid, 'host': FLAGS.host} + instance_map[uuid] = {'uuid': uuid, 'host': CONF.host} instances.append(instance_map[uuid]) call_info = {'get_all_by_host': 0, 'get_by_uuid': 0, @@ -2672,7 +2671,7 @@ class ComputeTestCase(BaseTestCase): def fake_migration_get_unconfirmed_by_dest_compute(context, resize_confirm_window, dest_compute): - self.assertEqual(dest_compute, FLAGS.host) + self.assertEqual(dest_compute, CONF.host) return migrations def fake_migration_update(context, migration_id, values): @@ -2734,7 +2733,7 @@ class ComputeTestCase(BaseTestCase): instances = [] for x in xrange(5): uuid = 'fake-uuid-%s' % x - instance_map[uuid] = {'uuid': uuid, 'host': FLAGS.host, + instance_map[uuid] = {'uuid': uuid, 'host': CONF.host, 'vm_state': vm_states.BUILDING, 'created_at': created_at} instances.append(instance_map[uuid]) @@ -2766,7 +2765,7 @@ class ComputeTestCase(BaseTestCase): instances = [] for x in xrange(5): uuid = 'fake-uuid-%s' % x - instance_map[uuid] = {'uuid': uuid, 'host': FLAGS.host, + instance_map[uuid] = {'uuid': uuid, 'host': CONF.host, 'vm_state': vm_states.BUILDING, 'created_at': created_at} instances.append(instance_map[uuid]) @@ -2799,7 +2798,7 @@ class ComputeTestCase(BaseTestCase): #expired instances for x in xrange(4): uuid = 'fake-uuid-%s' % x - instance_map[uuid] = {'uuid': uuid, 'host': FLAGS.host, + instance_map[uuid] = {'uuid': uuid, 'host': CONF.host, 'vm_state': vm_states.BUILDING, 'created_at': created_at} instances.append(instance_map[uuid]) @@ -2808,7 +2807,7 @@ class ComputeTestCase(BaseTestCase): uuid = 'fake-uuid-5' instance_map[uuid] = { 'uuid': uuid, - 'host': FLAGS.host, + 'host': CONF.host, 'vm_state': vm_states.BUILDING, 'created_at': timeutils.utcnow(), } @@ -3164,7 +3163,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) self.compute_api.delete(self.context, instance) @@ -3175,7 +3174,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_in_resized(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) instance['vm_state'] = vm_states.RESIZED @@ -3199,7 +3198,7 @@ class ComputeAPITestCase(BaseTestCase): old_time = datetime.datetime(2012, 4, 1) instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) timeutils.set_time_override(old_time) self.compute_api.delete(self.context, instance) timeutils.clear_time_override() @@ -3230,7 +3229,7 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(QUOTAS, 'commit', fake_commit) instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) self.compute_api.delete(self.context, instance) self.compute_api.delete(self.context, instance) @@ -3250,7 +3249,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_handles_host_setting_race_condition(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) instance['host'] = None # make it think host was never set self.compute_api.delete(self.context, instance) @@ -3261,7 +3260,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_fail(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) instance = db.instance_update(self.context, instance_uuid, {'disable_terminate': True}) @@ -3274,7 +3273,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_soft(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) self.mox.StubOutWithMock(nova.quota.QUOTAS, 'commit') nova.quota.QUOTAS.commit(mox.IgnoreArg(), mox.IgnoreArg()) @@ -3289,7 +3288,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_soft_fail(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) instance = db.instance_update(self.context, instance_uuid, {'disable_terminate': True}) @@ -3302,7 +3301,7 @@ class ComputeAPITestCase(BaseTestCase): def test_delete_soft_rollback(self): instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) self.mox.StubOutWithMock(nova.quota.QUOTAS, 'rollback') nova.quota.QUOTAS.rollback(mox.IgnoreArg(), mox.IgnoreArg()) @@ -3324,7 +3323,7 @@ class ComputeAPITestCase(BaseTestCase): def test_force_delete(self): """Ensure instance can be deleted after a soft delete""" instance = jsonutils.to_primitive(self._create_fake_instance(params={ - 'host': FLAGS.host})) + 'host': CONF.host})) instance_uuid = instance['uuid'] self.compute.run_instance(self.context, instance=instance) @@ -3416,7 +3415,7 @@ class ComputeAPITestCase(BaseTestCase): def test_restore(self): """Ensure instance can be restored from a soft delete""" instance, instance_uuid = self._run_instance(params={ - 'host': FLAGS.host}) + 'host': CONF.host}) instance = db.instance_get_by_uuid(self.context, instance_uuid) self.compute_api.soft_delete(self.context, instance) @@ -3982,7 +3981,7 @@ class ComputeAPITestCase(BaseTestCase): orig_instance_type = instance['instance_type'] self.compute.run_instance(self.context, instance=instance) # We need to set the host to something 'known'. Unfortunately, - # the compute manager is using a cached copy of FLAGS.host, + # the compute manager is using a cached copy of CONF.host, # so we can't just self.flags(host='host2') before calling # run_instance above. Also, set progress to 10 so we ensure # it is reset to 0 in compute_api.resize(). (verified in @@ -4017,7 +4016,7 @@ class ComputeAPITestCase(BaseTestCase): instance = jsonutils.to_primitive(instance) self.compute.run_instance(self.context, instance=instance) # We need to set the host to something 'known'. Unfortunately, - # the compute manager is using a cached copy of FLAGS.host, + # the compute manager is using a cached copy of CONF.host, # so we can't just self.flags(host='host2') before calling # run_instance above. Also, set progress to 10 so we ensure # it is reset to 0 in compute_api.resize(). (verified in @@ -4638,7 +4637,7 @@ class ComputeAPITestCase(BaseTestCase): db.instance_destroy(self.context, i_ref['uuid']) def test_add_remove_fixed_ip(self): - instance = self._create_fake_instance(params={'host': FLAGS.host}) + instance = self._create_fake_instance(params={'host': CONF.host}) self.compute_api.add_fixed_ip(self.context, instance, '1') self.compute_api.remove_fixed_ip(self.context, instance, '192.168.1.1') self.compute_api.delete(self.context, instance) @@ -4677,7 +4676,7 @@ class ComputeAPITestCase(BaseTestCase): rpc.call(self.context, 'compute.%s' % fake_instance['host'], rpc_msg1, None).AndReturn(fake_connect_info2) - rpc.call(self.context, FLAGS.consoleauth_topic, + rpc.call(self.context, CONF.consoleauth_topic, rpc_msg2, None).AndReturn(None) self.mox.ReplayAll() @@ -4806,7 +4805,7 @@ class ComputeAPITestCase(BaseTestCase): self.assertTrue(result["detached"]) def test_inject_network_info(self): - instance = self._create_fake_instance(params={'host': FLAGS.host}) + instance = self._create_fake_instance(params={'host': CONF.host}) self.compute.run_instance(self.context, instance=jsonutils.to_primitive(instance)) instance = self.compute_api.get(self.context, instance['uuid']) @@ -4881,7 +4880,7 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(self.compute_api.db, 'security_group_get', group_get) self.mox.StubOutWithMock(rpc, 'cast') - topic = rpc.queue_get_for(self.context, FLAGS.compute_topic, + topic = rpc.queue_get_for(self.context, CONF.compute_topic, instance['host']) rpc.cast(self.context, topic, {"method": "refresh_instance_security_rules", @@ -4910,7 +4909,7 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(self.compute_api.db, 'security_group_get', group_get) self.mox.StubOutWithMock(rpc, 'cast') - topic = rpc.queue_get_for(self.context, FLAGS.compute_topic, + topic = rpc.queue_get_for(self.context, CONF.compute_topic, instance['host']) rpc.cast(self.context, topic, {"method": "refresh_instance_security_rules", @@ -4951,7 +4950,7 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(self.compute_api.db, 'security_group_get', group_get) self.mox.StubOutWithMock(rpc, 'cast') - topic = rpc.queue_get_for(self.context, FLAGS.compute_topic, + topic = rpc.queue_get_for(self.context, CONF.compute_topic, instance['host']) rpc.cast(self.context, topic, {"method": "refresh_instance_security_rules", @@ -4972,7 +4971,7 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(self.compute_api.db, 'security_group_get', group_get) self.mox.StubOutWithMock(rpc, 'cast') - topic = rpc.queue_get_for(self.context, FLAGS.compute_topic, + topic = rpc.queue_get_for(self.context, CONF.compute_topic, instance['host']) rpc.cast(self.context, topic, {"method": "refresh_instance_security_rules", @@ -5465,7 +5464,7 @@ class KeypairAPITestCase(BaseTestCase): def test_create_keypair_quota_limit(self): def fake_quotas_count(self, context, resource, *args, **kwargs): - return FLAGS.quota_key_pairs + return CONF.quota_key_pairs self.stubs.Set(QUOTAS, "count", fake_quotas_count) self.assertRaises(exception.KeypairLimitExceeded, self.keypair_api.create_key_pair, @@ -5499,7 +5498,7 @@ class KeypairAPITestCase(BaseTestCase): def test_import_keypair_quota_limit(self): def fake_quotas_count(self, context, resource, *args, **kwargs): - return FLAGS.quota_key_pairs + return CONF.quota_key_pairs self.stubs.Set(QUOTAS, "count", fake_quotas_count) self.assertRaises(exception.KeypairLimitExceeded, self.keypair_api.import_key_pair, diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py index 056450708..3ef9ac459 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/compute/test_compute_utils.py @@ -21,6 +21,7 @@ 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 @@ -35,9 +36,8 @@ from nova.tests import fake_network import nova.tests.image.fake from nova import utils - LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS +CONF = config.CONF class ComputeValidateDeviceTestCase(test.TestCase): @@ -217,7 +217,7 @@ class UsageInfoTestCase(test.TestCase): self.flags(compute_driver='nova.virt.fake.FakeDriver', notification_driver=[test_notifier.__name__], network_manager='nova.network.manager.FlatManager') - self.compute = importutils.import_object(FLAGS.compute_manager) + self.compute = importutils.import_object(CONF.compute_manager) self.user_id = 'fake' self.project_id = 'fake' self.context = context.RequestContext(self.user_id, self.project_id) diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 8db2534af..5cce9a4d9 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -19,6 +19,7 @@ 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 import flags @@ -26,8 +27,7 @@ from nova.openstack.common import jsonutils from nova.openstack.common import rpc from nova import test - -FLAGS = flags.FLAGS +CONF = config.CONF class ComputeRpcAPITestCase(test.TestCase): @@ -74,7 +74,7 @@ class ComputeRpcAPITestCase(test.TestCase): host = kwargs['destination'] else: host = kwargs['instance']['host'] - expected_topic = '%s.%s' % (FLAGS.compute_topic, host) + expected_topic = '%s.%s' % (CONF.compute_topic, host) self.fake_args = None self.fake_kwargs = None diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py index 2b50edf05..7e4e83d7d 100644 --- a/nova/tests/console/test_console.py +++ b/nova/tests/console/test_console.py @@ -29,7 +29,6 @@ from nova.openstack.common import importutils from nova.openstack.common import rpc from nova import test -FLAGS = flags.FLAGS CONF = config.CONF CONF.import_opt('console_driver', 'nova.console.manager') @@ -40,7 +39,7 @@ class ConsoleTestCase(test.TestCase): super(ConsoleTestCase, self).setUp() self.flags(console_driver='nova.console.fake.FakeConsoleProxy', stub_compute=True) - self.console = importutils.import_object(FLAGS.console_manager) + self.console = importutils.import_object(CONF.console_manager) self.user_id = 'fake' self.project_id = 'fake' self.context = context.RequestContext(self.user_id, self.project_id) diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py index 9499002c6..ce8bb8a51 100644 --- a/nova/tests/console/test_rpcapi.py +++ b/nova/tests/console/test_rpcapi.py @@ -18,14 +18,14 @@ 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 - -FLAGS = flags.FLAGS +CONF = config.CONF class ConsoleRpcAPITestCase(test.TestCase): @@ -49,7 +49,7 @@ class ConsoleRpcAPITestCase(test.TestCase): getattr(rpcapi, method)(ctxt, **kwargs) self.assertEqual(self.cast_ctxt, ctxt) - self.assertEqual(self.cast_topic, FLAGS.console_topic) + self.assertEqual(self.cast_topic, CONF.console_topic) self.assertEqual(self.cast_msg, expected_msg) def test_add_console(self): diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py index da50eb83b..a8d6ea3d3 100644 --- a/nova/tests/consoleauth/test_consoleauth.py +++ b/nova/tests/consoleauth/test_consoleauth.py @@ -28,8 +28,6 @@ from nova import flags from nova.openstack.common import log as logging from nova import test - -FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py index c59e322b8..8e9153893 100644 --- a/nova/tests/consoleauth/test_rpcapi.py +++ b/nova/tests/consoleauth/test_rpcapi.py @@ -18,14 +18,14 @@ 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 - -FLAGS = flags.FLAGS +CONF = config.CONF class ConsoleAuthRpcAPITestCase(test.TestCase): @@ -54,7 +54,7 @@ class ConsoleAuthRpcAPITestCase(test.TestCase): self.assertEqual(retval, expected_retval) self.assertEqual(self.call_ctxt, ctxt) - self.assertEqual(self.call_topic, FLAGS.consoleauth_topic) + self.assertEqual(self.call_topic, CONF.consoleauth_topic) self.assertEqual(self.call_msg, expected_msg) self.assertEqual(self.call_timeout, None) diff --git a/nova/tests/declare_flags.py b/nova/tests/declare_flags.py index 9e8fee123..615ee35b3 100644 --- a/nova/tests/declare_flags.py +++ b/nova/tests/declare_flags.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import flags +from nova import config from nova.openstack.common import cfg -FLAGS = flags.FLAGS -FLAGS.register_opt(cfg.IntOpt('answer', default=42, help='test flag')) +CONF = config.CONF +CONF.register_opt(cfg.IntOpt('answer', default=42, help='test flag')) diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index ff22278c5..4cbde5d39 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -17,6 +17,7 @@ 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 @@ -30,7 +31,7 @@ from nova.virt.libvirt import config as libvirt_config HOST = "testhost" -FLAGS = flags.FLAGS +CONF = config.CONF class FakeIptablesFirewallDriver(object): @@ -158,7 +159,7 @@ class FakeNetworkManager(network_manager.NetworkManager): def fake_network(network_id, ipv6=None): if ipv6 is None: - ipv6 = FLAGS.use_ipv6 + ipv6 = CONF.use_ipv6 fake_network = {'id': network_id, 'uuid': '00000000-0000-0000-0000-00000000000000%02d' % network_id, 'label': 'test%d' % network_id, @@ -185,7 +186,7 @@ def fake_network(network_id, ipv6=None): fake_network['cidr_v6'] = '2001:db8:0:%x::/64' % network_id fake_network['gateway_v6'] = '2001:db8:0:%x::1' % network_id fake_network['netmask_v6'] = '64' - if FLAGS.flat_injected: + if CONF.flat_injected: fake_network['injected'] = True return fake_network @@ -433,7 +434,7 @@ def _get_fake_cache(): 'label': 'private', 'subnets': [{'cidr': '192.168.0.0/24', 'ips': [_ip('192.168.0.3')]}]}}] - if FLAGS.use_ipv6: + if CONF.use_ipv6: ipv6_addr = 'fe80:b33f::a8bb:ccff:fedd:eeff' info[0]['network']['subnets'].append({'cidr': 'fe80:b33f::/64', 'ips': [_ip(ipv6_addr)]}) diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py index fa5e770f8..1c61bee35 100644 --- a/nova/tests/image/fake.py +++ b/nova/tests/image/fake.py @@ -21,19 +21,17 @@ import copy import datetime +from nova import config from nova import exception from nova import flags import nova.image.glance from nova.openstack.common import log as logging from nova import utils - +CONF = config.CONF LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS - - class _FakeImageService(object): """Mock (fake) image service for unit testing.""" @@ -53,8 +51,8 @@ class _FakeImageService(object): 'is_public': False, 'container_format': 'raw', 'disk_format': 'raw', - 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel, + 'properties': {'kernel_id': CONF.null_kernel, + 'ramdisk_id': CONF.null_kernel, 'architecture': 'x86_64'}} image2 = {'id': 'a2459075-d96c-40d5-893e-577ff92e721c', @@ -67,8 +65,8 @@ class _FakeImageService(object): 'is_public': True, 'container_format': 'ami', 'disk_format': 'ami', - 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel}} + 'properties': {'kernel_id': CONF.null_kernel, + 'ramdisk_id': CONF.null_kernel}} image3 = {'id': '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6', 'name': 'fakeimage123456', @@ -80,8 +78,8 @@ class _FakeImageService(object): 'is_public': True, 'container_format': None, 'disk_format': None, - 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel}} + 'properties': {'kernel_id': CONF.null_kernel, + 'ramdisk_id': CONF.null_kernel}} image4 = {'id': 'cedef40a-ed67-4d10-800e-17455edce175', 'name': 'fakeimage123456', @@ -93,8 +91,8 @@ class _FakeImageService(object): 'is_public': True, 'container_format': 'ami', 'disk_format': 'ami', - 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel}} + 'properties': {'kernel_id': CONF.null_kernel, + 'ramdisk_id': CONF.null_kernel}} image5 = {'id': 'c905cedb-7281-47e4-8a62-f26bc5fc4c77', 'name': 'fakeimage123456', @@ -120,8 +118,8 @@ class _FakeImageService(object): 'is_public': False, 'container_format': 'ova', 'disk_format': 'vhd', - 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel, + 'properties': {'kernel_id': CONF.null_kernel, + 'ramdisk_id': CONF.null_kernel, 'architecture': 'x86_64', 'auto_disk_config': 'False'}} @@ -135,8 +133,8 @@ class _FakeImageService(object): 'is_public': False, 'container_format': 'ova', 'disk_format': 'vhd', - 'properties': {'kernel_id': FLAGS.null_kernel, - 'ramdisk_id': FLAGS.null_kernel, + 'properties': {'kernel_id': CONF.null_kernel, + 'ramdisk_id': CONF.null_kernel, 'architecture': 'x86_64', 'auto_disk_config': 'True'}} diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 81c8e91c0..e06e2a67c 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -24,6 +24,7 @@ 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 import flags @@ -38,7 +39,7 @@ from nova.tests import fake_network from nova.tests.image import fake from nova.tests.integrated import integrated_helpers -FLAGS = flags.FLAGS +CONF = config.CONF LOG = logging.getLogger(__name__) @@ -591,7 +592,7 @@ class ServersActionsJsonTest(ServersSampleBase): 'server-action-rebuild-resp') def test_server_resize(self): - FLAGS.allow_resize_to_same_host = True + CONF.allow_resize_to_same_host = True uuid = self._post_server() self._test_server_action(uuid, "resize", {"id": 2, @@ -679,7 +680,7 @@ class FlavorsExtraDataJsonTest(ApiSampleTestBase): def _get_flags(self): f = super(FlavorsExtraDataJsonTest, self)._get_flags() - f['osapi_compute_extension'] = FLAGS.osapi_compute_extension[:] + f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] # Flavorextradata extension also needs Flavormanage to be loaded. f['osapi_compute_extension'].append( 'nova.api.openstack.compute.contrib.flavormanage.Flavormanage') @@ -834,8 +835,8 @@ class FloatingIpsJsonTest(ApiSampleTestBase): def setUp(self): super(FloatingIpsJsonTest, self).setUp() - pool = FLAGS.default_floating_pool - interface = FLAGS.public_interface + pool = CONF.default_floating_pool + interface = CONF.public_interface self.ip_pool = [ { @@ -896,7 +897,7 @@ class FloatingIpsJsonTest(ApiSampleTestBase): def test_floating_ips_create(self): response = self._do_post('os-floating-ips', 'floating-ips-create-req', - {"pool": FLAGS.default_floating_pool}) + {"pool": CONF.default_floating_pool}) self.assertEqual(response.status, 200) subs = self._get_regexes() self._verify_response('floating-ips-create-resp', @@ -1061,14 +1062,14 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase): def test_cloud_pipe_create(self): """Get api samples of cloud pipe extension creation""" - FLAGS.vpn_image_id = fake.get_valid_image_id() + CONF.vpn_image_id = fake.get_valid_image_id() project = {'project_id': 'cloudpipe-' + str(uuid.uuid4())} response = self._do_post('os-cloudpipe', 'cloud-pipe-create-req', project) self.assertEqual(response.status, 200) subs = self._get_regexes() subs.update(project) - subs['image_id'] = FLAGS.vpn_image_id + subs['image_id'] = CONF.vpn_image_id self._verify_response('cloud-pipe-create-resp', subs, response) return project @@ -1079,7 +1080,7 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase): self.assertEqual(response.status, 200) subs = self._get_regexes() subs.update(project) - subs['image_id'] = FLAGS.vpn_image_id + subs['image_id'] = CONF.vpn_image_id return self._verify_response('cloud-pipe-get-resp', subs, response) diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index 056ff32b7..96c7d47c7 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -15,19 +15,19 @@ # License for the specific language governing permissions and limitations # 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 - -FLAGS = flags.FLAGS +CONF = config.CONF LOG = logging.getLogger(__name__) class ExtensionsTest(integrated_helpers._IntegratedTestBase): def _get_flags(self): f = super(ExtensionsTest, self)._get_flags() - f['osapi_compute_extension'] = FLAGS.osapi_compute_extension[:] + f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] f['osapi_compute_extension'].append( 'nova.tests.api.openstack.compute.extensions.' 'foxinsocks.Foxinsocks') diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py index fbab7eb49..fd17d52da 100644 --- a/nova/tests/integrated/test_multiprocess_api.py +++ b/nova/tests/integrated/test_multiprocess_api.py @@ -26,7 +26,6 @@ from nova.openstack.common.log import logging from nova import service from nova.tests.integrated import integrated_helpers -FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index f69023ef8..aaf29601a 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -19,6 +19,7 @@ import os import mox +from nova import config from nova import context from nova import db from nova import flags @@ -29,12 +30,9 @@ from nova.openstack.common import log as logging from nova import test from nova import utils - -FLAGS = flags.FLAGS - +CONF = config.CONF LOG = logging.getLogger(__name__) - HOST = "testhost" instances = {'00000000-0000-0000-0000-0000000000000000': @@ -216,7 +214,7 @@ class LinuxNetworkTestCase(test.TestCase): def setUp(self): super(LinuxNetworkTestCase, self).setUp() - network_driver = FLAGS.network_driver + network_driver = CONF.network_driver self.driver = importutils.import_module(network_driver) self.driver.db = db self.context = context.RequestContext('testuser', 'testproject', diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py index a8f29e012..e69058cc0 100644 --- a/nova/tests/network/test_quantumv2.py +++ b/nova/tests/network/test_quantumv2.py @@ -17,18 +17,18 @@ import mox +from nova import config from nova import context from nova import exception from nova.network import model from nova.network import quantumv2 from nova.network.quantumv2 import api as quantumapi -from nova.openstack.common import cfg from nova import test from nova import utils from quantumclient.v2_0 import client +CONF = config.CONF -FLAGS = cfg.CONF #NOTE: Quantum client raises Exception which is discouraged by HACKING. # We set this variable here and use it for assertions below to avoid # the hacking checks until we can make quantum client throw a custom @@ -92,9 +92,9 @@ class TestQuantumClient(test.TestCase): auth_token='token') self.mox.StubOutWithMock(client.Client, "__init__") client.Client.__init__( - endpoint_url=FLAGS.quantum_url, + endpoint_url=CONF.quantum_url, token=my_context.auth_token, - timeout=FLAGS.quantum_url_timeout).AndReturn(None) + timeout=CONF.quantum_url_timeout).AndReturn(None) self.mox.ReplayAll() quantumv2.get_client(my_context) @@ -107,23 +107,17 @@ class TestQuantumClient(test.TestCase): my_context) def test_withouttoken_keystone_not_auth(self): - # self.flags(quantum_auth_strategy=None) fail to work - old_quantum_auth_strategy = FLAGS.quantum_auth_strategy - setattr(FLAGS, 'quantum_auth_strategy', None) + self.flags(quantum_auth_strategy=None) self.flags(quantum_url='http://anyhost/') self.flags(quantum_url_timeout=30) my_context = context.RequestContext('userid', 'my_tenantid') self.mox.StubOutWithMock(client.Client, "__init__") client.Client.__init__( - endpoint_url=FLAGS.quantum_url, + endpoint_url=CONF.quantum_url, auth_strategy=None, - timeout=FLAGS.quantum_url_timeout).AndReturn(None) + timeout=CONF.quantum_url_timeout).AndReturn(None) self.mox.ReplayAll() - try: - quantumv2.get_client(my_context) - finally: - setattr(FLAGS, 'quantum_auth_strategy', - old_quantum_auth_strategy) + quantumv2.get_client(my_context) class TestQuantumv2(test.TestCase): @@ -225,7 +219,7 @@ class TestQuantumv2(test.TestCase): self.mox.UnsetStubs() self.mox.VerifyAll() finally: - FLAGS.reset() + CONF.reset() super(TestQuantumv2, self).tearDown() def _verify_nw_info(self, nw_inf, index=0): diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py index de3f19cea..b0c3572ea 100644 --- a/nova/tests/network/test_rpcapi.py +++ b/nova/tests/network/test_rpcapi.py @@ -18,14 +18,14 @@ 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 - -FLAGS = flags.FLAGS +CONF = config.CONF class NetworkRpcAPITestCase(test.TestCase): @@ -34,7 +34,7 @@ class NetworkRpcAPITestCase(test.TestCase): rpcapi = network_rpcapi.NetworkAPI() expected_retval = 'foo' if method == 'call' else None expected_version = kwargs.pop('version', rpcapi.BASE_RPC_API_VERSION) - expected_topic = FLAGS.network_topic + expected_topic = CONF.network_topic expected_msg = rpcapi.make_msg(method, **kwargs) if 'source_compute' in expected_msg['args']: # Fix up for migrate_instance_* calls. @@ -52,7 +52,7 @@ class NetworkRpcAPITestCase(test.TestCase): if method != 'deallocate_fixed_ip': del expected_msg['args']['host'] host = kwargs['host'] - expected_topic = rpc.queue_get_for(ctxt, FLAGS.network_topic, host) + expected_topic = rpc.queue_get_for(ctxt, CONF.network_topic, host) expected_msg['version'] = expected_version self.fake_args = None diff --git a/nova/tests/runtime_flags.py b/nova/tests/runtime_flags.py index 7cc8c3219..33d265cf4 100644 --- a/nova/tests/runtime_flags.py +++ b/nova/tests/runtime_flags.py @@ -16,8 +16,8 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import flags +from nova import config from nova.openstack.common import cfg -FLAGS = flags.FLAGS -FLAGS.register_opt(cfg.IntOpt('runtime_answer', default=54, help='test flag')) +CONF = config.CONF +CONF.register_opt(cfg.IntOpt('runtime_answer', default=54, help='test flag')) diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 6dffe061e..f19755b82 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -18,6 +18,7 @@ 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 @@ -30,7 +31,7 @@ from nova import test from nova.tests.scheduler import fakes from nova import utils - +CONF = config.CONF DATA = '' @@ -433,7 +434,7 @@ class HostFiltersTestCase(test.TestCase): filt_cls = self.class_map['SimpleCIDRAffinityFilter']() host = fakes.FakeHostState('host1', 'node1', {}) - affinity_ip = flags.FLAGS.my_ip.split('.')[0:3] + affinity_ip = CONF.my_ip.split('.')[0:3] affinity_ip.append('100') affinity_ip = str.join('.', affinity_ip) diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index 8cf741118..605b0995e 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -18,14 +18,14 @@ 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 - -FLAGS = flags.FLAGS +CONF = config.CONF class SchedulerRpcAPITestCase(test.TestCase): @@ -51,7 +51,7 @@ class SchedulerRpcAPITestCase(test.TestCase): retval = getattr(rpcapi, method)(ctxt, **kwargs) self.assertEqual(retval, expected_retval) - expected_args = [ctxt, FLAGS.scheduler_topic, expected_msg] + expected_args = [ctxt, CONF.scheduler_topic, expected_msg] for arg, expected_arg in zip(self.fake_args, expected_args): self.assertEqual(arg, expected_arg) diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 6a0e93b7d..9d31a0cc9 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -39,8 +39,6 @@ from nova import test from nova.tests.scheduler import fakes from nova import utils -FLAGS = flags.FLAGS - class SchedulerManagerTestCase(test.TestCase): """Test case for scheduler manager""" diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index 6e0a97c0c..c2a63fe25 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -43,9 +43,6 @@ from nova.openstack.common import timeutils from nova import test -FLAGS = flags.FLAGS - - class FakeHttplibSocket(object): """a fake socket implementation for httplib.HTTPResponse, trivial""" def __init__(self, response_string): diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py index 922dc3613..c2602b1bd 100644 --- a/nova/tests/test_configdrive2.py +++ b/nova/tests/test_configdrive2.py @@ -27,9 +27,6 @@ from nova.openstack.common import log from nova import utils from nova.virt import configdrive - -FLAGS = flags.FLAGS - LOG = log.getLogger(__name__) diff --git a/nova/tests/test_crypto.py b/nova/tests/test_crypto.py index c725079d2..d11b49b3f 100644 --- a/nova/tests/test_crypto.py +++ b/nova/tests/test_crypto.py @@ -27,8 +27,6 @@ from nova import flags from nova import test from nova import utils -FLAGS = flags.FLAGS - class X509Test(test.TestCase): def test_can_generate_x509(self): diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index d57ec8564..ac66a25c1 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -30,8 +30,6 @@ from nova.openstack.common import timeutils from nova import test from nova import utils - -FLAGS = flags.FLAGS CONF = config.CONF CONF.import_opt('reserved_host_memory_mb', 'nova.compute.resource_tracker') CONF.import_opt('reserved_host_disk_mb', 'nova.compute.resource_tracker') diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py index ad94f6550..a266c7097 100644 --- a/nova/tests/test_flags.py +++ b/nova/tests/test_flags.py @@ -23,8 +23,7 @@ from nova.openstack.common import cfg from nova import test CONF = config.CONF -FLAGS = flags.FLAGS -FLAGS.register_opt(cfg.StrOpt('flags_unittest', +CONF.register_opt(cfg.StrOpt('flags_unittest', default='foo', help='for testing purposes only')) @@ -43,7 +42,7 @@ class FlagsTestCase(test.TestCase): self.assertEqual(CONF.answer, 256) def test_getopt_non_interspersed_args(self): - self.assert_('runtime_answer' not in FLAGS) + self.assert_('runtime_answer' not in CONF) argv = ['flags_test', 'extra_arg', '--runtime_answer=60'] args = config.parse_args(argv, default_config_files=[]) @@ -51,42 +50,42 @@ class FlagsTestCase(test.TestCase): self.assertEqual(argv, args) def test_runtime_and_unknown_flags(self): - self.assert_('runtime_answer' not in FLAGS) + self.assert_('runtime_answer' not in CONF) import nova.tests.runtime_flags - self.assert_('runtime_answer' in FLAGS) - self.assertEqual(FLAGS.runtime_answer, 54) + self.assert_('runtime_answer' in CONF) + self.assertEqual(CONF.runtime_answer, 54) def test_long_vs_short_flags(self): - FLAGS.clear() - FLAGS.register_cli_opt(cfg.StrOpt('duplicate_answer_long', + CONF.clear() + CONF.register_cli_opt(cfg.StrOpt('duplicate_answer_long', default='val', help='desc')) argv = ['flags_test', '--duplicate_answer=60', 'extra_arg'] args = config.parse_args(argv, default_config_files=[]) - self.assert_('duplicate_answer' not in FLAGS) - self.assert_(FLAGS.duplicate_answer_long, 60) + self.assert_('duplicate_answer' not in CONF) + self.assert_(CONF.duplicate_answer_long, 60) - FLAGS.clear() - FLAGS.register_cli_opt(cfg.IntOpt('duplicate_answer', + CONF.clear() + CONF.register_cli_opt(cfg.IntOpt('duplicate_answer', default=60, help='desc')) args = config.parse_args(argv, default_config_files=[]) - self.assertEqual(FLAGS.duplicate_answer, 60) - self.assertEqual(FLAGS.duplicate_answer_long, 'val') + self.assertEqual(CONF.duplicate_answer, 60) + self.assertEqual(CONF.duplicate_answer_long, 'val') def test_flag_leak_left(self): - self.assertEqual(FLAGS.flags_unittest, 'foo') + self.assertEqual(CONF.flags_unittest, 'foo') self.flags(flags_unittest='bar') - self.assertEqual(FLAGS.flags_unittest, 'bar') + self.assertEqual(CONF.flags_unittest, 'bar') def test_flag_leak_right(self): - self.assertEqual(FLAGS.flags_unittest, 'foo') + self.assertEqual(CONF.flags_unittest, 'foo') self.flags(flags_unittest='bar') - self.assertEqual(FLAGS.flags_unittest, 'bar') + self.assertEqual(CONF.flags_unittest, 'bar') def test_flag_overrides(self): - self.assertEqual(FLAGS.flags_unittest, 'foo') + self.assertEqual(CONF.flags_unittest, 'foo') self.flags(flags_unittest='bar') - self.assertEqual(FLAGS.flags_unittest, 'bar') - FLAGS.reset() - self.assertEqual(FLAGS.flags_unittest, 'foo') + self.assertEqual(CONF.flags_unittest, 'bar') + CONF.reset() + self.assertEqual(CONF.flags_unittest, 'foo') diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py index b995be3bd..197ad1ee6 100644 --- a/nova/tests/test_hypervapi.py +++ b/nova/tests/test_hypervapi.py @@ -25,6 +25,7 @@ import sys import uuid from nova.compute import power_state +from nova import config from nova import context from nova import db from nova import flags @@ -40,6 +41,8 @@ from nova.virt.hyperv import driver as driver_hyperv from nova.virt.hyperv import vmutils from nova.virt import images +CONF = config.CONF + class HyperVAPITestCase(basetestcase.BaseTestCase): """Unit tests for Hyper-V driver calls.""" @@ -148,7 +151,7 @@ class HyperVAPITestCase(basetestcase.BaseTestCase): self._hypervutils.logout_iscsi_volume_sessions(self._volume_id) - shutil.rmtree(flags.FLAGS.instances_path, True) + shutil.rmtree(CONF.instances_path, True) fake_image.FakeImageService_reset() finally: diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py index 088cb0a82..324b90981 100644 --- a/nova/tests/test_imagebackend.py +++ b/nova/tests/test_imagebackend.py @@ -17,13 +17,14 @@ 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 from nova.virt.libvirt import imagebackend -FLAGS = flags.FLAGS +CONF = config.CONF class _ImageTestCase(test.TestCase): @@ -42,9 +43,9 @@ class _ImageTestCase(test.TestCase): self.NAME = 'fake.vm' self.TEMPLATE = 'template' - self.PATH = os.path.join(FLAGS.instances_path, self.INSTANCE, + self.PATH = os.path.join(CONF.instances_path, self.INSTANCE, self.NAME) - self.TEMPLATE_DIR = os.path.join(FLAGS.instances_path, + self.TEMPLATE_DIR = os.path.join(CONF.instances_path, '_base') self.TEMPLATE_PATH = os.path.join(self.TEMPLATE_DIR, 'template') diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 8203277ae..ee30386c4 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -27,6 +27,7 @@ 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 import flags from nova.openstack.common import importutils @@ -35,8 +36,7 @@ from nova import utils from nova.virt.libvirt import imagecache from nova.virt.libvirt import utils as virtutils - -FLAGS = flags.FLAGS +CONF = config.CONF LOG = log.getLogger(__name__) @@ -147,13 +147,13 @@ class ImageCacheManagerTestCase(test.TestCase): def test_list_running_instances(self): all_instances = [{'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'inst-1', 'uuid': '123', 'vm_state': '', 'task_state': ''}, {'image_ref': '2', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'inst-2', 'uuid': '456', 'vm_state': '', @@ -182,7 +182,7 @@ class ImageCacheManagerTestCase(test.TestCase): def test_list_resizing_instances(self): all_instances = [{'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'inst-1', 'uuid': '123', 'vm_state': vm_states.RESIZED, @@ -209,7 +209,7 @@ class ImageCacheManagerTestCase(test.TestCase): self.stubs.Set(virtutils, 'get_disk_backing_file', lambda x: 'e97222e91fc4241f49a7f520d1dcf446751129b3_sm') - found = os.path.join(FLAGS.instances_path, FLAGS.base_dir_name, + found = os.path.join(CONF.instances_path, CONF.base_dir_name, 'e97222e91fc4241f49a7f520d1dcf446751129b3_sm') image_cache_manager = imagecache.ImageCacheManager() @@ -231,7 +231,7 @@ class ImageCacheManagerTestCase(test.TestCase): lambda x: ('e97222e91fc4241f49a7f520d1dcf446751129b3_' '10737418240')) - found = os.path.join(FLAGS.instances_path, FLAGS.base_dir_name, + found = os.path.join(CONF.instances_path, CONF.base_dir_name, 'e97222e91fc4241f49a7f520d1dcf446751129b3_' '10737418240') @@ -252,7 +252,7 @@ class ImageCacheManagerTestCase(test.TestCase): self.stubs.Set(virtutils, 'get_disk_backing_file', lambda x: 'e97222e91fc4241f49a7f520d1dcf446751129b3_sm') - found = os.path.join(FLAGS.instances_path, FLAGS.base_dir_name, + found = os.path.join(CONF.instances_path, CONF.base_dir_name, 'e97222e91fc4241f49a7f520d1dcf446751129b3_sm') image_cache_manager = imagecache.ImageCacheManager() @@ -789,13 +789,13 @@ class ImageCacheManagerTestCase(test.TestCase): # Fake the database call which lists running instances all_instances = [{'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'instance-1', 'uuid': '123', 'vm_state': '', 'task_state': ''}, {'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'instance-2', 'uuid': '456', 'vm_state': '', @@ -868,11 +868,11 @@ class ImageCacheManagerTestCase(test.TestCase): self.flags(instances_path='/tmp/no/such/dir/name/please') self.flags(image_info_filename_pattern=('$instances_path/_base/' '%(image)s.info')) - base_filename = os.path.join(FLAGS.instances_path, '_base', hashed) + base_filename = os.path.join(CONF.instances_path, '_base', hashed) self.assertFalse(virtutils.is_valid_info_file('banana')) self.assertFalse(virtutils.is_valid_info_file( - os.path.join(FLAGS.instances_path, '_base', '00000001'))) + os.path.join(CONF.instances_path, '_base', '00000001'))) self.assertFalse(virtutils.is_valid_info_file(base_filename)) self.assertFalse(virtutils.is_valid_info_file(base_filename + '.sha1')) self.assertTrue(virtutils.is_valid_info_file(base_filename + '.info')) @@ -889,13 +889,13 @@ class ImageCacheManagerTestCase(test.TestCase): # Fake the database call which lists running instances all_instances = [{'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'instance-1', 'uuid': '123', 'vm_state': '', 'task_state': ''}, {'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'instance-2', 'uuid': '456', 'vm_state': '', @@ -927,19 +927,19 @@ class ImageCacheManagerTestCase(test.TestCase): def fake_get_all(context): was['called'] = True return [{'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'instance-1', 'uuid': '123', 'vm_state': '', 'task_state': ''}, {'image_ref': '1', - 'host': FLAGS.host, + 'host': CONF.host, 'name': 'instance-2', 'uuid': '456', 'vm_state': '', 'task_state': ''}] self.stubs.Set(db, 'instance_get_all', fake_get_all) - compute = importutils.import_object(FLAGS.compute_manager) + compute = importutils.import_object(CONF.compute_manager) compute._run_image_cache_manager_pass(None) self.assertTrue(was['called']) diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py index 43d698374..a52863520 100644 --- a/nova/tests/test_instance_types.py +++ b/nova/tests/test_instance_types.py @@ -27,7 +27,6 @@ from nova import flags from nova.openstack.common import log as logging from nova import test -FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 6e49121f1..774986def 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -33,6 +33,7 @@ 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 @@ -51,7 +52,7 @@ from nova.virt import driver from nova.virt import fake from nova.virt import firewall as base_firewall from nova.virt import images -from nova.virt.libvirt import config +from nova.virt.libvirt import config as vconfig from nova.virt.libvirt import driver as libvirt_driver from nova.virt.libvirt import firewall from nova.virt.libvirt import imagebackend @@ -69,7 +70,7 @@ except ImportError: libvirt_driver.libvirt = libvirt -FLAGS = flags.FLAGS +CONF = config.CONF LOG = logging.getLogger(__name__) _fake_network_info = fake_network.fake_get_instance_nw_info @@ -267,7 +268,7 @@ class LibvirtVolumeTestCase(test.TestCase): tree = conf.format_dom() self.assertEqual(tree.get('type'), 'network') self.assertEqual(tree.find('./source').get('protocol'), 'rbd') - rbd_name = '%s/%s' % (FLAGS.rbd_pool, name) + rbd_name = '%s/%s' % (CONF.rbd_pool, name) self.assertEqual(tree.find('./source').get('name'), rbd_name) self.assertEqual(tree.find('./source/auth'), None) libvirt_driver.disconnect_volume(connection_info, mount_device) @@ -292,7 +293,7 @@ class LibvirtVolumeTestCase(test.TestCase): tree = conf.format_dom() self.assertEqual(tree.get('type'), 'network') self.assertEqual(tree.find('./source').get('protocol'), 'rbd') - rbd_name = '%s/%s' % (FLAGS.rbd_pool, name) + rbd_name = '%s/%s' % (CONF.rbd_pool, name) self.assertEqual(tree.find('./source').get('name'), rbd_name) self.assertEqual(tree.find('./auth').get('username'), user) self.assertEqual(tree.find('./auth/secret').get('type'), secret_type) @@ -324,7 +325,7 @@ class LibvirtVolumeTestCase(test.TestCase): tree = conf.format_dom() self.assertEqual(tree.get('type'), 'network') self.assertEqual(tree.find('./source').get('protocol'), 'rbd') - rbd_name = '%s/%s' % (FLAGS.rbd_pool, name) + rbd_name = '%s/%s' % (CONF.rbd_pool, name) self.assertEqual(tree.find('./source').get('name'), rbd_name) self.assertEqual(tree.find('./auth').get('username'), flags_user) self.assertEqual(tree.find('./auth/secret').get('type'), secret_type) @@ -351,7 +352,7 @@ class LibvirtVolumeTestCase(test.TestCase): tree = conf.format_dom() self.assertEqual(tree.get('type'), 'network') self.assertEqual(tree.find('./source').get('protocol'), 'rbd') - rbd_name = '%s/%s' % (FLAGS.rbd_pool, name) + rbd_name = '%s/%s' % (CONF.rbd_pool, name) self.assertEqual(tree.find('./source').get('name'), rbd_name) self.assertEqual(tree.find('./auth'), None) libvirt_driver.disconnect_volume(connection_info, mount_device) @@ -383,7 +384,7 @@ class LibvirtVolumeTestCase(test.TestCase): tree = conf.format_dom() self.assertEqual(tree.get('type'), 'network') self.assertEqual(tree.find('./source').get('protocol'), 'rbd') - rbd_name = '%s/%s' % (FLAGS.rbd_pool, name) + rbd_name = '%s/%s' % (CONF.rbd_pool, name) self.assertEqual(tree.find('./source').get('name'), rbd_name) self.assertEqual(tree.find('./auth').get('username'), flags_user) self.assertEqual(tree.find('./auth/secret').get('type'), secret_type) @@ -448,11 +449,11 @@ class CacheConcurrencyTestCase(test.TestCase): # which can cause race conditions with the multiple threads we # use for tests. So, create the path here so utils.synchronized() # won't delete it out from under one of the threads. - self.lock_path = os.path.join(FLAGS.instances_path, 'locks') + self.lock_path = os.path.join(CONF.instances_path, 'locks') fileutils.ensure_tree(self.lock_path) def fake_exists(fname): - basedir = os.path.join(FLAGS.instances_path, FLAGS.base_dir_name) + basedir = os.path.join(CONF.instances_path, CONF.base_dir_name) if fname == basedir or fname == self.lock_path: return True return False @@ -647,28 +648,28 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(cfg.os_root, None) self.assertEquals(len(cfg.devices), 7) self.assertEquals(type(cfg.devices[0]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[1]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[2]), - config.LibvirtConfigGuestInterface) + vconfig.LibvirtConfigGuestInterface) self.assertEquals(type(cfg.devices[3]), - config.LibvirtConfigGuestSerial) + vconfig.LibvirtConfigGuestSerial) self.assertEquals(type(cfg.devices[4]), - config.LibvirtConfigGuestSerial) + vconfig.LibvirtConfigGuestSerial) self.assertEquals(type(cfg.devices[5]), - config.LibvirtConfigGuestInput) + vconfig.LibvirtConfigGuestInput) self.assertEquals(type(cfg.devices[6]), - config.LibvirtConfigGuestGraphics) + vconfig.LibvirtConfigGuestGraphics) self.assertEquals(type(cfg.clock), - config.LibvirtConfigGuestClock) + vconfig.LibvirtConfigGuestClock) self.assertEquals(cfg.clock.offset, "utc") self.assertEquals(len(cfg.clock.timers), 2) self.assertEquals(type(cfg.clock.timers[0]), - config.LibvirtConfigGuestTimer) + vconfig.LibvirtConfigGuestTimer) self.assertEquals(type(cfg.clock.timers[1]), - config.LibvirtConfigGuestTimer) + vconfig.LibvirtConfigGuestTimer) self.assertEquals(cfg.clock.timers[0].name, "pit") self.assertEquals(cfg.clock.timers[0].tickpolicy, "delay") @@ -691,21 +692,21 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(cfg.os_root, None) self.assertEquals(len(cfg.devices), 8) self.assertEquals(type(cfg.devices[0]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[1]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[2]), - config.LibvirtConfigGuestInterface) + vconfig.LibvirtConfigGuestInterface) self.assertEquals(type(cfg.devices[3]), - config.LibvirtConfigGuestInterface) + vconfig.LibvirtConfigGuestInterface) self.assertEquals(type(cfg.devices[4]), - config.LibvirtConfigGuestSerial) + vconfig.LibvirtConfigGuestSerial) self.assertEquals(type(cfg.devices[5]), - config.LibvirtConfigGuestSerial) + vconfig.LibvirtConfigGuestSerial) self.assertEquals(type(cfg.devices[6]), - config.LibvirtConfigGuestInput) + vconfig.LibvirtConfigGuestInput) self.assertEquals(type(cfg.devices[7]), - config.LibvirtConfigGuestGraphics) + vconfig.LibvirtConfigGuestGraphics) def test_get_guest_config_with_root_device_name(self): self.flags(libvirt_type='uml') @@ -722,11 +723,11 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(cfg.os_root, 'dev/vdb') self.assertEquals(len(cfg.devices), 3) self.assertEquals(type(cfg.devices[0]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[1]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[2]), - config.LibvirtConfigGuestConsole) + vconfig.LibvirtConfigGuestConsole) def test_get_guest_config_with_block_device(self): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) @@ -739,10 +740,10 @@ class LibvirtConnTestCase(test.TestCase): cfg = conn.get_guest_config(instance_ref, [], None, None, info) self.assertEquals(type(cfg.devices[2]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(cfg.devices[2].target_dev, 'vdc') self.assertEquals(type(cfg.devices[3]), - config.LibvirtConfigGuestDisk) + vconfig.LibvirtConfigGuestDisk) self.assertEquals(cfg.devices[3].target_dev, 'vdd') def test_get_guest_cpu_config_none(self): @@ -772,7 +773,7 @@ class LibvirtConnTestCase(test.TestCase): _fake_network_info(self.stubs, 1), None, None) self.assertEquals(type(conf.cpu), - config.LibvirtConfigGuestCPU) + vconfig.LibvirtConfigGuestCPU) self.assertEquals(conf.cpu.mode, "host-model") self.assertEquals(conf.cpu.model, None) @@ -815,7 +816,7 @@ class LibvirtConnTestCase(test.TestCase): _fake_network_info(self.stubs, 1), None, None) self.assertEquals(type(conf.cpu), - config.LibvirtConfigGuestCPU) + vconfig.LibvirtConfigGuestCPU) self.assertEquals(conf.cpu.mode, "host-passthrough") self.assertEquals(conf.cpu.model, None) @@ -834,7 +835,7 @@ class LibvirtConnTestCase(test.TestCase): _fake_network_info(self.stubs, 1), None, None) self.assertEquals(type(conf.cpu), - config.LibvirtConfigGuestCPU) + vconfig.LibvirtConfigGuestCPU) self.assertEquals(conf.cpu.mode, "host-model") self.assertEquals(conf.cpu.model, None) @@ -854,7 +855,7 @@ class LibvirtConnTestCase(test.TestCase): _fake_network_info(self.stubs, 1), None, None) self.assertEquals(type(conf.cpu), - config.LibvirtConfigGuestCPU) + vconfig.LibvirtConfigGuestCPU) self.assertEquals(conf.cpu.mode, "custom") self.assertEquals(conf.cpu.model, "Penryn") @@ -880,12 +881,12 @@ class LibvirtConnTestCase(test.TestCase): # Ensure we have a predictable host CPU def get_host_capabilities_stub(self): - cpu = config.LibvirtConfigGuestCPU() + cpu = vconfig.LibvirtConfigGuestCPU() cpu.model = "Opteron_G4" cpu.vendor = "AMD" - caps = config.LibvirtConfigCaps() - caps.host = config.LibvirtConfigCapsHost() + caps = vconfig.LibvirtConfigCaps() + caps.host = vconfig.LibvirtConfigCapsHost() caps.host.cpu = cpu return caps @@ -903,7 +904,7 @@ class LibvirtConnTestCase(test.TestCase): _fake_network_info(self.stubs, 1), None, None) self.assertEquals(type(conf.cpu), - config.LibvirtConfigGuestCPU) + vconfig.LibvirtConfigGuestCPU) self.assertEquals(conf.cpu.mode, None) self.assertEquals(conf.cpu.model, "Opteron_G4") self.assertEquals(conf.cpu.vendor, "AMD") @@ -924,7 +925,7 @@ class LibvirtConnTestCase(test.TestCase): _fake_network_info(self.stubs, 1), None, None) self.assertEquals(type(conf.cpu), - config.LibvirtConfigGuestCPU) + vconfig.LibvirtConfigGuestCPU) self.assertEquals(conf.cpu.mode, None) self.assertEquals(conf.cpu.model, "Penryn") @@ -1838,9 +1839,9 @@ class LibvirtConnTestCase(test.TestCase): # This test is supposed to make sure we don't # override a specifically set uri # - # Deliberately not just assigning this string to FLAGS.libvirt_uri and + # Deliberately not just assigning this string to CONF.libvirt_uri and # checking against that later on. This way we make sure the - # implementation doesn't fiddle around with the FLAGS. + # implementation doesn't fiddle around with the CONF. testuri = 'something completely different' self.flags(libvirt_uri=testuri) for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems(): @@ -2064,7 +2065,7 @@ class LibvirtConnTestCase(test.TestCase): def test_live_migration_raises_exception(self): """Confirms recover method is called when exceptions are raised.""" # Preparing data - self.compute = importutils.import_object(FLAGS.compute_manager) + self.compute = importutils.import_object(CONF.compute_manager) instance_dict = {'host': 'fake', 'power_state': power_state.RUNNING, 'vm_state': vm_states.ACTIVE} @@ -2075,8 +2076,8 @@ class LibvirtConnTestCase(test.TestCase): # Preparing mocks vdmock = self.mox.CreateMock(libvirt.virDomain) self.mox.StubOutWithMock(vdmock, "migrateToURI") - _bandwidth = FLAGS.live_migration_bandwidth - vdmock.migrateToURI(FLAGS.live_migration_uri % 'dest', + _bandwidth = CONF.live_migration_bandwidth + vdmock.migrateToURI(CONF.live_migration_uri % 'dest', mox.IgnoreArg(), None, _bandwidth).AndRaise(libvirt.libvirtError('ERR')) @@ -2287,14 +2288,14 @@ class LibvirtConnTestCase(test.TestCase): conn.spawn(self.context, instance, None, [], 'herp', network_info=network_info) - path = os.path.join(FLAGS.instances_path, instance.name) + path = os.path.join(CONF.instances_path, instance.name) if os.path.isdir(path): shutil.rmtree(path) - path = os.path.join(FLAGS.instances_path, FLAGS.base_dir_name) + path = os.path.join(CONF.instances_path, CONF.base_dir_name) if os.path.isdir(path): - shutil.rmtree(os.path.join(FLAGS.instances_path, - FLAGS.base_dir_name)) + shutil.rmtree(os.path.join(CONF.instances_path, + CONF.base_dir_name)) def test_get_console_output_file(self): @@ -2384,7 +2385,7 @@ class LibvirtConnTestCase(test.TestCase): def test_get_host_ip_addr(self): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) ip = conn.get_host_ip_addr() - self.assertEquals(ip, FLAGS.my_ip) + self.assertEquals(ip, CONF.my_ip) def test_broken_connection(self): for (error, domain) in ( @@ -2574,14 +2575,14 @@ class LibvirtConnTestCase(test.TestCase): self.stubs.Set(conn, 'get_instance_disk_info', get_info) result = conn.get_disk_available_least() - space = fake_libvirt_utils.get_fs_info(FLAGS.instances_path)['free'] + space = fake_libvirt_utils.get_fs_info(CONF.instances_path)['free'] self.assertEqual(result, space / 1024 ** 3) def test_cpu_info(self): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) def get_host_capabilities_stub(self): - cpu = config.LibvirtConfigCPU() + cpu = vconfig.LibvirtConfigCPU() cpu.model = "Opteron_G4" cpu.vendor = "AMD" cpu.arch = "x86_64" @@ -2590,20 +2591,20 @@ class LibvirtConnTestCase(test.TestCase): cpu.threads = 1 cpu.sockets = 4 - cpu.add_feature(config.LibvirtConfigCPUFeature("extapic")) - cpu.add_feature(config.LibvirtConfigCPUFeature("3dnow")) + cpu.add_feature(vconfig.LibvirtConfigCPUFeature("extapic")) + cpu.add_feature(vconfig.LibvirtConfigCPUFeature("3dnow")) - caps = config.LibvirtConfigCaps() - caps.host = config.LibvirtConfigCapsHost() + caps = vconfig.LibvirtConfigCaps() + caps.host = vconfig.LibvirtConfigCapsHost() caps.host.cpu = cpu - guest = config.LibvirtConfigGuest() + guest = vconfig.LibvirtConfigGuest() guest.ostype = vm_mode.HVM guest.arch = "x86_64" guest.domtype = ["kvm"] caps.guests.append(guest) - guest = config.LibvirtConfigGuest() + guest = vconfig.LibvirtConfigGuest() guest.ostype = vm_mode.HVM guest.arch = "i686" guest.domtype = ["kvm"] @@ -3016,15 +3017,15 @@ class LibvirtConnTestCase(test.TestCase): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) def get_host_capabilities_stub(self): - caps = config.LibvirtConfigCaps() + caps = vconfig.LibvirtConfigCaps() - guest = config.LibvirtConfigGuest() + guest = vconfig.LibvirtConfigGuest() guest.ostype = 'hvm' guest.arch = 'x86_64' guest.domtype = ['kvm', 'qemu'] caps.guests.append(guest) - guest = config.LibvirtConfigGuest() + guest = vconfig.LibvirtConfigGuest() guest.ostype = 'hvm' guest.arch = 'i686' guest.domtype = ['kvm'] @@ -4143,7 +4144,7 @@ class LibvirtDriverTestCase(test.TestCase): _fake_network_info(self.stubs, 1)) def test_cleanup_resize_same_host(self): - ins_ref = self._create_instance({'host': FLAGS.host}) + ins_ref = self._create_instance({'host': CONF.host}) def fake_os_path_exists(path): return True @@ -4159,7 +4160,7 @@ class LibvirtDriverTestCase(test.TestCase): _fake_network_info(self.stubs, 1)) def test_cleanup_resize_not_same_host(self): - host = 'not' + FLAGS.host + host = 'not' + CONF.host ins_ref = self._create_instance({'host': host}) def fake_os_path_exists(path): diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index ca52f14ed..bb4344512 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -16,13 +16,14 @@ 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 +from nova.virt.libvirt import config as vconfig from nova.virt.libvirt import vif -FLAGS = flags.FLAGS +CONF = config.CONF class LibvirtVifTestCase(test.TestCase): @@ -66,7 +67,7 @@ class LibvirtVifTestCase(test.TestCase): self.stubs.Set(utils, 'execute', fake_execute) def _get_instance_xml(self, driver): - conf = config.LibvirtConfigGuest() + conf = vconfig.LibvirtConfigGuest() conf.virt_type = "qemu" conf.name = "fake-name" conf.uuid = "fake-uuid" @@ -122,7 +123,7 @@ class LibvirtVifTestCase(test.TestCase): self.assertEqual(node.get("type"), "bridge") br_name = node.find("source").get("bridge") - self.assertEqual(br_name, FLAGS.libvirt_ovs_bridge) + self.assertEqual(br_name, CONF.libvirt_ovs_bridge) mac = node.find("mac").get("address") self.assertEqual(mac, self.mapping['mac']) vp = node.find("virtualport") diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index a8c78d4f5..4f2e70abf 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -28,6 +28,7 @@ import webob from nova.api.metadata import base from nova.api.metadata import handler from nova import block_device +from nova import config from nova import db from nova.db.sqlalchemy import api from nova import exception @@ -36,7 +37,7 @@ from nova.network import api as network_api from nova import test from nova.tests import fake_network -FLAGS = flags.FLAGS +CONF = config.CONF USER_DATA_STRING = ("This is an encoded string") ENCODE_USER_DATA_STRING = base64.b64encode(USER_DATA_STRING) @@ -142,7 +143,7 @@ class MetadataTestCase(test.TestCase): md = fake_InstanceMetadata(self.stubs, copy(self.instance)) data = md.get_ec2_metadata(version='2009-04-04') self.assertEqual(data['meta-data']['local-hostname'], - "%s.%s" % (self.instance['hostname'], FLAGS.dhcp_domain)) + "%s.%s" % (self.instance['hostname'], CONF.dhcp_domain)) def test_format_instance_mapping(self): """Make sure that _format_instance_mappings works""" diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index 5abe51486..d272a8bbd 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -34,7 +34,6 @@ from nova import test from nova.tests import fake_network LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS class NotificationsTestCase(test.TestCase): diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py index 50ce67c80..d077b605f 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -28,13 +28,13 @@ import tempfile 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 - -FLAGS = flags.FLAGS +CONF = config.CONF # Create a unique temporary directory. We don't delete after test to # allow checking the contents after running tests. Users and/or tools @@ -55,14 +55,14 @@ class S3APITestCase(test.TestCase): self.flags(buckets_path=os.path.join(OSS_TEMPDIR, 'buckets'), s3_host='127.0.0.1') - shutil.rmtree(FLAGS.buckets_path) - os.mkdir(FLAGS.buckets_path) + shutil.rmtree(CONF.buckets_path) + os.mkdir(CONF.buckets_path) - router = s3server.S3Application(FLAGS.buckets_path) + router = s3server.S3Application(CONF.buckets_path) self.server = wsgi.Server("S3 Objectstore", router, - host=FLAGS.s3_host, - port=FLAGS.s3_port) + host=CONF.s3_host, + port=CONF.s3_port) self.server.start() if not boto.config.has_section('Boto'): @@ -71,8 +71,8 @@ class S3APITestCase(test.TestCase): boto.config.set('Boto', 'num_retries', '0') conn = s3.S3Connection(aws_access_key_id='fake', aws_secret_access_key='fake', - host=FLAGS.s3_host, - port=FLAGS.s3_port, + host=CONF.s3_host, + port=CONF.s3_port, is_secure=False, calling_format=s3.OrdinaryCallingFormat()) self.conn = conn diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py index 96e6b08a9..3baa91e6f 100644 --- a/nova/tests/test_pipelib.py +++ b/nova/tests/test_pipelib.py @@ -14,14 +14,14 @@ # under the License. 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 - -FLAGS = flags.FLAGS +CONF = config.CONF class PipelibTest(test.TestCase): @@ -50,7 +50,7 @@ class PipelibTest(test.TestCase): self.cloudpipe.launch_vpn_instance(self.context) def test_setup_security_group(self): - group_name = "%s%s" % (self.project, FLAGS.vpn_key_suffix) + group_name = "%s%s" % (self.project, CONF.vpn_key_suffix) # First attemp, does not exist (thus its created) res1_group = self.cloudpipe.setup_security_group(self.context) @@ -61,7 +61,7 @@ class PipelibTest(test.TestCase): self.assertEqual(res1_group, res2_group) def test_setup_key_pair(self): - key_name = "%s%s" % (self.project, FLAGS.vpn_key_suffix) + key_name = "%s%s" % (self.project, CONF.vpn_key_suffix) with utils.tempdir() as tmpdir: self.flags(keys_path=tmpdir) diff --git a/nova/tests/test_policy.py b/nova/tests/test_policy.py index c0c487447..7bd6e9434 100644 --- a/nova/tests/test_policy.py +++ b/nova/tests/test_policy.py @@ -30,9 +30,6 @@ from nova import test from nova import utils -FLAGS = flags.FLAGS - - class PolicyFileTestCase(test.TestCase): def setUp(self): super(PolicyFileTestCase, self).setUp() diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py index 8f6f27bb0..6745903d2 100644 --- a/nova/tests/test_powervm.py +++ b/nova/tests/test_powervm.py @@ -30,8 +30,6 @@ from nova.virt.powervm import driver as powervm_driver from nova.virt.powervm import lpar from nova.virt.powervm import operator - -FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 26346276f..b214044a6 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -20,6 +20,7 @@ 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 @@ -33,8 +34,7 @@ from nova.scheduler import driver as scheduler_driver from nova import test import nova.tests.image.fake - -FLAGS = flags.FLAGS +CONF = config.CONF class QuotaIntegrationTestCase(test.TestCase): @@ -59,7 +59,7 @@ class QuotaIntegrationTestCase(test.TestCase): def rpc_call_wrapper(context, topic, msg, timeout=None): """Stub out the scheduler creating the instance entry""" - if (topic == FLAGS.scheduler_topic and + if (topic == CONF.scheduler_topic and msg['method'] == 'run_instance'): scheduler = scheduler_driver.Scheduler instance = scheduler().create_instance_db_entry( @@ -90,7 +90,7 @@ class QuotaIntegrationTestCase(test.TestCase): def test_too_many_instances(self): instance_uuids = [] - for i in range(FLAGS.quota_instances): + for i in range(CONF.quota_instances): instance = self._create_instance() instance_uuids.append(instance['uuid']) inst_type = instance_types.get_instance_type_by_name('m1.small') @@ -142,7 +142,7 @@ class QuotaIntegrationTestCase(test.TestCase): def test_too_many_metadata_items(self): metadata = {} - for i in range(FLAGS.quota_metadata_items + 1): + for i in range(CONF.quota_metadata_items + 1): metadata['key%s' % i] = 'value%s' % i inst_type = instance_types.get_instance_type_by_name('m1.small') image_uuid = 'cedef40a-ed67-4d10-800e-17455edce175' @@ -172,38 +172,38 @@ class QuotaIntegrationTestCase(test.TestCase): def test_max_injected_files(self): files = [] - for i in xrange(FLAGS.quota_injected_files): + for i in xrange(CONF.quota_injected_files): files.append(('/my/path%d' % i, 'config = test\n')) self._create_with_injected_files(files) # no QuotaError def test_too_many_injected_files(self): files = [] - for i in xrange(FLAGS.quota_injected_files + 1): + for i in xrange(CONF.quota_injected_files + 1): files.append(('/my/path%d' % i, 'my\ncontent%d\n' % i)) self.assertRaises(exception.QuotaError, self._create_with_injected_files, files) def test_max_injected_file_content_bytes(self): - max = FLAGS.quota_injected_file_content_bytes + max = CONF.quota_injected_file_content_bytes content = ''.join(['a' for i in xrange(max)]) files = [('/test/path', content)] self._create_with_injected_files(files) # no QuotaError def test_too_many_injected_file_content_bytes(self): - max = FLAGS.quota_injected_file_content_bytes + max = CONF.quota_injected_file_content_bytes content = ''.join(['a' for i in xrange(max + 1)]) files = [('/test/path', content)] self.assertRaises(exception.QuotaError, self._create_with_injected_files, files) def test_max_injected_file_path_bytes(self): - max = FLAGS.quota_injected_file_path_bytes + max = CONF.quota_injected_file_path_bytes path = ''.join(['a' for i in xrange(max)]) files = [(path, 'config = quotatest')] self._create_with_injected_files(files) # no QuotaError def test_too_many_injected_file_path_bytes(self): - max = FLAGS.quota_injected_file_path_bytes + max = CONF.quota_injected_file_path_bytes path = ''.join(['a' for i in xrange(max + 1)]) files = [(path, 'config = quotatest')] self.assertRaises(exception.QuotaError, diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index 3f31e8e01..ec7d0333b 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -23,7 +23,7 @@ Unit Tests for remote procedure calls using queue import mox import sys - +from nova import config from nova import context from nova import db from nova import exception @@ -47,7 +47,8 @@ test_service_opts = [ help="Port number to bind test service to"), ] -flags.FLAGS.register_opts(test_service_opts) +CONF = config.CONF +CONF.register_opts(test_service_opts) class FakeManager(manager.Manager): diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index 9ec0e85da..0fc14c1c7 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -27,6 +27,7 @@ from eventlet import greenpool import mox import nova +from nova import config from nova import exception from nova import flags from nova.openstack.common import timeutils @@ -34,8 +35,7 @@ from nova.openstack.common import uuidutils from nova import test from nova import utils - -FLAGS = flags.FLAGS +CONF = config.CONF class ByteConversionTest(test.TestCase): @@ -382,7 +382,7 @@ class GenericUtilsTestCase(test.TestCase): def test_generate_glance_url(self): generated_url = utils.generate_glance_url() - actual_url = "http://%s:%d" % (FLAGS.glance_host, FLAGS.glance_port) + actual_url = "http://%s:%d" % (CONF.glance_host, CONF.glance_port) self.assertEqual(generated_url, actual_url) def test_read_cached_file(self): diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index 16775054f..e40297204 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -27,8 +27,6 @@ from nova.virt import driver from nova.openstack.common import jsonutils -FLAGS = flags.FLAGS - class TestVirtDriver(test.TestCase): def test_block_device(self): diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py index 757ec2bf2..81689a1e5 100644 --- a/nova/tests/test_vmwareapi.py +++ b/nova/tests/test_vmwareapi.py @@ -32,9 +32,6 @@ from nova.virt.vmwareapi import driver from nova.virt.vmwareapi import fake as vmwareapi_fake -FLAGS = flags.FLAGS - - class VMWareAPIVMTestCase(test.TestCase): """Unit tests for Vmware API connection calls.""" diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index a145d1675..7e08c5099 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -29,6 +29,7 @@ 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 @@ -55,7 +56,7 @@ from nova.virt.xenapi import volume_utils LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS +CONF = config.CONF IMAGE_MACHINE = '1' IMAGE_KERNEL = '2' @@ -173,7 +174,7 @@ class XenAPIVolumeTestCase(stubs.XenAPITestBase): vol['user_id'] = 'fake' vol['project_id'] = 'fake' vol['host'] = 'localhost' - vol['availability_zone'] = FLAGS.node_availability_zone + vol['availability_zone'] = CONF.node_availability_zone vol['status'] = "creating" vol['attach_status'] = "detached" return db.volume_create(self.context, vol) @@ -265,7 +266,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): """Unit tests for VM operations.""" def setUp(self): super(XenAPIVMTestCase, self).setUp() - self.network = importutils.import_object(FLAGS.network_manager) + self.network = importutils.import_object(CONF.network_manager) self.flags(disable_process_locking=True, instance_name_template='%d', firewall_driver='nova.virt.xenapi.firewall.' @@ -275,7 +276,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): xenapi_fake.create_local_srs() xenapi_fake.create_local_pifs() db_fakes.stub_out_db_instance_api(self.stubs) - xenapi_fake.create_network('fake', FLAGS.flat_network_bridge) + xenapi_fake.create_network('fake', CONF.flat_network_bridge) stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) stubs.stubout_get_this_vm_uuid(self.stubs) stubs.stubout_is_vdi_pv(self.stubs) @@ -511,16 +512,16 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): self.assertEquals(self.vm['HVM_boot_policy'], '') def _list_vdis(self): - url = FLAGS.xenapi_connection_url - username = FLAGS.xenapi_connection_username - password = FLAGS.xenapi_connection_password + url = CONF.xenapi_connection_url + username = CONF.xenapi_connection_username + password = CONF.xenapi_connection_password session = xenapi_conn.XenAPISession(url, username, password) return session.call_xenapi('VDI.get_all') def _list_vms(self): - url = FLAGS.xenapi_connection_url - username = FLAGS.xenapi_connection_username - password = FLAGS.xenapi_connection_password + url = CONF.xenapi_connection_url + username = CONF.xenapi_connection_username + password = CONF.xenapi_connection_password session = xenapi_conn.XenAPISession(url, username, password) return session.call_xenapi('VM.get_all') @@ -772,7 +773,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): self.network.allocate_for_instance(ctxt, instance_id=2, instance_uuid='00000000-0000-0000-0000-000000000002', - host=FLAGS.host, + host=CONF.host, vpn=None, rxtx_factor=3, project_id=self.project_id) @@ -1003,7 +1004,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase): 'Dom0IptablesFirewallDriver') stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) db_fakes.stub_out_db_instance_api(self.stubs) - xenapi_fake.create_network('fake', FLAGS.flat_network_bridge) + xenapi_fake.create_network('fake', CONF.flat_network_bridge) self.user_id = 'fake' self.project_id = 'fake' self.context = context.RequestContext(self.user_id, self.project_id) @@ -1702,7 +1703,7 @@ class XenAPIDom0IptablesFirewallTestCase(stubs.XenAPITestBase): stubs.stubout_session(self.stubs, stubs.FakeSessionForFirewallTests, test_case=self) self.context = context.RequestContext(self.user_id, self.project_id) - self.network = importutils.import_object(FLAGS.network_manager) + self.network = importutils.import_object(CONF.network_manager) self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False) self.fw = self.conn._vmops.firewall_driver @@ -2030,7 +2031,7 @@ class XenAPIAggregateTestCase(stubs.XenAPITestBase): stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests) self.context = context.get_admin_context() self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False) - self.compute = importutils.import_object(FLAGS.compute_manager) + self.compute = importutils.import_object(CONF.compute_manager) self.api = compute_api.AggregateAPI() values = {'name': 'test_aggr', 'availability_zone': 'test_zone', @@ -2548,7 +2549,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBase): self.metadetails = {"host": "test_host_uuid"} def fake_aggregate_get_by_host(context, host, key=None): - self.assertEqual(FLAGS.host, host) + self.assertEqual(CONF.host, host) return [fake_aggregate()] self.stubs.Set(db, "aggregate_get_by_host", @@ -2565,7 +2566,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBase): self.metadetails = {"dest_other": "test_host_uuid"} def fake_aggregate_get_by_host(context, host, key=None): - self.assertEqual(FLAGS.host, host) + self.assertEqual(CONF.host, host) return [fake_aggregate()] self.stubs.Set(db, "aggregate_get_by_host", diff --git a/nova/tests/utils.py b/nova/tests/utils.py index 328cd8d67..98342ae3d 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -16,12 +16,13 @@ import platform +import nova.config import nova.context import nova.db import nova.flags from nova.image import glance -FLAGS = nova.flags.FLAGS +CONF = nova.config.CONF def get_test_admin_context(): @@ -74,7 +75,7 @@ def get_test_instance(context=None): def get_test_network_info(count=1): - ipv6 = FLAGS.use_ipv6 + ipv6 = CONF.use_ipv6 fake = 'fake' fake_ip = '0.0.0.0/0' fake_ip_2 = '0.0.0.1/0' |