openstack
/
neutron
Code Issues Proposed changes

Merge "TestMinBwQoSOvs must call the correct methods"

This commit is contained in:
Zuul 2019-11-20 17:17:45 +00:00 committed by Gerrit Code Review
parent 541c59a630 59b37701e9
commit 14efd10c1f
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
neutron/tests/fullstack/test_qos.py
View File

@ -676,10 +676,22 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
self.fail('"%s" direction not implemented' self.fail('"%s" direction not implemented'
% constants.INGRESS_DIRECTION) % constants.INGRESS_DIRECTION)
def test_bw_limit_qos_port_removed(self): def _find_agent_qos_and_queue(self, vm):
"""Test if rate limit config is properly removed when whole port is # NOTE(ralonsoh): the "_min_bw_qos_id" in vm.bridge is not the same as
removed. # the ID in the agent br_int instance. We need first to find the QoS
""" # register and the Queue assigned to vm.neutron_port['id']
queue = vm.bridge._find_queue(vm.neutron_port['id'])
queue_num = int(queue['external_ids']['queue-num'])
qoses = vm.bridge._list_qos()
for qos in qoses:
qos_queue = qos['queues'].get(queue_num)
if qos_queue and qos_queue.uuid == queue['_uuid']:
return qos, qos_queue
self.fail('QoS register not found with queue-num %s' % queue_num)
def test_min_bw_qos_port_removed(self):
"""Test if min BW limit config is properly removed when port removed"""
# Create port with qos policy attached # Create port with qos policy attached
vm, qos_policy = self._prepare_vm_with_qos_policy( vm, qos_policy = self._prepare_vm_with_qos_policy(
[functools.partial( [functools.partial(
@ -687,9 +699,15 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
self._wait_for_min_bw_rule_applied( self._wait_for_min_bw_rule_applied(
vm, MIN_BANDWIDTH, self.direction) vm, MIN_BANDWIDTH, self.direction)
qos, queue = self._find_agent_qos_and_queue(vm)
self.assertEqual({'min-rate': str(MIN_BANDWIDTH * 1000)},
queue.other_config)
queues = vm.bridge._list_queues(port=vm.neutron_port['id'])
self.assertEqual(1, len(queues))
self.assertEqual(queue.uuid, queues[0]['_uuid'])
# Delete port with qos policy attached # Delete port with qos policy attached
vm.destroy() vm.destroy()
self._wait_for_min_bw_rule_removed(vm, self.direction) self._wait_for_min_bw_rule_removed(vm, self.direction)
self.assertIsNone(vm.bridge.find_qos(vm.port.name)) self.assertEqual([],
self.assertIsNone(vm.bridge.find_queue(vm.port.name, vm.bridge._list_queues(port=vm.neutron_port['id']))
ovs_lib.QOS_DEFAULT_QUEUE))