From 9813a7f0759ff2c0bce79c2933fa8fa917d2c220 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 3 Feb 2012 00:50:58 +0000
Subject: [PATCH] Remove the last of the gflags shim layer
Make FLAGS a ConfigOpts instance and fix up all the places where we
expected FlagValues behaviour.
Change-Id: I8f96f42e0d8d30ba6b362d29861e717cf0fa9e89
---
nova/tests/baremetal/test_proxy_bare_metal.py | 6 +++---
nova/virt/baremetal/nodes.py | 4 ++--
nova/virt/baremetal/proxy.py | 4 ++--
nova/virt/baremetal/tilera.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py
index ad41a85c30..580f898635 100644
--- a/nova/tests/baremetal/test_proxy_bare_metal.py
+++ b/nova/tests/baremetal/test_proxy_bare_metal.py
@@ -47,8 +47,8 @@ fake_domains = [{'status': 1, 'name': 'instance-00000001',
class DomainReadWriteTestCase(test.TestCase):
def setUp(self):
- self.flags(baremetal_driver='fake')
super(DomainReadWriteTestCase, self).setUp()
+ self.flags(baremetal_driver='fake')
def test_read_domain_with_empty_list(self):
"""Read a file that contains no domains"""
@@ -143,8 +143,8 @@ class DomainReadWriteTestCase(test.TestCase):
class BareMetalDomTestCase(test.TestCase):
def setUp(self):
- self.flags(baremetal_driver='fake')
super(BareMetalDomTestCase, self).setUp()
+ self.flags(baremetal_driver='fake')
# Stub out utils.execute
self.stubs = stubout.StubOutForTesting()
fake_utils.stub_out_utils_execute(self.stubs)
@@ -263,8 +263,8 @@ class ProxyBareMetalTestCase(test.TestCase):
'instance_type_id': '5'} # m1.small
def setUp(self):
- self.flags(baremetal_driver='fake')
super(ProxyBareMetalTestCase, self).setUp()
+ self.flags(baremetal_driver='fake')
self.context = context.get_admin_context()
fake_utils.stub_out_utils_execute(self.stubs)
diff --git a/nova/virt/baremetal/nodes.py b/nova/virt/baremetal/nodes.py
index 5d1519f069..f78eaf74d6 100644
--- a/nova/virt/baremetal/nodes.py
+++ b/nova/virt/baremetal/nodes.py
@@ -23,13 +23,13 @@ from nova import exception
FLAGS = flags.FLAGS
-global_opts = [
+baremetal_opts = [
cfg.StrOpt('baremetal_driver',
default='tilera',
help='Bare-metal driver runs on')
]
-FLAGS.add_options(global_opts)
+FLAGS.register_opts(baremetal_opts)
def get_baremetal_nodes():
diff --git a/nova/virt/baremetal/proxy.py b/nova/virt/baremetal/proxy.py
index 78b5de7df0..45142ea443 100644
--- a/nova/virt/baremetal/proxy.py
+++ b/nova/virt/baremetal/proxy.py
@@ -58,7 +58,7 @@ LOG = logging.getLogger('nova.virt.baremetal.proxy')
FLAGS = flags.FLAGS
-global_opts = [
+baremetal_opts = [
cfg.StrOpt('baremetal_injected_network_template',
default=utils.abspath('virt/interfaces.template'),
help='Template file for injected network'),
@@ -73,7 +73,7 @@ global_opts = [
help='Whether to allow in project network traffic')
]
-FLAGS.add_options(global_opts)
+FLAGS.register_opts(baremetal_opts)
def get_connection(read_only):
diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py
index 7e31a1553b..ee711988b3 100644
--- a/nova/virt/baremetal/tilera.py
+++ b/nova/virt/baremetal/tilera.py
@@ -35,13 +35,13 @@ from nova import utils
FLAGS = flags.FLAGS
-global_opts = [
+tilera_opts = [
cfg.StrOpt('tile_monitor',
default='/usr/local/TileraMDE/bin/tile-monitor',
help='Tilera command line program for Bare-metal driver')
]
-FLAGS.add_options(global_opts)
+FLAGS.register_opts(tilera_opts)
LOG = logging.getLogger('nova.virt.tilera')