Skip to content

CLOUDSTACK-9500: remove the IP from the databag if it is not used #1706

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

Closed
vilisseranen wants to merge 1 commit into from
Closed

CLOUDSTACK-9500: remove the IP from the databag if it is not used #1706

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions systemvm/patches/debian/config/opt/cloud/bin/cs_forwardingrules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ def merge(dbag, rules):
print "removing index %s" % str(index)
if not index == -1:
del dbag[source_ip][index]
# If all forwarding rules have been deleted
# remove IP from databag
if dbag[source_ip] == []:
del dbag[source_ip]

return dbag

Expand Down
3 changes: 2 additions & 1 deletion systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def merge(dbag, ip):
ip['nw_type'] = 'public'
if ip['nw_type'] == 'control':
dbag['eth' + str(ip['nic_dev_id'])] = [ip]
else:
# if ip['add'] is false, the IP will be removed from the databag
elif ip['add']:
dbag.setdefault('eth' + str(ip['nic_dev_id']), []).append(ip)

return dbag