From 6cd4789008af6f148814b948980262e4d8fab0ed Mon Sep 17 00:00:00 2001 From: Akihiro MOTOKI Date: Mon, 14 Jan 2013 02:57:33 +0900 Subject: [PATCH] Remove accessing cfg.CONF.DATABASE in nec-agent Fixes bug 1099162 The database configuration was moved to the common DB module. There no longer needs to access database configuration in the plugin specific code. Change-Id: I4b80ea1e84ffa06d0fffa7f8ccdee08a5b77e239 --- quantum/plugins/nec/common/config.py | 1 - quantum/tests/unit/nec/test_config.py | 1 - 2 files changed, 2 deletions(-) diff --git a/quantum/plugins/nec/common/config.py b/quantum/plugins/nec/common/config.py index 36a114171..313851df2 100644 --- a/quantum/plugins/nec/common/config.py +++ b/quantum/plugins/nec/common/config.py @@ -46,7 +46,6 @@ cfg.CONF.register_opts(ofc_opts, "OFC") # shortcuts CONF = cfg.CONF -DATABASE = cfg.CONF.DATABASE OVS = cfg.CONF.OVS 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 ac8d75899..06508b17c 100644 --- a/quantum/tests/unit/nec/test_config.py +++ b/quantum/tests/unit/nec/test_config.py @@ -23,7 +23,6 @@ from quantum.plugins.nec.common import config class ConfigurationTest(unittest.TestCase): def test_defaults(self): - self.assertEqual('sqlite://', config.DATABASE.sql_connection) self.assertEqual('sqlite://', config.CONF.DATABASE.sql_connection) self.assertEqual(-1, config.CONF.DATABASE.sql_max_retries) self.assertEqual(2, config.CONF.DATABASE.reconnect_interval) -- 2.45.2