Make the plugin for test_db_plugin configurable

Bug 1031716

Change-Id: I8dc492eb90d4160a23b3b4ba51feeedba6f852e2

diff --git a/quantum/plugins/linuxbridge/run_tests.py b/quantum/plugins/linuxbridge/run_tests.py
index 8e5b38ed9c640e9ec5093d955c536dee8472b039..721104521395919a4b6e3b05a9512365108cbdcf 100644 (file)
--- a/quantum/plugins/linuxbridge/run_tests.py
+++ b/quantum/plugins/linuxbridge/run_tests.py
@@ -48,6 +48,7 @@ if __name__ == '__main__':
     invoke_once = len(sys.argv) > 1
 
     test_config['plugin_name'] = "LinuxBridgePlugin.LinuxBridgePlugin"
+    test_config['plugin_name_v2'] = "lb_quantum_plugin.LinuxBridgePluginV2"
     test_config['default_net_op_status'] = OperationalStatus.UP
     test_config['default_port_op_status'] = OperationalStatus.DOWN
 

diff --git a/quantum/plugins/openvswitch/run_tests.py b/quantum/plugins/openvswitch/run_tests.py
index b55432f83f143dee518d88eee9d2fb39345c580d..84c99e937fd07db9db3ceced2db4cbb8e44e133f 100755 (executable)
--- a/quantum/plugins/openvswitch/run_tests.py
+++ b/quantum/plugins/openvswitch/run_tests.py
@@ -47,6 +47,7 @@ if __name__ == '__main__':
     invoke_once = len(sys.argv) > 1
 
     test_config['plugin_name'] = "ovs_quantum_plugin.OVSQuantumPlugin"
+    test_config['plugin_name_v2'] = "ovs_quantum_plugin.OVSQuantumPluginV2"
     test_config['default_net_op_status'] = OperationalStatus.UP
     test_config['default_port_op_status'] = OperationalStatus.DOWN
 

diff --git a/quantum/plugins/ryu/run_tests.py b/quantum/plugins/ryu/run_tests.py
index 2911d2345dcb32050fb7f0b7e3a75d82d704aaa3..b0ffe758ba773671d0387f8ca48874946eb3dd56 100644 (file)
--- a/quantum/plugins/ryu/run_tests.py
+++ b/quantum/plugins/ryu/run_tests.py
@@ -48,6 +48,7 @@ if __name__ == '__main__':
     invoke_once = len(sys.argv) > 1
 
     test_config['plugin_name'] = "ryu_quantum_plugin.RyuQuantumPlugin"
+    test_config['plugin_name_v2'] = "ryu_quantum_plugin.RyuQuantumPluginV2"
     test_config['default_net_op_status'] = OperationalStatus.UP
     test_config['default_port_op_status'] = OperationalStatus.DOWN
 

diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index 143e6feabeb53656ae2a20370e3dd9b1a3d8e85e..b23523e7629630af0b525534f4d0ac4594a2065e 100644 (file)
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -25,6 +25,7 @@ import quantum
 from quantum.api.v2.router import APIRouter
 from quantum.common import config
 from quantum.common import exceptions as q_exc
+from quantum.common.test_lib import test_config
 from quantum import context
 from quantum.db import api as db
 from quantum.manager import QuantumManager
@@ -61,7 +62,10 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase):
             'application/json': json_deserializer,
         }
 
-        plugin = 'quantum.db.db_base_plugin_v2.QuantumDbPluginV2'
+        plugin = test_config.get('plugin_name_v2',
+                                 'quantum.db.db_base_plugin_v2.'
+                                 'QuantumDbPluginV2')
+        LOG.debug("db plugin test, the plugin is:%s", plugin)
         # Create the default configurations
         args = ['--config-file', etcdir('quantum.conf.test')]
         config.parse(args=args)