Reject min-bw rule operations on non-physnet networks/ports
Change-Id: I54d421d0993bd9515ab5ba32f75f40d1ef46eccb Closes-Bug: #1819029 Depends-On: https://review.openstack.org/644847
This commit is contained in:
Bence Romsics
Slawek Kaplonski
parent
5a8c6dc7b2
commit
d1696619c5
@ -174,7 +174,7 @@ class QoSPlugin(qos.QoSPluginBase):
|
||||
|
||||
policy = policy_object.QosPolicy.get_object(
|
||||
context.elevated(), id=policy_id)
|
||||
self.validate_policy_for_port(policy, port)
|
||||
self.validate_policy_for_port(context, policy, port)
|
||||
|
||||
def _validate_update_port_callback(self, resource, event, trigger,
|
||||
payload=None):
|
||||
@ -191,7 +191,7 @@ class QoSPlugin(qos.QoSPluginBase):
|
||||
policy = policy_object.QosPolicy.get_object(
|
||||
context.elevated(), id=policy_id)
|
||||
|
||||
self.validate_policy_for_port(policy, updated_port)
|
||||
self.validate_policy_for_port(context, policy, updated_port)
|
||||
|
||||
def _validate_update_network_callback(self, resource, event, trigger,
|
||||
payload=None):
|
||||
@ -213,21 +213,30 @@ class QoSPlugin(qos.QoSPluginBase):
|
||||
ports = [
|
||||
port for port in ports if port.qos_policy_id is None
|
||||
]
|
||||
self.validate_policy_for_ports(policy, ports)
|
||||
self.validate_policy_for_ports(context, policy, ports)
|
||||
|
||||
def validate_policy(self, context, policy):
|
||||
ports = self._get_ports_with_policy(context, policy)
|
||||
self.validate_policy_for_ports(policy, ports)
|
||||
self.validate_policy_for_ports(context, policy, ports)
|
||||
|
||||
def validate_policy_for_ports(self, policy, ports):
|
||||
def validate_policy_for_ports(self, context, policy, ports):
|
||||
for port in ports:
|
||||
self.validate_policy_for_port(policy, port)
|
||||
self.validate_policy_for_port(context, policy, port)
|
||||
|
||||
def validate_policy_for_port(self, policy, port):
|
||||
def validate_policy_for_port(self, context, policy, port):
|
||||
for rule in policy.rules:
|
||||
if not self.driver_manager.validate_rule_for_port(rule, port):
|
||||
raise qos_exc.QosRuleNotSupported(rule_type=rule.rule_type,
|
||||
port_id=port['id'])
|
||||
# minimum-bandwidth rule is only supported (independently of
|
||||
# drivers) on networks whose first segment is backed by a physnet
|
||||
if rule.rule_type == qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH:
|
||||
net = network_object.Network.get_object(
|
||||
context, id=port.network_id)
|
||||
physnet = net.segments[0].physical_network
|
||||
if physnet is None:
|
||||
raise qos_exc.QosRuleNotSupported(rule_type=rule.rule_type,
|
||||
port_id=port['id'])
|
||||
|
||||
def reject_min_bw_rule_updates(self, context, policy):
|
||||
ports = self._get_ports_with_policy(context, policy)
|
||||
|
||||
@ -31,6 +31,8 @@ import webob.exc
|
||||
from neutron.common import constants
|
||||
from neutron.extensions import qos_rules_alias
|
||||
from neutron import manager
|
||||
from neutron.objects import network as network_object
|
||||
from neutron.objects import ports as ports_object
|
||||
from neutron.objects.qos import policy as policy_object
|
||||
from neutron.objects.qos import rule as rule_object
|
||||
from neutron.services.qos import qos_plugin
|
||||
@ -279,8 +281,8 @@ class TestQosPlugin(base.BaseQosTestCase):
|
||||
if policy_id or network_policy_id:
|
||||
get_policy.assert_called_once_with(admin_ctxt,
|
||||
id=expected_policy_id)
|
||||
validate_policy_for_port.assert_called_once_with(policy_mock,
|
||||
port_mock)
|
||||
validate_policy_for_port.assert_called_once_with(
|
||||
self.ctxt, policy_mock, port_mock)
|
||||
else:
|
||||
get_policy.assert_not_called()
|
||||
validate_policy_for_port.assert_not_called()
|
||||
@ -340,8 +342,8 @@ class TestQosPlugin(base.BaseQosTestCase):
|
||||
else:
|
||||
get_port.assert_called_once_with(self.ctxt, id=port_id)
|
||||
get_policy.assert_called_once_with(admin_ctxt, id=policy_id)
|
||||
validate_policy_for_port.assert_called_once_with(policy_mock,
|
||||
port_mock)
|
||||
validate_policy_for_port.assert_called_once_with(
|
||||
self.ctxt, policy_mock, port_mock)
|
||||
|
||||
def test_validate_update_port_callback_policy_changed(self):
|
||||
self._test_validate_update_port_callback(
|
||||
@ -403,7 +405,7 @@ class TestQosPlugin(base.BaseQosTestCase):
|
||||
get_ports.assert_called_once_with(self.ctxt,
|
||||
network_id=network_id)
|
||||
validate_policy_for_ports.assert_called_once_with(
|
||||
policy_mock, [port_mock_without_own_policy])
|
||||
self.ctxt, policy_mock, [port_mock_without_own_policy])
|
||||
|
||||
def test_validate_update_network_callback_policy_changed(self):
|
||||
self._test_validate_update_network_callback(
|
||||
@ -428,7 +430,7 @@ class TestQosPlugin(base.BaseQosTestCase):
|
||||
self.assertRaises(
|
||||
qos_exc.QosRuleNotSupported,
|
||||
self.qos_plugin.validate_policy_for_port,
|
||||
self.policy, port)
|
||||
self.ctxt, self.policy, port)
|
||||
|
||||
def test_validate_policy_for_port_all_rules_valid(self):
|
||||
port = {'id': uuidutils.generate_uuid()}
|
||||
@ -438,10 +440,67 @@ class TestQosPlugin(base.BaseQosTestCase):
|
||||
):
|
||||
self.policy.rules = [self.rule]
|
||||
try:
|
||||
self.qos_plugin.validate_policy_for_port(self.policy, port)
|
||||
self.qos_plugin.validate_policy_for_port(
|
||||
self.ctxt, self.policy, port)
|
||||
except qos_exc.QosRuleNotSupported:
|
||||
self.fail("QosRuleNotSupported exception unexpectedly raised")
|
||||
|
||||
def test_create_min_bw_rule_on_physnet_port(self):
|
||||
policy = self._get_policy()
|
||||
policy.rules = [self.min_rule]
|
||||
segment = network_object.NetworkSegment(
|
||||
physical_network='fake physnet')
|
||||
net = network_object.Network(
|
||||
self.ctxt,
|
||||
segments=[segment])
|
||||
port = ports_object.Port(
|
||||
self.ctxt,
|
||||
id=uuidutils.generate_uuid(),
|
||||
network_id=uuidutils.generate_uuid(),
|
||||
device_owner='fake owner')
|
||||
with mock.patch(
|
||||
'neutron.objects.qos.policy.QosPolicy.get_object',
|
||||
return_value=policy), \
|
||||
mock.patch(
|
||||
'neutron.objects.network.Network.get_object',
|
||||
return_value=net), \
|
||||
mock.patch.object(
|
||||
self.qos_plugin,
|
||||
'_get_ports_with_policy',
|
||||
return_value=[port]):
|
||||
try:
|
||||
self.qos_plugin.create_policy_minimum_bandwidth_rule(
|
||||
self.ctxt, policy.id, self.rule_data)
|
||||
except qos_exc.QosRuleNotSupported:
|
||||
self.fail()
|
||||
|
||||
def test_create_min_bw_rule_on_non_physnet_port(self):
|
||||
policy = self._get_policy()
|
||||
policy.rules = [self.min_rule]
|
||||
segment = network_object.NetworkSegment()
|
||||
net = network_object.Network(
|
||||
self.ctxt,
|
||||
segments=[segment])
|
||||
port = ports_object.Port(
|
||||
self.ctxt,
|
||||
id=uuidutils.generate_uuid(),
|
||||
network_id=uuidutils.generate_uuid(),
|
||||
device_owner='fake owner')
|
||||
with mock.patch(
|
||||
'neutron.objects.qos.policy.QosPolicy.get_object',
|
||||
return_value=policy), \
|
||||
mock.patch(
|
||||
'neutron.objects.network.Network.get_object',
|
||||
return_value=net), \
|
||||
mock.patch.object(
|
||||
self.qos_plugin,
|
||||
'_get_ports_with_policy',
|
||||
return_value=[port]):
|
||||
self.assertRaises(
|
||||
qos_exc.QosRuleNotSupported,
|
||||
self.qos_plugin.create_policy_minimum_bandwidth_rule,
|
||||
self.ctxt, policy.id, self.rule_data)
|
||||
|
||||
@mock.patch(
|
||||
'neutron.objects.rbac_db.RbacNeutronDbObjectMixin'
|
||||
'.create_rbac_policy')
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
---
|
||||
fixes:
|
||||
- |
|
||||
Reject QoS minimum bandwidth rule operations on ports, networks without
|
||||
physnet, see bug `1819029 <https://bugs.launchpad.net/neutron/+bug/1819029>`_.
|
||||
Loading…
Reference in New Issue
Block a user