Instantiate qos agent driver

Change-Id: Icd8a725f231e2749bb81da0bcad0f7ef95beb676

diff --git a/neutron/agent/l2/extensions/qos_agent.py b/neutron/agent/l2/extensions/qos_agent.py
index b01c7de5925afaa328abed5a5f373431c7affac8..a013ed8dea2bae99da9570d0da32b2bb0ac66759 100644 (file)
--- a/neutron/agent/l2/extensions/qos_agent.py
+++ b/neutron/agent/l2/extensions/qos_agent.py
@@ -78,7 +78,7 @@ class QosAgentExtension(agent_extension.AgentCoreResourceExtension):
         super(QosAgentExtension, self).initialize(resource_rpc)
 
         self.qos_driver = manager.NeutronManager.load_class_for_provider(
-            'neutron.qos.agent_drivers', cfg.CONF.qos.agent_driver)
+            'neutron.qos.agent_drivers', cfg.CONF.qos.agent_driver)()
         self.qos_driver.initialize()
         self.qos_policy_ports = collections.defaultdict(dict)
         self.known_ports = set()

diff --git a/neutron/tests/unit/agent/l2/extensions/test_qos_agent.py b/neutron/tests/unit/agent/l2/extensions/test_qos_agent.py
index 49c18d8cea319ee47c00a3da631a9a55e096f822..46c2f061db1f24b114250b4e5fbd793f2fcebca9 100755 (executable)
--- a/neutron/tests/unit/agent/l2/extensions/test_qos_agent.py
+++ b/neutron/tests/unit/agent/l2/extensions/test_qos_agent.py
@@ -36,7 +36,8 @@ class QosAgentExtensionTestCase(base.BaseTestCase):
         # Don't rely on used driver
         mock.patch(
             'neutron.manager.NeutronManager.load_class_for_provider',
-            return_value=mock.Mock(spec=qos_agent.QosAgentDriver)).start()
+            return_value=lambda: mock.Mock(spec=qos_agent.QosAgentDriver)
+        ).start()
 
         self._create_fake_resource_rpc()
         self.qos_agent.initialize(self.resource_rpc_mock)