summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-16 10:08:42 +0000
committerGerrit Code Review <review@openstack.org>2018-05-16 10:08:42 +0000
commite32dfd2627c6dec2be4555ef3dcc013d6fa91460 (patch)
tree6b90d9e528b94e5f48f52c488130f189657c50e6
parent1fdf847a15f9955d1480ae37f7159fdb75de692d (diff)
parentf3f2436d6db724126e5611d632b7d1efe309a2af (diff)
Merge "py3: Fix ingress_bw_limit_for_dpdk_port() value conversion"
-rw-r--r--neutron/agent/common/ovs_lib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py
index ad64364..63aa6f8 100644
--- a/neutron/agent/common/ovs_lib.py
+++ b/neutron/agent/common/ovs_lib.py
@@ -862,12 +862,12 @@ class OVSBridge(BaseOVS):
862 max_bw_in_bytes = other_config.get("cir") 862 max_bw_in_bytes = other_config.get("cir")
863 if max_bw_in_bytes is not None: 863 if max_bw_in_bytes is not None:
864 max_kbps = common_utils.bits_to_kilobits( 864 max_kbps = common_utils.bits_to_kilobits(
865 common_utils.bytes_to_bits(int(max_bw_in_bytes)), 865 common_utils.bytes_to_bits(int(float(max_bw_in_bytes))),
866 common_constants.SI_BASE) 866 common_constants.SI_BASE)
867 max_burst_in_bytes = other_config.get("cbs") 867 max_burst_in_bytes = other_config.get("cbs")
868 if max_burst_in_bytes is not None: 868 if max_burst_in_bytes is not None:
869 max_burst_kbit = common_utils.bits_to_kilobits( 869 max_burst_kbit = common_utils.bits_to_kilobits(
870 common_utils.bytes_to_bits(int(max_burst_in_bytes)), 870 common_utils.bytes_to_bits(int(float(max_burst_in_bytes))),
871 common_constants.SI_BASE) 871 common_constants.SI_BASE)
872 return max_kbps, max_burst_kbit 872 return max_kbps, max_burst_kbit
873 873