qos: T4284: migration script must ensure bandwidth is converted to lower case

tc acccepts the bandwidth value/unit pairs as lowercase - so does the VyOS CLI
validator work, too.

2 files changed, 30 insertions, 18 deletions

diff --git a/smoketest/configs/qos-basic b/smoketest/configs/qos-basic
index c279cbf67..65a888d38 100644
--- a/smoketest/configs/qos-basic
+++ b/smoketest/configs/qos-basic
@@ -8,7 +8,7 @@ interfaces {
     ethernet eth1 {
         address 10.2.1.1/24
         traffic-policy {
-          out M2
+          out ISPC
         }
     }
     ethernet eth2 {
@@ -74,25 +74,15 @@ system {
     }
 }
 traffic-policy {
-    shaper M2 {
-        bandwidth auto
-        class 10 {
-            bandwidth 100%
-            burst 15k
-            match ssh4 {
-                ip {
-                    destination {
-                        port 22
-                    }
-                }
-            }
-            queue-type fair-queue
-        }
+    shaper ISPC {
+        bandwidth 600Mbit
         default {
-            bandwidth 10mbit
-            burst 15k
-            queue-type fair-queue
+            bandwidth 50%
+            burst 768k
+            ceiling 100%
+            queue-type fq-codel
         }
+        description "Outbound Traffic Shaper - ISPC"
     }
     shaper MY-HTB {
         bandwidth 10mbit
diff --git a/src/migration-scripts/qos/1-to-2 b/src/migration-scripts/qos/1-to-2
index 41026cbd6..14d3a6e0a 100755
--- a/src/migration-scripts/qos/1-to-2
+++ b/src/migration-scripts/qos/1-to-2
@@ -118,6 +118,28 @@ if config.exists(netem_base):
         if config.exists(netem_base + [policy_name, 'burst']):
             config.delete(netem_base + [policy_name, 'burst'])
 
+# Change bandwidth unit MBit -> mbit as tc only supports mbit
+base = ['qos', 'policy']
+if config.exists(base):
+    for policy_type in config.list_nodes(base):
+        for policy in config.list_nodes(base + [policy_type]):
+            policy_base = base + [policy_type, policy]
+            if config.exists(policy_base + ['bandwidth']):
+                tmp = config.return_value(policy_base + ['bandwidth'])
+                config.set(policy_base + ['bandwidth'], value=tmp.lower())
+
+            if config.exists(policy_base + ['class']):
+                for cls in config.list_nodes(policy_base + ['class']):
+                    cls_base = policy_base + ['class', cls]
+                    if config.exists(cls_base + ['bandwidth']):
+                        tmp = config.return_value(cls_base + ['bandwidth'])
+                        config.set(cls_base + ['bandwidth'], value=tmp.lower())
+
+            if config.exists(policy_base + ['default', 'bandwidth']):
+                if config.exists(policy_base + ['default', 'bandwidth']):
+                    tmp = config.return_value(policy_base + ['default', 'bandwidth'])
+                    config.set(policy_base + ['default', 'bandwidth'], value=tmp.lower())
+
 try:
     with open(file_name, 'w') as f:
         f.write(config.to_string())