ipng/vppcfg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove sub-ints before VXLANs. Report on interfaces thare are deleted before their addresses are.

Browse Source
This commit is contained in:
Pim van Pelt
2022-03-25 23:20:57 +00:00
parent 661c7fc16c
commit d5a7c59f4e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vpp/reconciler.py
View File

@ -66,12 +66,12 @@ class Reconciler():
if not self.prune_l2xcs(): if not self.prune_l2xcs():
self.logger.warning("Could not prune L2 Cross Connects from VPP") self.logger.warning("Could not prune L2 Cross Connects from VPP")
ret = False ret = False
if not self.prune_vxlan_tunnels():
self.logger.warning("Could not prune VXLAN Tunnels from VPP")
ret = False
if not self.prune_sub_interfaces(): if not self.prune_sub_interfaces():
self.logger.warning("Could not prune sub-interfaces from VPP") self.logger.warning("Could not prune sub-interfaces from VPP")
ret = False ret = False
if not self.prune_vxlan_tunnels():
self.logger.warning("Could not prune VXLAN Tunnels from VPP")
ret = False
if not self.prune_bondethernets(): if not self.prune_bondethernets():
self.logger.warning("Could not prune BondEthernets from VPP") self.logger.warning("Could not prune BondEthernets from VPP")
ret = False ret = False

2
vpp/vppapi.py
View File

@ -121,6 +121,8 @@ class VPPApi():
iface = self.config['interface_names'][ifname] iface = self.config['interface_names'][ifname]
del self.config['interfaces'][iface.sw_if_index] del self.config['interfaces'][iface.sw_if_index]
if len(self.config['interface_addresses'][iface.sw_if_index]) > 0:
self.logger.warning("Not all addresses were removed on %s" % ifname)
del self.config['interface_addresses'][iface.sw_if_index] del self.config['interface_addresses'][iface.sw_if_index]
del self.config['interface_names'][ifname] del self.config['interface_names'][ifname]