Merge pull request vyos#2748 from MattKobayashi/t5848

qos: T5848: Add triple-isolate option to CAKE policy config
natali-rs1985 · Feb 2, 2024 · 84b17f0 · 84b17f0
2 parents eb41a9a + 762be96
commit 84b17f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -38,6 +38,8 @@ def update(self, config, direction):
                 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']: