Infrastructure/fedora-infrastructure
3
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Update gather-diff-instances to handle a blacklist. Ticket 4190

Browse source
This commit is contained in:
Kevin Fenzi 2014-01-24 12:31:01 -07:00
parent 0ceb4089c1
commit 54d034a43c
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/gather-diff-instances/gather-diff-instances.py
View file

@ -5,10 +5,12 @@
# output to /var/log/instance-lists/timestamp # output to /var/log/instance-lists/timestamp
# compare newest one to the last one # compare newest one to the last one
# mail results to mailto, if any # mail results to mailto, if any
# ignore instances with a key_name in blacklist
destdir='/var/log/instance-lists/' destdir='/var/log/instance-lists/'
mailto='admin@fedoraproject.org' mailto='admin@fedoraproject.org'
blacklist=['buildsys']
import sys import sys
@ -79,6 +81,8 @@ def diff_instances(old, new):
uuids = set(new_uuids.keys() + old_uuids.keys()) uuids = set(new_uuids.keys() + old_uuids.keys())
ret = [] ret = []
ret_added = []
ret_removed = []
removed = [] removed = []
added = [] added = []
for uuid in sorted(uuids): for uuid in sorted(uuids):
@ -103,16 +107,19 @@ def diff_instances(old, new):
for k in changed: for k in changed:
ret.append(" %s changed from '%s' to '%s'" % (k, old_vm[k], new_vm[k])) ret.append(" %s changed from '%s' to '%s'" % (k, old_vm[k], new_vm[k]))
if added:
ret.append('Instance(s) Added:\n')
for vm in added: for vm in added:
ret.append(' %s %s %s %s' % (uuid, vm['display_name'], vm['floating_ips'][0], vm['key_name'])) if vm['key_name'] not in blacklist:
if removed: ret_added.append(' %s %s %s %s' % (uuid, vm['display_name'], vm['floating_ips'][0], vm['key_name']))
ret.append('Instance(s) Removed:\n') if ret_added:
for vm in removed: ret_added[:0].append('Instance(s) Added:\n')
if vm['floating_ips'][0]:
ret.append(' %s %s %s %s' % (uuid, vm['display_name'], vm['floating_ips'][0], vm['key_name']))
for vm in removed:
if vm['floating_ips'][0] and (vm['key_name'] not in blacklist):
ret_removed.append(' %s %s %s %s' % (uuid, vm['display_name'], vm['floating_ips'][0], vm['key_name']))
if ret_removed:
ret_removed[:0].append('Instance(s) Removed:\n')
ret = ret + ret_added + ret_removed
return ret return ret