Skip to content

VR: fix expunging vm will remove dhcp entries of another vm in VR #4627

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
yadvr merged 1 commit into from
Feb 5, 2021
Merged

VR: fix expunging vm will remove dhcp entries of another vm in VR #4627

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
5 changes: 1 addition & 4 deletions systemvm/debian/opt/cloud/bin/cs_dhcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@ def merge(dbag, data):
else:
remove_keys = set()
for key, entry in dbag.iteritems():
if key != 'id' and entry['mac_address'] == data['mac_address']:
if key != 'id' and entry['mac_address'] == data['mac_address'] and data['remove']:
remove_keys.add(key)
break

if data['remove'] and key not in remove_keys:
remove_keys.add(key)

for remove_key in remove_keys:
del(dbag[remove_key])

Expand Down