External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 11:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make group deletion free up the group name.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-08-14 14:55:54 -04:00
parent 038a1cfb95
commit c028b2fce8
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
awx/main/models/inventory.py
View File

@@ -43,8 +43,6 @@ __all__ = ['Inventory', 'Host', 'Group', 'InventorySource', 'InventoryUpdate']
logger = logging.getLogger('awx.main.models.inventory') logger = logging.getLogger('awx.main.models.inventory')
LETTERS = 'abcdefghijklmnopqrstuvwxyz'
class Inventory(CommonModel): class Inventory(CommonModel):
''' '''
@@ -593,10 +591,21 @@ class Group(CommonModelNameNotUnique):
for direct_child in group_children[group]: for direct_child in group_children[group]:
linked_children.append((group, direct_child)) linked_children.append((group, direct_child))
marked_groups.append(group) marked_groups.append(group)
Group.objects.filter(id__in=marked_groups).update(
active=False, # There is no good way to use a group name based on the old name
name='deleted_' + ''.join([random.choice(LETTERS) for i in range(0,50)]), # with Manager.update, so we must use a raw query to do so.
) cursor = connection.cursor()
cursor.execute("""
UPDATE "main_group"
SET "active" = false,
"name" = 'deleted_' || "name" || '{dt}'
WHERE "id" IN ({ids})
""".format(
dt=datetime.datetime.utcnow().strftime('%Y%m%dT%H%M%SZ'),
ids=','.join([str(i) for i in marked_groups]),
))
# Update related items.
Host.objects.filter(id__in=marked_hosts).update(active=False) Host.objects.filter(id__in=marked_hosts).update(active=False)
Group.parents.through.objects.filter(to_group__id__in=marked_groups) Group.parents.through.objects.filter(to_group__id__in=marked_groups)
Group.hosts.through.objects.filter(group__id__in=marked_groups) Group.hosts.through.objects.filter(group__id__in=marked_groups)
@@ -948,18 +957,22 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
self.inventory = self.group.inventory self.inventory = self.group.inventory
if 'inventory' not in update_fields: if 'inventory' not in update_fields:
update_fields.append('inventory') update_fields.append('inventory')
# Set name automatically.
# Set the name automatically.
# Since the name isn't user-visible, we just set the name to the
# inventory name and the group ID, which is guaranteed never to have
# a conflict.
replace_text = '__replace_%s__' % now() replace_text = '__replace_%s__' % now()
old_name_re = re.compile(r'^inventory_source \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*?$') old_name_re = re.compile(r'^inventory_source \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*?$')
if not self.name or old_name_re.match(self.name): if not self.name or old_name_re.match(self.name):
if self.inventory and self.group: if self.inventory and self.group:
self.name = '%s (%s)' % (self.group.name, self.inventory.name) self.name = '%s: group %d' % (self.inventory.name, self.group.id)
elif self.inventory and self.pk: elif self.inventory and self.pk:
self.name = '%s (%s)' % (self.inventory.name, self.pk) self.name = '%s: inventory source %d' % (self.inventory.name, self.pk)
elif self.inventory: elif self.inventory:
self.name = '%s (%s)' % (self.inventory.name, replace_text) self.name = '%s (%s)' % (self.inventory.name, replace_text)
elif self.pk: elif self.pk:
self.name = 'inventory source (%s)' % self.pk self.name = 'inventory source %d' % self.pk
else: else:
self.name = 'inventory source (%s)' % replace_text self.name = 'inventory source (%s)' % replace_text
if 'name' not in update_fields: if 'name' not in update_fields: