From 628877a46a049142cffd5d98de74f652d4a9dde7 Mon Sep 17 00:00:00 2001
From: Matthew Kobayashi <matthew@kobayashi.au>
Date: Fri, 22 Dec 2023 11:50:29 +1000
Subject: qos: T5848: Add triple-isolate option to CAKE policy config

(cherry picked from commit 61342083d7db8c30d015474fae5cb71f480487d8)
---
 interface-definitions/qos.xml.in | 6 ++++++
 python/vyos/qos/cake.py          | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index c7bd8606a..ccc2dc039 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -132,6 +132,12 @@
                       <valueless/>
                     </properties>
                   </leafNode>
+                  <leafNode name="triple-isolate">
+                    <properties>
+                      <help>Flows are defined by the 5-tuple, and fairness is applied over source and destination addresses intelligently (ie. not merely by host-pairs), and also over individual flows (default)</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
                   <leafNode name="nat">
                     <properties>
                       <help>Perform NAT lookup before applying flow-isolation rules</help>
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']:
-- 
cgit v1.2.3


From d9cc48fe8c6bfce2a82de6ce71d6328036aacd16 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 2 Feb 2024 13:08:27 +0100
Subject: qos: T5848: improve flow-isolation help strings

(cherry picked from commit 762be96f45bb1d9705e45ff554ad483c9d4e10ff)
---
 interface-definitions/qos.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index ccc2dc039..31b9a7d21 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -122,19 +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, and fairness is applied over source and destination addresses intelligently (ie. not merely by host-pairs), and also over individual flows (default)</help>
+                      <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>
-- 
cgit v1.2.3