External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-03 15:45:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Disallows disassociate of hubrid type instances from controlplane instance group

Browse Source 
Introduce new pattern for is_valid_removal

Makes disassociate error message a bit more dynamic
This commit is contained in:
Alex Corey
2022-03-21 13:12:44 -04:00
parent 1679102204
commit dc64168ed4
12 changed files with 77 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/main/tests/functional/api/test_instance_group.py
View File

@@ -301,3 +301,17 @@ def test_instance_group_unattach_from_instance(post, instance_group, node_type_i
assert new_activity.instance_group.first() == instance_group
else:
assert not new_activity
@pytest.mark.django_db
def test_cannot_remove_controlplane_hybrid_instances(post, controlplane_instance_group, node_type_instance, admin_user):
instance = node_type_instance(hostname='hybrid_node', node_type='hybrid')
controlplane_instance_group.instances.add(instance)
url = reverse('api:instance_group_instance_list', kwargs={'pk': controlplane_instance_group.pk})
r = post(url, {'disassociate': True, 'id': instance.id}, admin_user, expect=400)
assert 'Cannot disassociate hybrid node' in str(r.data)
url = reverse('api:instance_instance_groups_list', kwargs={'pk': instance.pk})
r = post(url, {'disassociate': True, 'id': controlplane_instance_group.id}, admin_user, expect=400)
assert f'Cannot disassociate hybrid instance' in str(r.data)