From c22cce92f8cc93392e07124d00771c3c5a962cba Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Thu, 16 Jul 2015 14:23:26 +0200 Subject: [PATCH] Instantiate qos agent driver Change-Id: Icd8a725f231e2749bb81da0bcad0f7ef95beb676 --- neutron/agent/l2/extensions/qos_agent.py | 2 +- neutron/tests/unit/agent/l2/extensions/test_qos_agent.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/agent/l2/extensions/qos_agent.py b/neutron/agent/l2/extensions/qos_agent.py index b01c7de59..a013ed8de 100644 --- 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 49c18d8ce..46c2f061d 100755 --- 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) -- 2.45.2