From 2d77dd6767fce37a49cfd7a3c9cea4c676799aca Mon Sep 17 00:00:00 2001
From: Julius Park <Juliusgeo@gmail.com>
Date: Thu, 17 Feb 2022 14:23:37 -0800
Subject: [PATCH 1/2] PYTHON-3088 [v3.13] Update load balancer tests to support
 dedicated load balancer port (#870) (cherry picked from commit 341d489)

---
 .evergreen/config.yml | 6 +++++-
 pymongo/pool.py       | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 9bfd57c805..5abdad061a 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1937,6 +1937,10 @@ axes:
         display_name: "MongoDB latest"
         variables:
           VERSION: "latest"
+      - id: "rapid"
+        display_name: "MongoDB rapid"
+        variables:
+          VERSION: "rapid"
 
   # Choice of Python runtime version
   - id: python-version
@@ -2636,7 +2640,7 @@ buildvariants:
 - matrix_name: "load-balancer"
   matrix_spec:
     platform: ubuntu-18.04
-    mongodb-version: ["5.0", "latest"]
+    mongodb-version: ["rapid", "latest"]
     auth-ssl: "*"
     python-version: "*"
     loadbalancer: "*"
diff --git a/pymongo/pool.py b/pymongo/pool.py
index 4750163718..c7bd21fc8f 100644
--- a/pymongo/pool.py
+++ b/pymongo/pool.py
@@ -630,8 +630,6 @@ def _hello(self, cluster_time, topology_version, heartbeat_frequency):
             auth_ctx = None
 
         doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable)
-        if not self.opts.load_balanced:
-            doc.pop("serviceId", None)
         hello = Hello(doc, awaitable=awaitable)
         self.is_writable = hello.is_writable
         self.max_wire_version = hello.max_wire_version
@@ -676,9 +674,6 @@ def _next_reply(self):
         unpacked_docs = reply.unpack_response()
         response_doc = unpacked_docs[0]
         helpers._check_command_response(response_doc, self.max_wire_version)
-        # Remove after PYTHON-2712.
-        if not self.opts.load_balanced:
-            response_doc.pop("serviceId", None)
         return response_doc
 
     def command(

From 0f73cfe909a576d23fed18e5daec041e045f608d Mon Sep 17 00:00:00 2001
From: julius <juliusgeo@gmail.com>
Date: Tue, 22 Feb 2022 11:24:44 -0800
Subject: [PATCH 2/2] add in additional changes

---
 .evergreen/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 5abdad061a..2e3c12f3f8 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1714,12 +1714,9 @@ tasks:
       commands:
         - func: "bootstrap mongo-orchestration"
           vars:
-            VERSION: "latest"
             TOPOLOGY: "sharded_cluster"
             LOAD_BALANCER: true
         - func: "run load-balancer"
-          vars:
-            LOAD_BALANCER: true
         - func: "run tests"
 
     - name: "test-fips-standalone"