Merge pull request #4987 from natali-rs1985/T8262

vpp: T8262: Refactor IPsec settings to use only 'ipsec-acceleration' flag

2 files changed, 10 insertions, 4 deletions

diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py
index b26388cdc..2634eae44 100755
--- a/src/conf_mode/vpp.py
+++ b/src/conf_mode/vpp.py
@@ -305,10 +305,6 @@ def get_config(config=None):
 
     config = config_dict_merge(default_values, config)
 
-    # Ignore default XML values if config doesn't exists
-    if not conf.exists(base_settings + ['ipsec']):
-        del config['settings']['ipsec']
-
     # add running config
     if effective_config:
         default_values_effective = conf.get_config_defaults(
diff --git a/src/migration-scripts/vpp/7-to-8 b/src/migration-scripts/vpp/7-to-8
index e6cff9668..1e95bb43e 100644
--- a/src/migration-scripts/vpp/7-to-8
+++ b/src/migration-scripts/vpp/7-to-8
@@ -18,6 +18,8 @@
 #
 # Move 'vpp nat44' and 'vpp settings nat44' to 'vpp nat nat44'.
 # Drop settings for nat workers (T8254)
+#
+# Delete 'ipsec' node and all settings and replace it with single 'ipsec-acceleration' flag (T8262)
 
 
 from vyos.configtree import ConfigTree
@@ -54,6 +56,13 @@ def _migrate_vpp_nat44(config: ConfigTree) -> None:
             config.copy(settings_path + ['timeout'], new_base_path + ['timeout'])
         config.delete(settings_path)
 
+def _migrate_vpp_ipsec(config: ConfigTree) -> None:
+    base = ['vpp', 'settings']
+
+    if config.exists(base + ['ipsec']):
+        config.set(base + ['ipsec-acceleration'])
+        config.delete(base + ['ipsec'])
+
 
 def migrate(config: ConfigTree) -> None:
     if not config.exists(['vpp']):
@@ -62,3 +71,4 @@ def migrate(config: ConfigTree) -> None:
 
     _migrate_vpp_log(config)
     _migrate_vpp_nat44(config)
+    _migrate_vpp_ipsec(config)