openstack
/
neutron
Code Issues Proposed changes

Moved extensions/qos_agent.py into extensions/qos.py 

This file does not contain any separate QoS agent but just an extension
for existing l2 agents to reuse.

Change-Id: I0587d89b0e841e5fd19b91157602efb5aa97513e
Partially-Implements: blueprint quantum-qos-api
This commit is contained in:
Ihar Hrachyshka 2015-08-07 08:15:17 +02:00
parent d148e68b71
commit 4dd9841186
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/devref/quality_of_service.rst
View File

@ -208,7 +208,7 @@ with them.
This module contains a manager that allows to register multiple extensions,
and passes handle_port events down to all enabled extensions.
* neutron.agent.l2.extensions.qos_agent:
* neutron.agent.l2.extensions.qos
defines QoS L2 agent extension. It receives handle_port events and passes
them into QoS agent backend driver (see below). The file also defines the
QosAgentDriver interface for backend QoS drivers.

0
neutron/agent/l2/extensions/qos_agent.py → neutron/agent/l2/extensions/qos.py
View File

4
neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py
View File

@ -16,7 +16,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from neutron.agent.common import ovs_lib
from neutron.agent.l2.extensions import qos_agent
from neutron.agent.l2.extensions import qos
from neutron.i18n import _LW
from neutron.plugins.ml2.drivers.openvswitch.mech_driver import (
mech_openvswitch)
@ -24,7 +24,7 @@ from neutron.plugins.ml2.drivers.openvswitch.mech_driver import (
LOG = logging.getLogger(__name__)
class QosOVSAgentDriver(qos_agent.QosAgentDriver):
class QosOVSAgentDriver(qos.QosAgentDriver):
_SUPPORTED_RULES = (
mech_openvswitch.OpenvswitchMechanismDriver.supported_qos_rule_types)

38
neutron/tests/unit/agent/l2/extensions/test_qos_agent.py → neutron/tests/unit/agent/l2/extensions/test_qos.py
View File

@ -16,7 +16,7 @@
import mock
from oslo_utils import uuidutils
from neutron.agent.l2.extensions import qos_agent
from neutron.agent.l2.extensions import qos
from neutron.api.rpc.callbacks import resources
from neutron import context
from neutron.tests import base
@ -30,21 +30,21 @@ class QosAgentExtensionTestCase(base.BaseTestCase):
def setUp(self):
super(QosAgentExtensionTestCase, self).setUp()
self.qos_agent = qos_agent.QosAgentExtension()
self.qos_ext = qos.QosAgentExtension()
self.context = context.get_admin_context()
# Don't rely on used driver
mock.patch(
'neutron.manager.NeutronManager.load_class_for_provider',
return_value=lambda: mock.Mock(spec=qos_agent.QosAgentDriver)
return_value=lambda: mock.Mock(spec=qos.QosAgentDriver)
).start()
self.qos_agent.initialize()
self.qos_ext.initialize()
self._create_fake_resource_rpc()
def _create_fake_resource_rpc(self):
self.get_info_mock = mock.Mock(return_value=TEST_GET_INFO_RULES)
self.qos_agent.resource_rpc.get_info = self.get_info_mock
self.qos_ext.resource_rpc.get_info = self.get_info_mock
def _create_test_port_dict(self):
return {'port_id': uuidutils.generate_uuid(),
@ -53,37 +53,37 @@ class QosAgentExtensionTestCase(base.BaseTestCase):
def test_handle_port_with_no_policy(self):
port = self._create_test_port_dict()
del port['qos_policy_id']
self.qos_agent._process_rules_updates = mock.Mock()
self.qos_agent.handle_port(self.context, port)
self.assertFalse(self.qos_agent._process_rules_updates.called)
self.qos_ext._process_rules_updates = mock.Mock()
self.qos_ext.handle_port(self.context, port)
self.assertFalse(self.qos_ext._process_rules_updates.called)
def test_handle_unknown_port(self):
port = self._create_test_port_dict()
qos_policy_id = port['qos_policy_id']
port_id = port['port_id']
self.qos_agent.handle_port(self.context, port)
self.qos_ext.handle_port(self.context, port)
# we make sure the underlaying qos driver is called with the
# right parameters
self.qos_agent.qos_driver.create.assert_called_once_with(
self.qos_ext.qos_driver.create.assert_called_once_with(
port, TEST_GET_INFO_RULES)
self.assertEqual(port,
self.qos_agent.qos_policy_ports[qos_policy_id][port_id])
self.assertTrue(port_id in self.qos_agent.known_ports)
self.qos_ext.qos_policy_ports[qos_policy_id][port_id])
self.assertTrue(port_id in self.qos_ext.known_ports)
def test_handle_known_port(self):
port_obj1 = self._create_test_port_dict()
port_obj2 = dict(port_obj1)
self.qos_agent.handle_port(self.context, port_obj1)
self.qos_agent.qos_driver.reset_mock()
self.qos_agent.handle_port(self.context, port_obj2)
self.assertFalse(self.qos_agent.qos_driver.create.called)
self.qos_ext.handle_port(self.context, port_obj1)
self.qos_ext.qos_driver.reset_mock()
self.qos_ext.handle_port(self.context, port_obj2)
self.assertFalse(self.qos_ext.qos_driver.create.called)
def test_handle_known_port_change_policy_id(self):
port = self._create_test_port_dict()
self.qos_agent.handle_port(self.context, port)
self.qos_agent.resource_rpc.get_info.reset_mock()
self.qos_ext.handle_port(self.context, port)
self.qos_ext.resource_rpc.get_info.reset_mock()
port['qos_policy_id'] = uuidutils.generate_uuid()
self.qos_agent.handle_port(self.context, port)
self.qos_ext.handle_port(self.context, port)
self.get_info_mock.assert_called_once_with(
self.context, resources.QOS_POLICY,
port['qos_policy_id'])

2
neutron/tests/unit/agent/l2/test_agent_extensions_manager.py
View File

@ -21,7 +21,7 @@ class TestAgentExtensionsManager(base.BaseTestCase):
def setUp(self):
super(TestAgentExtensionsManager, self).setUp()
mock.patch('neutron.agent.l2.extensions.qos_agent.QosAgentExtension',
mock.patch('neutron.agent.l2.extensions.qos.QosAgentExtension',
autospec=True).start()
conf = cfg.CONF
agent_extensions_manager.register_opts(conf)

2
setup.cfg
View File

@ -197,7 +197,7 @@ neutron.ipam_drivers =
fake = neutron.tests.unit.ipam.fake_driver:FakeDriver
internal = neutron.ipam.drivers.neutrondb_ipam.driver:NeutronDbPool
neutron.agent.l2.extensions =
qos = neutron.agent.l2.extensions.qos_agent:QosAgentExtension
qos = neutron.agent.l2.extensions.qos:QosAgentExtension
neutron.qos.agent_drivers =
ovs = neutron.plugins.ml2.drivers.openvswitch.agent.extension_drivers.qos_driver:QosOVSAgentDriver
# These are for backwards compat with Icehouse notification_driver configuration values