summaryrefslogtreecommitdiff
path: root/src/migration-scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/migration-scripts')
-rw-r--r--src/migration-scripts/vpp/5-to-613
1 files changed, 13 insertions, 0 deletions
diff --git a/src/migration-scripts/vpp/5-to-6 b/src/migration-scripts/vpp/5-to-6
index a816bb536..34a2b54a0 100644
--- a/src/migration-scripts/vpp/5-to-6
+++ b/src/migration-scripts/vpp/5-to-6
@@ -51,6 +51,7 @@
#
# Migrate xconnect interface from vpp section to 'interfaces vpp xconnect' (T8328)
#
+# Remove vif option from vxlan interface (T8340)
from vyos.configtree import ConfigTree
@@ -536,6 +537,17 @@ def _migrate_vpp_xconnect_interface(config: ConfigTree) -> None:
config.delete(['vpp', 'interfaces'])
+def _migrate_vpp_vxlan_remove_vif(config: ConfigTree) -> None:
+ base = ['interfaces', 'vpp', 'vxlan']
+
+ if not config.exists(base):
+ return
+
+ for ifname in config.list_nodes(base):
+ if config.exists(base + [ifname, 'vif']):
+ config.delete(base + [ifname, 'vif'])
+
+
def migrate(config: ConfigTree) -> None:
if not config.exists(['vpp']):
# Nothing to do
@@ -558,3 +570,4 @@ def migrate(config: ConfigTree) -> None:
_migrate_vpp_gre_interface(config)
_migrate_vpp_bridge_interface(config)
_migrate_vpp_xconnect_interface(config)
+ _migrate_vpp_vxlan_remove_vif(config)