From f0e38f4c754f049a05fa9ffa5204524701ed21f6 Mon Sep 17 00:00:00 2001 From: Akihiro MOTOKI Date: Fri, 24 May 2013 06:23:45 +0900 Subject: [PATCH] Fix typo in option group shortcut 'aGENT' in NEC plugin Also adds a test to check if option group shortcuts work. Fix bug #1183576 Change-Id: Ib2843f2b2b4e35964fb4bb5280fda8f5c9e2ba0c --- quantum/plugins/nec/common/config.py | 2 +- quantum/tests/unit/nec/test_config.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/quantum/plugins/nec/common/config.py b/quantum/plugins/nec/common/config.py index 00a8d7abdc..38955766fe 100644 --- a/quantum/plugins/nec/common/config.py +++ b/quantum/plugins/nec/common/config.py @@ -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 diff --git a/quantum/tests/unit/nec/test_config.py b/quantum/tests/unit/nec/test_config.py index 897bcc0754..bd5039405a 100644 --- a/quantum/tests/unit/nec/test_config.py +++ b/quantum/tests/unit/nec/test_config.py @@ -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)