openstack
/
neutron
Code Issues Proposed changes

Merge "Fix typo in option group shortcut 'aGENT' in NEC plugin"

This commit is contained in:
Jenkins 2013-05-24 00:12:07 +00:00 committed by Gerrit Code Review
parent b03240b9bf f0e38f4c75
commit cf1569cbfa
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/plugins/nec/common/config.py
View File

@ -61,5 +61,5 @@ cfg.CONF.register_opts(scheduler.AGENTS_SCHEDULER_OPTS)
# shortcuts
CONF = cfg.CONF
OVS = cfg.CONF.ovs
aGENT = cfg.CONF.AGENT
AGENT = cfg.CONF.AGENT
OFC = cfg.CONF.OFC

13
quantum/tests/unit/nec/test_config.py
View File

@ -23,12 +23,21 @@ class ConfigurationTest(base.BaseTestCase):
def test_defaults(self):
self.assertEqual('br-int', config.CONF.ovs.integration_bridge)
self.assertEqual(2, config.CONF.AGENT.polling_interval)
self.assertEqual('sudo', config.CONF.AGENT.root_helper)
self.assertEqual('127.0.0.1', config.CONF.OFC.host)
self.assertEqual('8888', config.CONF.OFC.port)
self.assertEqual('trema', config.CONF.OFC.driver)
self.assertTrue(config.CONF.OFC.enable_packet_filter)
self.assertFalse(config.CONF.OFC.use_ssl)
self.assertEqual(None, config.CONF.OFC.key_file)
self.assertEqual(None, config.CONF.OFC.cert_file)
self.assertIsNone(config.CONF.OFC.key_file)
self.assertIsNone(config.CONF.OFC.cert_file)
def test_shortcuts(self):
self.assertEqual(config.CONF.ovs.integration_bridge,
config.OVS.integration_bridge)
self.assertEqual(config.CONF.AGENT.polling_interval,
config.AGENT.polling_interval)
self.assertEqual(config.CONF.OFC.host, config.OFC.host)