External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-06 18:49:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Move inventory delete activity stream into view

Browse Source
This commit is contained in:
Aaron Tan
2017-08-03 17:55:34 -04:00
parent 278e0335ca
commit bba1e46218
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,11 +378,13 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin):
@transaction.atomic @transaction.atomic
def schedule_deletion(self, user_id=None): def schedule_deletion(self, user_id=None):
from awx.main.tasks import delete_inventory from awx.main.tasks import delete_inventory
from awx.main.signals import activity_stream_delete
if self.pending_deletion is True: if self.pending_deletion is True:
raise RuntimeError("Inventory is already pending deletion.") raise RuntimeError("Inventory is already pending deletion.")
self.pending_deletion = True self.pending_deletion = True
self.save(update_fields=['pending_deletion']) self.save(update_fields=['pending_deletion'])
self.jobtemplates.clear() self.jobtemplates.clear()
activity_stream_delete(Inventory, self, inventory_delete_flag=True)
self.websocket_emit_status('pending_deletion') self.websocket_emit_status('pending_deletion')
delete_inventory.delay(self.pk, user_id) delete_inventory.delay(self.pk, user_id)

6
awx/main/signals.py
View File

@@ -434,6 +434,12 @@ def activity_stream_delete(sender, instance, **kwargs):
# Skip recording any inventory source directly associated with a group. # Skip recording any inventory source directly associated with a group.
if isinstance(instance, InventorySource) and instance.deprecated_group: if isinstance(instance, InventorySource) and instance.deprecated_group:
return return
# Inventory delete happens in the task system rather than request-response-cycle.
# If we trigger this handler there we may fall into db-integrity-related race conditions.
# So we add flag verification to prevent normal signal handling. This funciton will be
# explicitly called with flag on in Inventory.schedule_deletion.
if isinstance(instance, Inventory) and not kwargs.get('inventory_delete_flag', False):
return
changes = model_to_dict(instance) changes = model_to_dict(instance)
object1 = camelcase_to_underscore(instance.__class__.__name__) object1 = camelcase_to_underscore(instance.__class__.__name__)
activity_entry = ActivityStream( activity_entry = ActivityStream(

11
awx/main/tests/functional/api/test_inventory.py
View File

@@ -5,7 +5,7 @@ from django.core.exceptions import ValidationError
from awx.api.versioning import reverse from awx.api.versioning import reverse
from awx.main.models import InventorySource, Inventory from awx.main.models import InventorySource, Inventory, ActivityStream
import json import json
@@ -23,10 +23,10 @@ def scm_inventory(inventory, project):
def factory_scm_inventory(inventory, project): def factory_scm_inventory(inventory, project):
def fn(**kwargs): def fn(**kwargs):
with mock.patch('awx.main.models.unified_jobs.UnifiedJobTemplate.update'): with mock.patch('awx.main.models.unified_jobs.UnifiedJobTemplate.update'):
return inventory.inventory_sources.create(source_project=project, return inventory.inventory_sources.create(source_project=project,
overwrite_vars=True, overwrite_vars=True,
source='scm', source='scm',
scm_last_revision=project.scm_revision, scm_last_revision=project.scm_revision,
**kwargs) **kwargs)
return fn return fn
@@ -83,6 +83,7 @@ def test_async_inventory_deletion(delete, get, inventory, alice):
inventory.admin_role.members.add(alice) inventory.admin_role.members.add(alice)
resp = delete(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice) resp = delete(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice)
assert resp.status_code == 202 assert resp.status_code == 202
assert ActivityStream.objects.filter(operation='delete').exists()
resp = get(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice) resp = get(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice)
assert resp.status_code == 200 assert resp.status_code == 200
@@ -389,7 +390,7 @@ class TestControlledBySCM:
def test_adding_inv_src_ok(self, post, scm_inventory, admin_user): def test_adding_inv_src_ok(self, post, scm_inventory, admin_user):
post(reverse('api:inventory_inventory_sources_list', kwargs={'version': 'v2', 'pk': scm_inventory.id}), post(reverse('api:inventory_inventory_sources_list', kwargs={'version': 'v2', 'pk': scm_inventory.id}),
{'name': 'new inv src', 'update_on_project_update': False, 'source': 'scm', 'overwrite_vars': True}, {'name': 'new inv src', 'update_on_project_update': False, 'source': 'scm', 'overwrite_vars': True},
admin_user, expect=201) admin_user, expect=201)
def test_adding_inv_src_prohibited(self, post, scm_inventory, project, admin_user): def test_adding_inv_src_prohibited(self, post, scm_inventory, project, admin_user):