From aeaaa3e8be14e296065babc132fc28f81ed018ae Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Mon, 14 May 2012 06:49:17 -0400
Subject: [PATCH] Use cfg's new behavior of reset() clearing overrides

Change-Id: Ia363ab3c3c16d4988c2e7f3a73302134698a9b79
---
 nova/tests/fake_flags.py | 43 +++++++++++++++++++++-------------------
 nova/tests/test_flags.py |  2 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 9f0c9983..f25a9be4 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -20,27 +20,30 @@ from nova import flags
 
 FLAGS = flags.FLAGS
 
-flags.DECLARE('volume_driver', 'nova.volume.manager')
-FLAGS.set_default('volume_driver', 'nova.volume.driver.FakeISCSIDriver')
-FLAGS.set_default('connection_type', 'fake')
-FLAGS.set_default('fake_rabbit', True)
-FLAGS.set_default('rpc_backend', 'nova.rpc.impl_fake')
 flags.DECLARE('auth_driver', 'nova.auth.manager')
-FLAGS.set_default('auth_driver', 'nova.auth.dbdriver.DbDriver')
+flags.DECLARE('compute_scheduler_driver', 'nova.scheduler.multi')
+flags.DECLARE('fake_network', 'nova.network.manager')
+flags.DECLARE('iscsi_num_targets', 'nova.volume.driver')
 flags.DECLARE('network_size', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
-flags.DECLARE('fake_network', 'nova.network.manager')
-FLAGS.set_default('network_size', 8)
-FLAGS.set_default('num_networks', 2)
-FLAGS.set_default('fake_network', True)
-FLAGS.set_default('image_service', 'nova.image.fake.FakeImageService')
-flags.DECLARE('iscsi_num_targets', 'nova.volume.driver')
-FLAGS.set_default('iscsi_num_targets', 8)
-FLAGS.set_default('verbose', True)
-FLAGS.set_default('sql_connection', "sqlite://")
-FLAGS.set_default('use_ipv6', True)
-FLAGS.set_default('flat_network_bridge', 'br100')
-FLAGS.set_default('sqlite_synchronous', False)
 flags.DECLARE('policy_file', 'nova.policy')
-flags.DECLARE('compute_scheduler_driver', 'nova.scheduler.multi')
-FLAGS.set_default('api_paste_config', '$state_path/etc/nova/api-paste.ini')
+flags.DECLARE('volume_driver', 'nova.volume.manager')
+
+
+def set_defaults(conf):
+    conf.set_default('api_paste_config', '$state_path/etc/nova/api-paste.ini')
+    conf.set_default('auth_driver', 'nova.auth.dbdriver.DbDriver')
+    conf.set_default('connection_type', 'fake')
+    conf.set_default('fake_network', True)
+    conf.set_default('fake_rabbit', True)
+    conf.set_default('flat_network_bridge', 'br100')
+    conf.set_default('image_service', 'nova.image.fake.FakeImageService')
+    conf.set_default('iscsi_num_targets', 8)
+    conf.set_default('network_size', 8)
+    conf.set_default('num_networks', 2)
+    conf.set_default('rpc_backend', 'nova.rpc.impl_fake')
+    conf.set_default('sql_connection', "sqlite://")
+    conf.set_default('sqlite_synchronous', False)
+    conf.set_default('use_ipv6', True)
+    conf.set_default('verbose', True)
+    conf.set_default('volume_driver', 'nova.volume.driver.FakeISCSIDriver')
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index 925de1f5..af5198dc 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -97,7 +97,7 @@ class FlagsTestCase(test.TestCase):
         self.assertEqual(FLAGS.flags_unittest, 'foo')
         self.flags(flags_unittest='bar')
         self.assertEqual(FLAGS.flags_unittest, 'bar')
-        self.reset_flags()
+        FLAGS.reset()
         self.assertEqual(FLAGS.flags_unittest, 'foo')
 
     def test_defaults(self):