diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/vpp.py | 4 | ||||
| -rw-r--r-- | src/migration-scripts/vpp/5-to-6 | 14 |
2 files changed, 15 insertions, 3 deletions
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) |