Use cfg's new global CONF object

Implements blueprint cfg-global-object

Replace nova.flags.FLAGS with openstack.common.cfg.CONF.

In future, we can do a s/FLAGS/CONF/ across the codebase.

Change-Id: Ib293873089a5399febd7a3b0410f66e9bef115f1

1 files changed, 24 insertions, 42 deletions

diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index af5198dc3..f1baffa0a 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -34,54 +34,50 @@ class FlagsTestCase(test.TestCase):
 
     def setUp(self):
         super(FlagsTestCase, self).setUp()
-        self.FLAGS = flags.NovaConfigOpts()
-        self.global_FLAGS = flags.FLAGS
-        self.flags(config_file=[])
 
     def test_declare(self):
-        self.assert_('answer' not in self.global_FLAGS)
+        self.assert_('answer' not in FLAGS)
         flags.DECLARE('answer', 'nova.tests.declare_flags')
-        self.assert_('answer' in self.global_FLAGS)
-        self.assertEqual(self.global_FLAGS.answer, 42)
+        self.assert_('answer' in FLAGS)
+        self.assertEqual(FLAGS.answer, 42)
 
         # Make sure we don't overwrite anything
-        self.global_FLAGS.set_override('answer', 256)
-        self.assertEqual(self.global_FLAGS.answer, 256)
+        FLAGS.set_override('answer', 256)
+        self.assertEqual(FLAGS.answer, 256)
         flags.DECLARE('answer', 'nova.tests.declare_flags')
-        self.assertEqual(self.global_FLAGS.answer, 256)
+        self.assertEqual(FLAGS.answer, 256)
 
     def test_getopt_non_interspersed_args(self):
-        self.assert_('runtime_answer' not in self.global_FLAGS)
+        self.assert_('runtime_answer' not in FLAGS)
 
         argv = ['flags_test', 'extra_arg', '--runtime_answer=60']
-        args = self.global_FLAGS(argv)
+        args = flags.parse_args(argv, default_config_files=[])
         self.assertEqual(len(args), 3)
         self.assertEqual(argv, args)
 
     def test_runtime_and_unknown_flags(self):
-        self.assert_('runtime_answer' not in self.global_FLAGS)
+        self.assert_('runtime_answer' not in FLAGS)
         import nova.tests.runtime_flags
-        self.assert_('runtime_answer' in self.global_FLAGS)
-        self.assertEqual(self.global_FLAGS.runtime_answer, 54)
+        self.assert_('runtime_answer' in FLAGS)
+        self.assertEqual(FLAGS.runtime_answer, 54)
 
     def test_long_vs_short_flags(self):
-        self.global_FLAGS.clear()
-        self.global_FLAGS.register_cli_opt(cfg.StrOpt('duplicate_answer_long',
-                                                      default='val',
-                                                      help='desc'))
+        FLAGS.clear()
+        FLAGS.register_cli_opt(cfg.StrOpt('duplicate_answer_long',
+                                          default='val',
+                                          help='desc'))
         argv = ['flags_test', '--duplicate_answer=60', 'extra_arg']
-        args = self.global_FLAGS(argv)
+        args = flags.parse_args(argv, default_config_files=[])
 
-        self.assert_('duplicate_answer' not in self.global_FLAGS)
-        self.assert_(self.global_FLAGS.duplicate_answer_long, 60)
+        self.assert_('duplicate_answer' not in FLAGS)
+        self.assert_(FLAGS.duplicate_answer_long, 60)
 
-        self.global_FLAGS.clear()
-        self.global_FLAGS.register_cli_opt(cfg.IntOpt('duplicate_answer',
-                                                      default=60,
-                                                      help='desc'))
-        args = self.global_FLAGS(argv)
-        self.assertEqual(self.global_FLAGS.duplicate_answer, 60)
-        self.assertEqual(self.global_FLAGS.duplicate_answer_long, 'val')
+        FLAGS.clear()
+        FLAGS.register_cli_opt(cfg.IntOpt('duplicate_answer',
+                                          default=60, help='desc'))
+        args = flags.parse_args(argv, default_config_files=[])
+        self.assertEqual(FLAGS.duplicate_answer, 60)
+        self.assertEqual(FLAGS.duplicate_answer_long, 'val')
 
     def test_flag_leak_left(self):
         self.assertEqual(FLAGS.flags_unittest, 'foo')
@@ -99,17 +95,3 @@ class FlagsTestCase(test.TestCase):
         self.assertEqual(FLAGS.flags_unittest, 'bar')
         FLAGS.reset()
         self.assertEqual(FLAGS.flags_unittest, 'foo')
-
-    def test_defaults(self):
-        self.FLAGS.register_opt(cfg.StrOpt('foo', default='bar', help='desc'))
-        self.assertEqual(self.FLAGS.foo, 'bar')
-
-        self.FLAGS.set_default('foo', 'blaa')
-        self.assertEqual(self.FLAGS.foo, 'blaa')
-
-    def test_templated_values(self):
-        self.FLAGS.register_opt(cfg.StrOpt('foo', default='foo', help='desc'))
-        self.FLAGS.register_opt(cfg.StrOpt('bar', default='bar', help='desc'))
-        self.FLAGS.register_opt(cfg.StrOpt('blaa',
-                                           default='$foo$bar', help='desc'))
-        self.assertEqual(self.FLAGS.blaa, 'foobar')