From 2e39c9927acb60f4a70aea011f165b3f62a82a77 Mon Sep 17 00:00:00 2001 From: Juan Vidal Date: Fri, 30 Jun 2017 10:47:31 +0200 Subject: [PATCH] Initialize odl_features in mech_driver_v1 odl_features is being used in v1 driver (e.g. in pseudo-agendb-binding), but its init() function is only called in v2 driver initialization. Closes-Bug: #1701479 Change-Id: I57db1f3d89482ba5f6b9d0964735452f1ff99c17 --- networking_odl/ml2/mech_driver.py | 2 ++ networking_odl/tests/unit/ml2/test_mechanism_odl.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/networking_odl/ml2/mech_driver.py b/networking_odl/ml2/mech_driver.py index 7f199361e..1a749ffd5 100644 --- a/networking_odl/ml2/mech_driver.py +++ b/networking_odl/ml2/mech_driver.py @@ -39,6 +39,7 @@ from networking_odl.common import callback as odl_call from networking_odl.common import client as odl_client from networking_odl.common import constants as odl_const from networking_odl.common import filters +from networking_odl.common import odl_features from networking_odl.common import utils as odl_utils from networking_odl.ml2 import port_binding from networking_odl.trunk import trunk_driver_v1 as trunk_driver @@ -459,6 +460,7 @@ class OpenDaylightMechanismDriver(api.MechanismDriver): self.password = cfg.CONF.ml2_odl.password self.odl_drv = OpenDaylightDriver() self.trunk_driver = trunk_driver.OpenDaylightTrunkDriverV1.create() + odl_features.init() # Postcommit hooks are used to trigger synchronization. diff --git a/networking_odl/tests/unit/ml2/test_mechanism_odl.py b/networking_odl/tests/unit/ml2/test_mechanism_odl.py index 21b25559d..ce834b9cc 100644 --- a/networking_odl/tests/unit/ml2/test_mechanism_odl.py +++ b/networking_odl/tests/unit/ml2/test_mechanism_odl.py @@ -122,6 +122,7 @@ class OpenDaylightTestCase(test_plugin.Ml2PluginV2TestCase): def setUp(self): self.useFixture(odl_base.OpenDaylightRestClientFixture()) + self.useFixture(odl_base.OpendaylightFeaturesFixture()) super(OpenDaylightTestCase, self).setUp() self.port_create_status = 'DOWN' self.mech = mech_driver.OpenDaylightMechanismDriver() @@ -137,6 +138,7 @@ class OpenDaylightTestCase(test_plugin.Ml2PluginV2TestCase): class OpenDayLightMechanismConfigTests(testlib_api.SqlTestCase): def setUp(self): super(OpenDayLightMechanismConfigTests, self).setUp() + self.useFixture(odl_base.OpendaylightFeaturesFixture()) config.cfg.CONF.set_override('mechanism_drivers', ['logger', 'opendaylight'], 'ml2') @@ -302,6 +304,7 @@ class OpenDaylightMechanismDriverTestCase(base.BaseTestCase): def setUp(self): super(OpenDaylightMechanismDriverTestCase, self).setUp() self.useFixture(odl_base.OpenDaylightRestClientFixture()) + self.useFixture(odl_base.OpendaylightFeaturesFixture()) config.cfg.CONF.set_override('mechanism_drivers', ['logger', 'opendaylight'], 'ml2') self.mech = mech_driver.OpenDaylightMechanismDriver() @@ -547,6 +550,7 @@ class OpenDaylightMechanismDriverTestCase(base.BaseTestCase): class TestOpenDaylightMechanismDriver(base.DietTestCase): def setUp(self): self.useFixture(odl_base.OpenDaylightRestClientFixture()) + self.useFixture(odl_base.OpendaylightFeaturesFixture()) super(TestOpenDaylightMechanismDriver, self).setUp() config.cfg.CONF.set_override('mechanism_drivers', ['logger', 'opendaylight'], 'ml2')