|
20 | 20 | from neutronclient.common import exceptions
|
21 | 21 | from oslo_utils import uuidutils
|
22 | 22 |
|
23 |
| -from neutron.agent.linux import tc_lib |
24 | 23 | from neutron.common import utils
|
25 | 24 | from neutron.tests.common.agents import l2_extensions
|
26 | 25 | from neutron.tests.fullstack import base
|
|
30 | 29 | from neutron.tests.unit import testlib_api
|
31 | 30 |
|
32 | 31 | from neutron.agent.common import ovs_lib
|
33 |
| -from neutron.conf.plugins.ml2.drivers import linuxbridge as \ |
34 |
| - linuxbridge_agent_config |
35 |
| -from neutron.plugins.ml2.drivers.linuxbridge.agent import \ |
36 |
| - linuxbridge_neutron_agent as linuxbridge_agent |
37 |
| -from neutron.services.qos.drivers.linuxbridge import driver as lb_drv |
38 | 32 | from neutron.services.qos.drivers.openvswitch import driver as ovs_drv
|
39 | 33 |
|
40 | 34 |
|
@@ -404,46 +398,6 @@ def test_bw_limit_qos_port_removed(self):
|
404 | 398 | self.assertIsNone(qos_queues)
|
405 | 399 |
|
406 | 400 |
|
407 |
| -class TestBwLimitQoSLinuxbridge(_TestBwLimitQoS, base.BaseFullStackTestCase): |
408 |
| - l2_agent_type = constants.AGENT_TYPE_LINUXBRIDGE |
409 |
| - scenarios = [ |
410 |
| - ('egress', {'direction': constants.EGRESS_DIRECTION}), |
411 |
| - ('ingress', {'direction': constants.INGRESS_DIRECTION}), |
412 |
| - ] |
413 |
| - |
414 |
| - @staticmethod |
415 |
| - def _get_expected_burst_value(limit, direction): |
416 |
| - # For egress bandwidth limit this value should be calculated as |
417 |
| - # bandwidth_limit * qos_consts.DEFAULT_BURST_RATE |
418 |
| - if direction == constants.EGRESS_DIRECTION: |
419 |
| - return TestBwLimitQoSLinuxbridge._get_expected_egress_burst_value( |
420 |
| - limit) |
421 |
| - else: |
422 |
| - return TestBwLimitQoSLinuxbridge._get_expected_ingress_burst_value( |
423 |
| - limit) |
424 |
| - |
425 |
| - @staticmethod |
426 |
| - def _get_expected_ingress_burst_value(limit): |
427 |
| - return int( |
428 |
| - float(limit) / |
429 |
| - float(linuxbridge_agent_config.DEFAULT_KERNEL_HZ_VALUE)) |
430 |
| - |
431 |
| - def _wait_for_bw_rule_applied(self, vm, limit, burst, direction): |
432 |
| - port_name = linuxbridge_agent.LinuxBridgeManager.get_tap_device_name( |
433 |
| - vm.neutron_port['id']) |
434 |
| - tc = tc_lib.TcCommand( |
435 |
| - port_name, |
436 |
| - linuxbridge_agent_config.DEFAULT_KERNEL_HZ_VALUE, |
437 |
| - namespace=vm.host.host_namespace |
438 |
| - ) |
439 |
| - if direction == constants.EGRESS_DIRECTION: |
440 |
| - utils.wait_until_true( |
441 |
| - lambda: tc.get_filters_bw_limits() == (limit, burst)) |
442 |
| - elif direction == constants.INGRESS_DIRECTION: |
443 |
| - utils.wait_until_true( |
444 |
| - lambda: tc.get_tbf_bw_limits() == (limit, burst)) |
445 |
| - |
446 |
| - |
447 | 401 | class _TestDscpMarkingQoS(BaseQoSRuleTestCase):
|
448 | 402 |
|
449 | 403 | number_of_hosts = 2
|
@@ -540,15 +494,6 @@ def _wait_for_dscp_marking_rule_applied(self, vm, dscp_mark):
|
540 | 494 | vm.bridge, vm.port.name, dscp_mark)
|
541 | 495 |
|
542 | 496 |
|
543 |
| -class TestDscpMarkingQoSLinuxbridge(_TestDscpMarkingQoS, |
544 |
| - base.BaseFullStackTestCase): |
545 |
| - l2_agent_type = constants.AGENT_TYPE_LINUXBRIDGE |
546 |
| - |
547 |
| - def _wait_for_dscp_marking_rule_applied(self, vm, dscp_mark): |
548 |
| - l2_extensions.wait_until_dscp_marking_rule_applied_linuxbridge( |
549 |
| - vm.host.host_namespace, vm.port.name, dscp_mark) |
550 |
| - |
551 |
| - |
552 | 497 | class _TestPacketRateLimitQoS(BaseQoSRuleTestCase):
|
553 | 498 |
|
554 | 499 | number_of_hosts = 1
|
@@ -644,9 +589,6 @@ class TestQoSWithL2Population(base.BaseFullStackTestCase):
|
644 | 589 | (constants.AGENT_TYPE_OVS,
|
645 | 590 | {'mech_drivers': 'openvswitch',
|
646 | 591 | 'supported_rules': ovs_drv.SUPPORTED_RULES}),
|
647 |
| - (constants.AGENT_TYPE_LINUXBRIDGE, |
648 |
| - {'mech_drivers': 'linuxbridge', |
649 |
| - 'supported_rules': lb_drv.SUPPORTED_RULES}) |
650 | 592 | ]
|
651 | 593 |
|
652 | 594 | def setUp(self):
|
|
0 commit comments