From 92c693f14ea9e2d9e766809ef8e9d65eba645475 Mon Sep 17 00:00:00 2001
From: Jeff Bradberry <jeff.bradberry@gmail.com>
Date: Thu, 25 Jan 2024 11:00:41 -0500
Subject: [PATCH] Break out peer validation into its own method

---
 awx/api/serializers.py | 55 ++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index a2ecafd3a2..6de8f65752 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -5670,32 +5670,6 @@ class InstanceSerializer(BaseSerializer):
         if not self.instance and not settings.IS_K8S:
             raise serializers.ValidationError(_("Can only create instances on Kubernetes or OpenShift."))
 
-        if self.instance and 'peers' in attrs:
-            instance_addresses = set(self.instance.receptor_addresses.all())
-            setting_peers = set(attrs['peers'])
-            peers_changed = set(self.instance.peers.all()) != setting_peers
-
-            if not settings.IS_K8S and peers_changed:
-                raise serializers.ValidationError(_("Cannot change peers."))
-
-            if self.instance.managed and peers_changed:
-                raise serializers.ValidationError(_("Setting peers manually for managed nodes is not allowed."))
-
-            # cannot peer to self
-            if instance_addresses & setting_peers:
-                raise serializers.ValidationError(_("Instance cannot peer to its own address."))
-
-            # cannot peer to an instance that is already peered to this instance
-            if instance_addresses:
-                for p in setting_peers:
-                    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
-        peers_instances = Counter(p.instance_id for p in attrs.get('peers', []))
-        if any(count > 1 for count in peers_instances.values()):
-            raise serializers.ValidationError(_("Cannot peer to the same instance more than once."))
-
         # cannot enable peers_from_control_nodes if listener_port is not set
         if attrs.get('peers_from_control_nodes'):
             port = attrs.get('listener_port', -1)  # -1 denotes missing, None denotes explicit null
@@ -5750,6 +5724,35 @@ class InstanceSerializer(BaseSerializer):
                 raise serializers.ValidationError(_("Cannot change listener port for managed nodes."))
         return value
 
+    def validate_peers(self, value):
+        # cannot peer to an instance more than once
+        peers_instances = Counter(p.instance_id for p in value)
+        if any(count > 1 for count in peers_instances.values()):
+            raise serializers.ValidationError(_("Cannot peer to the same instance more than once."))
+
+        if self.instance:
+            instance_addresses = set(self.instance.receptor_addresses.all())
+            setting_peers = set(value)
+            peers_changed = set(self.instance.peers.all()) != setting_peers
+
+            if not settings.IS_K8S and peers_changed:
+                raise serializers.ValidationError(_("Cannot change peers."))
+
+            if self.instance.managed and peers_changed:
+                raise serializers.ValidationError(_("Setting peers manually for managed nodes is not allowed."))
+
+            # cannot peer to self
+            if instance_addresses & setting_peers:
+                raise serializers.ValidationError(_("Instance cannot peer to its own address."))
+
+            # cannot peer to an instance that is already peered to this instance
+            if instance_addresses:
+                for p in setting_peers:
+                    if set(p.instance.peers.all()) & instance_addresses:
+                        raise serializers.ValidationError(_(f"Instance {p.instance.hostname} is already peered to this instance."))
+
+        return value
+
 
 class InstanceHealthCheckSerializer(BaseSerializer):
     class Meta: