x/python-ganttclient
Code Issues Proposed changes

Merge "Remove flags.DECLARE"

Browse Source
This commit is contained in:
Jenkins
2012-11-06 19:12:46 +00:00
committed by Gerrit Code Review
parent ab084238d1 d61df6e2f0
commit e445363129
4 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/nova-manage
View File

@@ -90,14 +90,16 @@ from nova import utils
from nova import version
FLAGS = flags.FLAGS
flags.DECLARE('flat_network_bridge', 'nova.network.manager')
flags.DECLARE('num_networks', 'nova.network.manager')
flags.DECLARE('multi_host', 'nova.network.manager')
flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('vlan_start', 'nova.network.manager')
flags.DECLARE('vpn_start', 'nova.network.manager')
flags.DECLARE('default_floating_pool', 'nova.network.manager')
flags.DECLARE('public_interface', 'nova.network.linux_net')
CONF = config.CONF
CONF.import_opt('flat_network_bridge', 'nova.network.manager')
CONF.import_opt('num_networks', 'nova.network.manager')
CONF.import_opt('multi_host', 'nova.network.manager')
CONF.import_opt('network_size', 'nova.network.manager')
CONF.import_opt('vlan_start', 'nova.network.manager')
CONF.import_opt('vpn_start', 'nova.network.manager')
CONF.import_opt('default_floating_pool', 'nova.network.manager')
CONF.import_opt('public_interface', 'nova.network.linux_net')
QUOTAS = quota.QUOTAS

11
nova/flags.py
View File

@@ -36,17 +36,6 @@ from nova.openstack.common import cfg
FLAGS = cfg.CONF
class UnrecognizedFlag(Exception):
pass
def DECLARE(name, module_string, flag_values=FLAGS):
if module_string not in sys.modules:
__import__(module_string, globals(), locals())
if name not in flag_values:
raise UnrecognizedFlag('%s not defined by %s' % (name, module_string))
def _get_my_ip():
"""
Returns the actual ip of the local machine.

15
nova/tests/fake_flags.py
View File

@@ -16,16 +16,17 @@
# License for the specific language governing permissions and limitations
# under the License.
from nova import config
from nova import flags
FLAGS = flags.FLAGS
CONF = config.CONF
flags.DECLARE('scheduler_driver', 'nova.scheduler.manager')
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('policy_file', 'nova.policy')
CONF.import_opt('scheduler_driver', 'nova.scheduler.manager')
CONF.import_opt('fake_network', 'nova.network.manager')
CONF.import_opt('iscsi_num_targets', 'nova.volume.driver')
CONF.import_opt('network_size', 'nova.network.manager')
CONF.import_opt('num_networks', 'nova.network.manager')
CONF.import_opt('policy_file', 'nova.policy')
def set_defaults(conf):

17
nova/tests/test_flags.py
View File

@@ -22,6 +22,7 @@ from nova import flags
from nova.openstack.common import cfg
from nova import test
CONF = config.CONF
FLAGS = flags.FLAGS
FLAGS.register_opt(cfg.StrOpt('flags_unittest',
default='foo',
@@ -30,16 +31,16 @@ FLAGS.register_opt(cfg.StrOpt('flags_unittest',
class FlagsTestCase(test.TestCase):
def test_declare(self):
self.assert_('answer' not in FLAGS)
flags.DECLARE('answer', 'nova.tests.declare_flags')
self.assert_('answer' in FLAGS)
self.assertEqual(FLAGS.answer, 42)
self.assert_('answer' not in CONF)
CONF.import_opt('answer', 'nova.tests.declare_flags')
self.assert_('answer' in CONF)
self.assertEqual(CONF.answer, 42)
# Make sure we don't overwrite anything
FLAGS.set_override('answer', 256)
self.assertEqual(FLAGS.answer, 256)
flags.DECLARE('answer', 'nova.tests.declare_flags')
self.assertEqual(FLAGS.answer, 256)
CONF.set_override('answer', 256)
self.assertEqual(CONF.answer, 256)
CONF.import_opt('answer', 'nova.tests.declare_flags')
self.assertEqual(CONF.answer, 256)
def test_getopt_non_interspersed_args(self):
self.assert_('runtime_answer' not in FLAGS)