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

Make the peer validation more compact

Browse Source 
and reuse information.
This commit is contained in:
Jeff Bradberry
2024-01-25 10:57:51 -05:00
committed by Seth Foster
parent 8f22188116
commit f2417f0ed2
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
awx/api/serializers.py
View File

@@ -5667,36 +5667,29 @@ class InstanceSerializer(BaseSerializer):
if 'canonical_address_peers_from_control_nodes' in attrs: if 'canonical_address_peers_from_control_nodes' in attrs:
attrs['peers_from_control_nodes'] = attrs.pop('canonical_address_peers_from_control_nodes') attrs['peers_from_control_nodes'] = attrs.pop('canonical_address_peers_from_control_nodes')
def check_peers_changed():
'''
return True if
- 'peers' in attrs
- instance peers does not match peers in attrs
'''
return self.instance and 'peers' in attrs and set(self.instance.peers.all()) != set(attrs['peers'])
if not self.instance and not settings.IS_K8S: if not self.instance and not settings.IS_K8S:
raise serializers.ValidationError(_("Can only create instances on Kubernetes or OpenShift.")) raise serializers.ValidationError(_("Can only create instances on Kubernetes or OpenShift."))
if self.instance and self.instance.managed: if self.instance and 'peers' in attrs:
if check_peers_changed(): instance_addresses = set(self.instance.receptor_addresses.all())
raise serializers.ValidationError(_("Setting peers manually for managed nodes is not allowed.")) setting_peers = set(attrs['peers'])
peers_changed = set(self.instance.peers.all()) != setting_peers
if not settings.IS_K8S: if not settings.IS_K8S and peers_changed:
if check_peers_changed():
raise serializers.ValidationError(_("Cannot change peers.")) raise serializers.ValidationError(_("Cannot change peers."))
# cannot peer to self if self.instance.managed and peers_changed:
peers_ids = [p.id for p in attrs.get('peers', [])] raise serializers.ValidationError(_("Setting peers manually for managed nodes is not allowed."))
if self.instance and self.instance.receptor_addresses.filter(id__in=peers_ids).exists():
raise serializers.ValidationError(_("Instance cannot peer to its own address.")) # cannot peer to self
if instance_addresses & setting_peers:
raise serializers.ValidationError(_("Instance cannot peer to its own address."))
if self.instance and self.instance.receptor_addresses.all().exists():
instance_addresses = set(self.instance.receptor_addresses.all())
# cannot peer to an instance that is already peered to this instance # cannot peer to an instance that is already peered to this instance
for p in attrs.get('peers', []): if instance_addresses:
if set(p.instance.peers.all()) & instance_addresses: for p in setting_peers:
raise serializers.ValidationError(_(f"Instance {p.instance.hostname} is already peered to this instance.")) if set(p.instance.peers.all()) & instance_addresses:
raise serializers.ValidationError(_(f"Instance {p.instance.hostname} is already peered to this instance."))
# cannot peer to an instance more than once # cannot peer to an instance more than once
peers_instances = Counter(p.instance_id for p in attrs.get('peers', [])) peers_instances = Counter(p.instance_id for p in attrs.get('peers', []))