From 5329801b0a39df615f5788e62aa91ad99713d9f0 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 24 Jul 2017 11:23:26 +0900 Subject: [PATCH] test_extension_l2gateway: Run tests with ml2 as well Partial-Bug: #1589359 Change-Id: I98c5059f91e5d47762f59fe4ce740f4199ac2d3f --- .../tests/unit/test_extension_l2gateway.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/midonet/neutron/tests/unit/test_extension_l2gateway.py b/midonet/neutron/tests/unit/test_extension_l2gateway.py index 8287685..324a21b 100644 --- a/midonet/neutron/tests/unit/test_extension_l2gateway.py +++ b/midonet/neutron/tests/unit/test_extension_l2gateway.py @@ -29,6 +29,7 @@ from neutron.tests.unit.extensions import test_l3 from midonet.neutron.common import constants as mido_const from midonet.neutron.tests.unit import test_extension_gateway_device as test_gw +from midonet.neutron.tests.unit import test_midonet_plugin_ml2 as test_mn_ml2 from midonet.neutron.tests.unit import test_midonet_plugin_v2 as test_mn L2_GW_NAME = 'l2_gw1' @@ -58,9 +59,8 @@ class MidonetL2GatewayTestExtensionManager( return [] -class MidonetL2GatewayTestCase(test_gw.GatewayDeviceTestCaseMixin, - test_l3.L3NatTestCaseMixin, - test_mn.MidonetPluginV2TestCase): +class MidonetL2GatewayTestCaseMixin(test_gw.GatewayDeviceTestCaseMixin, + test_l3.L3NatTestCaseMixin): def setUp(self, plugin=None, ext_mgr=None): @@ -77,7 +77,7 @@ class MidonetL2GatewayTestCase(test_gw.GatewayDeviceTestCaseMixin, l2gw_consts.L2GW, provconf.ProviderConfiguration()) l2_gw_mgr = MidonetL2GatewayTestExtensionManager() - super(MidonetL2GatewayTestCase, self).setUp( + super(MidonetL2GatewayTestCaseMixin, self).setUp( service_plugins=service_plugins, ext_mgr=l2_gw_mgr) self.ext_api = test_ex.setup_extensions_middleware(l2_gw_mgr) @@ -577,3 +577,13 @@ class MidonetL2GatewayTestCase(test_gw.GatewayDeviceTestCaseMixin, res = req.get_response(self.ext_api) self.assertEqual(webob.exc.HTTPConflict.code, res.status_int) + + +class MidonetL2GatewayTestCaseV2(MidonetL2GatewayTestCaseMixin, + test_mn.MidonetPluginV2TestCase): + pass + + +class MidonetL2GatewayTestCaseML2(MidonetL2GatewayTestCaseMixin, + test_mn_ml2.MidonetPluginML2TestCase): + pass