Skip to content

CLOUDSTACK-10217: Clean up old MAC addresses from DHCP lease file #2393

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
Jan 9, 2018
Merged

CLOUDSTACK-10217: Clean up old MAC addresses from DHCP lease file #2393

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
12 changes: 9 additions & 3 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 @@ -25,12 +25,18 @@ def merge(dbag, data):
if data['ipv4_address'] in dbag:
del(dbag[data['ipv4_address']])
else:
remove_key = None
remove_keys = set()
for key, entry in dbag.iteritems():
if key != 'id' and entry['host_name'] == data['host_name']:
remove_key = key
remove_keys.add(key)
break
if remove_key is not None:

for key, entry in dbag.iteritems():
if key != 'id' and entry['mac_address'] == data['mac_address']:
remove_keys.add(key)
break

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

dbag[data['ipv4_address']] = data
Expand Down