Skip to content

Flush caches of VLAN object from new dp not old dp #4856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gizmoguy merged 1 commit into from
Oct 2, 2026
Merged

Flush caches of VLAN object from new dp not old dp #4856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions faucet/valve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,22 +449,24 @@ def add_vlans(self, vlans, cold_start=False):
ofmsgs.extend(self.add_vlan(vlan, cold_start=cold_start))
return ofmsgs

def del_vlan(self, vlan, dp_vlans):
def del_vlan(self, vlan, new_dp):
"""Delete a configured VLAN."""
self.logger.info("Delete VLAN %s" % vlan)
ofmsgs = []
for manager in self._managers:
ofmsgs.extend(manager.del_vlan(vlan, dp_vlans))
ofmsgs.extend(manager.del_vlan(vlan, new_dp.vlans.values()))
expired_hosts = list(vlan.dyn_host_cache.values())
for entry in expired_hosts:
self._update_expired_host(entry, vlan)
vlan.reset_caches()
new_vlan = new_dp.vlans.get(vlan.vid, None)
if new_vlan:
new_vlan.reset_caches()
return ofmsgs

def del_vlans(self, vlans, dp_vlans):
def del_vlans(self, vlans, new_dp):
ofmsgs = []
for vlan in vlans:
ofmsgs.extend(self.del_vlan(vlan, dp_vlans))
ofmsgs.extend(self.del_vlan(vlan, new_dp))
return ofmsgs

def _get_all_configured_port_nos(self):
Expand Down Expand Up @@ -1638,7 +1640,7 @@ def _apply_config_changes(self, new_dp, changes, valves=None):
ofmsgs.extend(self.ports_delete(changed_ports))
if deleted_vids:
deleted_vlans = [self.dp.vlans[vid] for vid in deleted_vids]
ofmsgs.extend(self.del_vlans(deleted_vlans, new_dp.vlans.values()))
ofmsgs.extend(self.del_vlans(deleted_vlans, new_dp))
# TODO: optimize for all meters being erased
if changed_meters:
# If a meter changed meter IDs, delete the old ID first and consider
Expand All @@ -1655,7 +1657,7 @@ def _apply_config_changes(self, new_dp, changes, valves=None):

if changed_vids:
changed_vlans = [self.dp.vlans[vid] for vid in changed_vids]
ofmsgs.extend(self.del_vlans(changed_vlans, new_dp.vlans.values()))
ofmsgs.extend(self.del_vlans(changed_vlans, new_dp))

self.dp_init(new_dp, valves)

Expand Down
Loading