diff options
| -rw-r--r-- | interface-definitions/vpp_interface_vxlan.xml.in | 1 | ||||
| -rw-r--r-- | src/migration-scripts/vpp/5-to-6 | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/interface-definitions/vpp_interface_vxlan.xml.in b/interface-definitions/vpp_interface_vxlan.xml.in index 2d0ae42ab..9ba90e2a0 100644 --- a/interface-definitions/vpp_interface_vxlan.xml.in +++ b/interface-definitions/vpp_interface_vxlan.xml.in @@ -25,7 +25,6 @@ #include <include/vni.xml.i> #include <include/interface/address-ipv4-ipv6.xml.i> #include <include/interface/mtu-68-16000.xml.i> - #include <include/vpp/vif.xml.i> </children> </tagNode> </children> 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) |