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

diff --git a/quantum/plugins/nec/common/config.py b/quantum/plugins/nec/common/config.py
index 36a1141711e61ce956419cf5c403deb110767e8f..313851df29d04595f398e9157b8375ff5d136cf6 100644 (file)
--- 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 ac8d75899019b7b822412aca34b0eece3c263475..06508b17c13130b1d59860319d4a000fc7c23e0f 100644 (file)
--- 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)