x/whitebox-neutron-tempest-plugin
Code Issues Proposed changes

Merge "QoS policies with max-bw only rules are enforced with OVN policer"

Browse Source
This commit is contained in:
Zuul
2025-08-05 15:46:17 +00:00
committed by Gerrit Code Review
parent 70faf6d246 082cbd2e28
commit 242eb566e7
1 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
whitebox_neutron_tempest_plugin/tests/scenario/test_qos.py
View File

@@ -1447,21 +1447,6 @@ class QosTestOvn(base.BaseTempestTestCaseOvn, QosBaseTest):
'Bandwidth options are not set as expected')
LOG.debug('BW limit options found')
def _validate_bw_limit_nbdb_lsp(self, lsp_settings):
bandwidth_settings = ''
for line in lsp_settings.splitlines():
if line.startswith('options'):
bandwidth_settings = line
break
self.assertIn(f'qos_max_rate="{self.MAX_KBPS * 1000:.0f}"',
bandwidth_settings,
'Bandwidth options are not set as expected')
self.assertIn(f'qos_burst="{self.MAX_BURST_KBPS * 1000:.0f}"',
bandwidth_settings,
'Bandwidth options are not set as expected')
LOG.debug('BW limit options found')
def _validate_dscp_nbdb_qos(self, qos_settings):
dscp_settings = ''
for line in qos_settings.splitlines():
@@ -1494,19 +1479,8 @@ class QosTestOvn(base.BaseTempestTestCaseOvn, QosBaseTest):
'port in OVN NBDB')
LOG.debug('Success: no QoS policies found, as expected')
else:
network_id = self.os_admin.network_client.show_port(
port_id)['port']['network_id']
network_type = self.os_admin.network_client.show_network(
network_id)['network']['provider:network_type']
if network_type not in ('vlan', 'flat'):
self._validate_dscp_nbdb_qos(qos_settings)
self._validate_bw_limit_nbdb_qos(qos_settings)
else:
self._validate_dscp_nbdb_qos(qos_settings)
cmd = '{} list logical_switch_port {}'.format(self.nbctl,
port_id)
lsp_settings = self.run_on_master_controller(cmd).rstrip()
self._validate_bw_limit_nbdb_lsp(lsp_settings)
self._validate_dscp_nbdb_qos(qos_settings)
self._validate_bw_limit_nbdb_qos(qos_settings)
if fip_id:
cmd = r'%s find qos external_ids={"neutron\:fip_id"="%s"}' % (