Restoring quantum_plugin_base to previous state.

Will discuss in the future whether allow API layer to pass options to plugins upon initialization.

diff --git a/quantum/manager.py b/quantum/manager.py
index 14b7f979cafbac8d23711b0e9c7107021489d2a9..2a2383b3e2a6718703382529de455d92a8c3a743 100644 (file)
--- a/quantum/manager.py
+++ b/quantum/manager.py
@@ -65,7 +65,7 @@ class QuantumManager(object):
         else:
             LOG.debug("Successfully imported Quantum plug-in." \
                       "All compatibility tests passed")
-        self.plugin = plugin_klass(options)
+        self.plugin = plugin_klass()
 
     def get_plugin(self):
         return self.plugin

diff --git a/quantum/plugins.ini b/quantum/plugins.ini
index 307d2b48d2c7b167a10112cf1990eb0441ff579f..448cab59ea7237a28734d4017ff21faede1a84cf 100644 (file)
--- a/quantum/plugins.ini
+++ b/quantum/plugins.ini
@@ -1,3 +1,4 @@
 [PLUGIN]
 # Quantum plugin provider module
-provider = quantum.plugins.SamplePlugin.FakePlugin
+#provider = quantum.plugins.SamplePlugin.FakePlugin
+provider = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin

diff --git a/quantum/plugins/SamplePlugin.py b/quantum/plugins/SamplePlugin.py
index 412d5f18b1c0cdd7d885f98dbcdf2746f9e56cbc..8f46e4373122ca92f4b91c228c1dbb708c7fac5a 100644 (file)
--- a/quantum/plugins/SamplePlugin.py
+++ b/quantum/plugins/SamplePlugin.py
@@ -233,13 +233,8 @@ class FakePlugin(object):
     client/cli/api development
     """
 
-    def __init__(self, options):
-        # use supplied options for configuring db
-        if not options:
-            options = {"sql_connection": "sqlite:///fake_plugin.sqllite"}
-        elif not 'sql_connection' in options:
-            options['sql_connection'] = "sqlite:///fake_plugin.sqllite"
-        db.configure_db(options)
+    def __init__(self):
+        db.configure_db({'sql_connection':'sqlite:///:memory:'})
         FakePlugin._net_counter = 0
 
     def _get_network(self, tenant_id, network_id):

diff --git a/quantum/quantum_plugin_base.py b/quantum/quantum_plugin_base.py
index e82c55253185e6ab01865cd5457b7b9ff3f6f12a..3228f868c772c7d323a6b60f11d49cb4556c4d2f 100644 (file)
--- a/quantum/quantum_plugin_base.py
+++ b/quantum/quantum_plugin_base.py
@@ -30,14 +30,6 @@ class QuantumPluginBase(object):
 
     __metaclass__ = ABCMeta
 
-    @abstractmethod
-    def __init__(self, options):
-        """
-        Initializes the Quantum plugin using provided options.
-
-        """
-        pass
-
     @abstractmethod
     def get_all_networks(self, tenant_id):
         """

diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index 84339f71593394fe3adfb159097605b1d83616ac..c09af76990e7c0371fcc07d6815d00d5fca98bc5 100644 (file)
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -615,10 +615,8 @@ class APITest(unittest.TestCase):
                   "format:%s - END", format)
 
     def setUp(self):
-        self.db_file = ':memory:'
         options = {}
         options['plugin_provider'] = 'quantum.plugins.SamplePlugin.FakePlugin'
-        options['sql_connection'] = 'sqlite:///%s' % self.db_file
         self.api = server.APIRouterV01(options)
         self.tenant_id = "test_tenant"
         self.network_name = "test_network"