diff --git a/quantum/plugins/nec/common/config.py b/quantum/plugins/nec/common/config.py index 36a1141711..313851df29 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 ac8d758990..06508b17c1 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)