summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-02 17:35:34 +0100
committerGitHub <noreply@github.com>2024-02-02 17:35:34 +0100
commit2d8a7bda382fbd95b4bee7c6e966dfc072b52bfd (patch)
tree9f1899cd01d0b4729b9dc7eeedb7a3065159473b
parent38a46e1bffd209ae3b91872d4dfb423aff87c10c (diff)
parentd9cc48fe8c6bfce2a82de6ce71d6328036aacd16 (diff)
downloadvyos-1x-2d8a7bda382fbd95b4bee7c6e966dfc072b52bfd.tar.gz
vyos-1x-2d8a7bda382fbd95b4bee7c6e966dfc072b52bfd.zip
Merge pull request #2930 from vyos/mergify/bp/sagitta/pr-2748
qos: T5848: Add triple-isolate option to CAKE policy config (backport #2748)
-rw-r--r--interface-definitions/qos.xml.in10
-rw-r--r--python/vyos/qos/cake.py2
2 files changed, 10 insertions, 2 deletions
diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index c7bd8606a..31b9a7d21 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -122,13 +122,19 @@
</leafNode>
<leafNode name="dual-src-host">
<properties>
- <help>Flows are defined by the 5-tuple, and fairness is applied first over source addresses, then over individual flows</help>
+ <help>Flows are defined by the 5-tuple, fairness is applied first over source addresses, then over individual flows</help>
<valueless/>
</properties>
</leafNode>
<leafNode name="dual-dst-host">
<properties>
- <help>Flows are defined by the 5-tuple, and fairness is applied first over destination addresses, then over individual flows</help>
+ <help>Flows are defined by the 5-tuple, fairness is applied first over destination addresses, then over individual flows</help>
+ <valueless/>
+ </properties>
+ </leafNode>
+ <leafNode name="triple-isolate">
+ <properties>
+ <help>Flows are defined by the 5-tuple, fairness is applied over source and destination addresses and also over individual flows (default)</help>
<valueless/>
</properties>
</leafNode>
diff --git a/python/vyos/qos/cake.py b/python/vyos/qos/cake.py
index a89b1de1e..1ee7d0fc3 100644
--- a/python/vyos/qos/cake.py
+++ b/python/vyos/qos/cake.py
@@ -38,6 +38,8 @@ class CAKE(QoSBase):
tmp += f' dual-dsthost'
if 'dual_src_host' in config['flow_isolation']:
tmp += f' dual-srchost'
+ if 'triple_isolate' in config['flow_isolation']:
+ tmp += f' triple-isolate'
if 'flow' in config['flow_isolation']:
tmp += f' flows'
if 'host' in config['flow_isolation']: