T6790: QoS: Improve CAKE Policy (#4173)

- Fixed handling of flow isolation parameters.
- Corrected support for `nat` and `nonat` in flow isolation.
- Extended RTT values to cover the full range supported by `tc`.
- Make migration script 2-to-3 qos

1 files changed, 34 insertions, 0 deletions

diff --git a/src/migration-scripts/qos/2-to-3 b/src/migration-scripts/qos/2-to-3
new file mode 100644
index 000000000..284fe828e
--- /dev/null
+++ b/src/migration-scripts/qos/2-to-3
@@ -0,0 +1,34 @@
+# Copyright 2024 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+from vyos.configtree import ConfigTree
+
+
+def migrate(config: ConfigTree) -> None:
+    base = ['qos', 'policy', 'cake']
+    if config.exists(base):
+        for policy in config.list_nodes(base):
+            if config.exists(base + [policy, 'flow-isolation']):
+                isolation = None
+                for isol in config.list_nodes(base + [policy, 'flow-isolation']):
+                    if isol == 'nat':
+                        config.set(base + [policy, 'flow-isolation-nat'])
+                    else:
+                        isolation = isol
+
+                config.delete(base + [policy, 'flow-isolation'])
+
+                if isolation:
+                    config.set(base + [policy, 'flow-isolation'], value=isolation)