vpp: T8354: Move 'ignore-kernel-routes' option out of resource-allocation section

5 files changed, 23 insertions, 11 deletions

diff --git a/data/templates/vpp/startup.conf.j2 b/data/templates/vpp/startup.conf.j2
index 481261786..5d5406747 100644
--- a/data/templates/vpp/startup.conf.j2
+++ b/data/templates/vpp/startup.conf.j2
@@ -122,7 +122,7 @@ crypto-engines {
 linux-cp {
     lcp-sync
     lcp-auto-subint
-{% if resource_allocation.ignore_kernel_routes is not vyos_defined %}
+{% if ignore_kernel_routes is not vyos_defined %}
     route-no-paths
 {% endif %}
 }
diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index 9d484dbe9..0da90ddd3 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -293,12 +293,6 @@
                 </properties>
                 <defaultValue>4194304</defaultValue>
               </leafNode>
-              <leafNode name="ignore-kernel-routes">
-                <properties>
-                  <help>Ignore kernel routes</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
               <node name="memory">
                 <properties>
                   <help>Memory settings</help>
@@ -423,6 +417,12 @@
               <valueless/>
             </properties>
           </leafNode>
+          <leafNode name="ignore-kernel-routes">
+            <properties>
+              <help>Ignore kernel routes</help>
+              <valueless/>
+            </properties>
+          </leafNode>
         <node name="logging">
           <properties>
             <help>Logging settings</help>
diff --git a/smoketest/scripts/cli/test_vpp.py b/smoketest/scripts/cli/test_vpp.py
index c945d8dab..2c17345ae 100755
--- a/smoketest/scripts/cli/test_vpp.py
+++ b/smoketest/scripts/cli/test_vpp.py
@@ -162,7 +162,7 @@ class TestVPP(VyOSUnitTestSHIM.TestCase):
         required_str = 'lcp route-no-paths on'
         self.assertIn(required_str, out)
 
-        self.cli_set(resource_path + ['ignore-kernel-routes'])
+        self.cli_set(base_path + ['settings', 'ignore-kernel-routes'])
         self.cli_commit()
 
         # check disabled 'route no path'
diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py
index 2ae079c30..d39eadac1 100755
--- a/src/conf_mode/vpp.py
+++ b/src/conf_mode/vpp.py
@@ -747,9 +747,7 @@ def apply(config):
             vpp_control = VPPControl()
 
             # preconfigure LCP plugin
-            if 'ignore_kernel_routes' in config['settings'].get(
-                'resource_allocation', {}
-            ):
+            if 'ignore_kernel_routes' in config['settings']:
                 vpp_control.cli_cmd('lcp param route-no-paths off')
             else:
                 vpp_control.cli_cmd('lcp param route-no-paths on')
diff --git a/src/migration-scripts/vpp/5-to-6 b/src/migration-scripts/vpp/5-to-6
index 34a2b54a0..d403ca1ed 100644
--- a/src/migration-scripts/vpp/5-to-6
+++ b/src/migration-scripts/vpp/5-to-6
@@ -548,6 +548,19 @@ def _migrate_vpp_vxlan_remove_vif(config: ConfigTree) -> None:
             config.delete(base + [ifname, 'vif'])
 
 
+def _migrate_vpp_ignore_kernel_routes(config: ConfigTree) -> None:
+    base = ['vpp', 'settings']
+    old_base = base + ['resource-allocation', 'ignore-kernel-routes']
+
+    if config.exists(old_base):
+        config.delete(old_base)
+
+        config.set(base + ['ignore-kernel-routes'])
+
+        if len(config.list_nodes(base + ['resource-allocation'])) == 0:
+            config.delete(base + ['resource-allocation'])
+
+
 def migrate(config: ConfigTree) -> None:
     if not config.exists(['vpp']):
         # Nothing to do
@@ -571,3 +584,4 @@ def migrate(config: ConfigTree) -> None:
     _migrate_vpp_bridge_interface(config)
     _migrate_vpp_xconnect_interface(config)
     _migrate_vpp_vxlan_remove_vif(config)
+    _migrate_vpp_ignore_kernel_routes(config)