vpp: T8255: Changed logging level variable name

This commit changes logging settings naming:
  - before: `set vpp settings logging default-log-level <alert>`
  - after:  `set vpp settings logging default-level <alert>`

6 files changed, 40 insertions, 6 deletions

diff --git a/data/templates/vpp/startup.conf.j2 b/data/templates/vpp/startup.conf.j2
index a78f45cde..e6822f7c8 100644
--- a/data/templates/vpp/startup.conf.j2
+++ b/data/templates/vpp/startup.conf.j2
@@ -67,9 +67,9 @@ l2learn {
 
 {% if logging is vyos_defined %}
 logging {
-{%     if logging.default_log_level is vyos_defined %}
-    default-log-level {{ logging.default_log_level }}
-    default-syslog-log-level {{ logging.default_log_level }}
+{%     if logging.default_level is vyos_defined %}
+    default-log-level {{ logging.default_level }}
+    default-syslog-log-level {{ logging.default_level }}
 {%     endif %}
 }
 {% endif %}
diff --git a/interface-definitions/include/version/vpp-version.xml.i b/interface-definitions/include/version/vpp-version.xml.i
index d8dd517bd..59d13f8cf 100644
--- a/interface-definitions/include/version/vpp-version.xml.i
+++ b/interface-definitions/include/version/vpp-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/vpp-version.xml.i -->
-<syntaxVersion component='vpp' version='7'></syntaxVersion>
+<syntaxVersion component='vpp' version='8'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index b9ce1949f..159b99a55 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -809,9 +809,9 @@
             <help>Logging settings</help>
           </properties>
           <children>
-            <leafNode name="default-log-level">
+            <leafNode name="default-level">
               <properties>
-                <help>default-log-level</help>
+                <help>Default logging level</help>
                 <completionHelp>
                   <list>alert crit debug disabled emerg error info notice warn</list>
                 </completionHelp>
diff --git a/smoketest/configs/assert/vpp b/smoketest/configs/assert/vpp
index 9d8c0a8e7..9ca3028fc 100644
--- a/smoketest/configs/assert/vpp
+++ b/smoketest/configs/assert/vpp
@@ -47,3 +47,4 @@ set vpp settings interface eth2
 set vpp settings interface eth3
 set vpp settings interface eth4
 set vpp settings unix poll-sleep-usec '12'
+set vpp settings logging default-level 'debug'
diff --git a/smoketest/configs/vpp b/smoketest/configs/vpp
index 82519da9d..cd1652464 100644
--- a/smoketest/configs/vpp
+++ b/smoketest/configs/vpp
@@ -123,6 +123,9 @@ vpp {
         unix {
             poll-sleep-usec "12"
         }
+        logging {
+            default-log-level "debug"
+        }
     }
 }
 
diff --git a/src/migration-scripts/vpp/7-to-8 b/src/migration-scripts/vpp/7-to-8
new file mode 100644
index 000000000..dfe2f5013
--- /dev/null
+++ b/src/migration-scripts/vpp/7-to-8
@@ -0,0 +1,30 @@
+# Copyright 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/>.
+#
+# Rename `vpp settings logging default-log-level` to
+# `vpp settings logging default-level` (T8255)
+#
+
+from vyos.configtree import ConfigTree
+
+
+def _migrate_vpp_log(config: ConfigTree) -> None:
+    base = ['vpp', 'settings', 'logging']
+    if config.exists(base + ['default-log-level']):
+        config.rename(base + ['default-log-level'], 'default-level')
+
+
+def migrate(config: ConfigTree) -> None:
+    _migrate_vpp_log(config)