openstack/neutron
Code Issues Proposed changes

Merge ""add_tc_policy_class" must always assign a default value to "min_kbps""

Browse Source
This commit is contained in:
Zuul 2019-05-07 18:08:31 +00:00 committed by Gerrit Code Review
commit 35f97f5b1f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/agent/linux/tc_lib.py
View File

@ -68,6 +68,10 @@ class InvalidUnit(exceptions.NeutronException):
message = _("Unit name '%(unit)s' is not valid.") message = _("Unit name '%(unit)s' is not valid.")
class TcLibPolicyClassInvalidMinKbpsValue(exceptions.NeutronException):
message = _("'min_kbps' is mandatory in a TC class and must be >= 1.")
def convert_to_kilobits(value, base): def convert_to_kilobits(value, base):
value = value.lower() value = value.lower()
if "bit" in value: if "bit" in value:
@ -376,7 +380,7 @@ def delete_tc_qdisc(device, parent=None, is_ingress=False,
raise_qdisc_not_found=raise_qdisc_not_found, namespace=namespace) raise_qdisc_not_found=raise_qdisc_not_found, namespace=namespace)
def add_tc_policy_class(device, parent, classid, min_kbps=None, max_kbps=None, def add_tc_policy_class(device, parent, classid, min_kbps=1, max_kbps=None,
burst_kb=None, namespace=None): burst_kb=None, namespace=None):
"""Add a TC policy class """Add a TC policy class
@ -390,14 +394,14 @@ def add_tc_policy_class(device, parent, classid, min_kbps=None, max_kbps=None,
:return: :return:
""" """
parent = TC_QDISC_PARENT.get(parent, parent) parent = TC_QDISC_PARENT.get(parent, parent)
args = {}
# NOTE(ralonsoh): pyroute2 input parameters and units [1]: # NOTE(ralonsoh): pyroute2 input parameters and units [1]:
# - rate (min bw): bytes/second # - rate (min bw): bytes/second
# - ceil (max bw): bytes/second # - ceil (max bw): bytes/second
# - burst: bytes # - burst: bytes
# [1] https://www.systutorials.com/docs/linux/man/8-tc/ # [1] https://www.systutorials.com/docs/linux/man/8-tc/
if min_kbps: if int(min_kbps) < 1:
args['rate'] = int(min_kbps * 1024 / 8) raise TcLibPolicyClassInvalidMinKbpsValue()
args = {'rate': int(min_kbps * 1024 / 8)}
if max_kbps: if max_kbps:
args['ceil'] = int(max_kbps * 1024 / 8) args['ceil'] = int(max_kbps * 1024 / 8)
if burst_kb: if burst_kb: