linmter

Author: nammn

docker/mongodb-kubernetes-tests/kubetester/kubetester.py

@@ -1334,7 +1334,7 @@ def yield_existing_csrs(csr_names, timeout=300):
         return yield_existing_csrs(csr_names, timeout)
 
     @staticmethod
-    def get_populated_mongo_client(hosts: list[str], ssl: bool = False) -> pymongo.MongoClient:
+    def get_connected_mongo_client(hosts: list[str], ssl: bool = False) -> pymongo.MongoClient:
         mongodburi = KubernetesTester.build_mongodb_uri_for_rs(hosts)
         options = {}
         if ssl:
@@ -1353,9 +1353,7 @@ def get_replica_set_secondaries(client: pymongo.MongoClient) -> list:
         Prefer this over client.secondaries, which relies on pymongo's async topology
         discovery and may return an incomplete result immediately after connecting.
         """
-        status = client.admin.command(
-            "replSetGetStatus", read_preference=pymongo.ReadPreference.PRIMARY
-        )
+        status = client.admin.command("replSetGetStatus", read_preference=pymongo.ReadPreference.PRIMARY)
         return [m for m in status["members"] if m["stateStr"] == "SECONDARY" and m["health"] == 1]
 
     def _get_pods(self, podname, qty=3):

docker/mongodb-kubernetes-tests/tests/multicluster_shardedcluster/multi_cluster_sharded_geo_sharding.py

@@ -149,5 +149,5 @@ def test_assert_shard_primary_replicas(self, sc: MongoDB):
         }
         for shard_idx, cluster_idx in cluster_primary_member_mapping.items():
             shard_primary_hostname = sc.shard_hostname(shard_idx, 0, cluster_idx)
-            client = KubernetesTester.get_populated_mongo_client(hosts=[shard_primary_hostname])
+            client = KubernetesTester.get_connected_mongo_client(hosts=[shard_primary_hostname])
             assert client.is_primary

docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_pv.py

@@ -91,7 +91,7 @@ def test_replica_set_was_configured(self):
         "Should connect to one of the mongods and check the replica set was correctly configured."
         hosts = ["rs001-pv-{}.rs001-pv-svc.{}.svc.cluster.local:27017".format(i, self.namespace) for i in range(3)]
 
-        client = self.get_populated_mongo_client(hosts=hosts)
+        client = self.get_connected_mongo_client(hosts=hosts)
 
         assert client.primary is not None
         assert len(KubernetesTester.get_replica_set_secondaries(client)) == 2

docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster.py

@@ -130,7 +130,7 @@ def test_both_shards_are_configured(self, sc: MongoDB):
                     hosts.append(hostname)
 
             logger.debug(f"Checking for connectivity of hosts: {hosts}")
-            client = KubernetesTester.get_populated_mongo_client(hosts=hosts)
+            client = KubernetesTester.get_connected_mongo_client(hosts=hosts)
             assert client.primary is not None
             assert len(KubernetesTester.get_replica_set_secondaries(client)) == 2
 

docker/mongodb-kubernetes-tests/tests/shardedcluster/sharded_cluster_pv.py

@@ -96,7 +96,7 @@ def test_shard0_was_configured(self, sc: MongoDB):
                 hostname = sc.shard_hostname(0, member_idx, cluster_member_client.cluster_index)
                 hosts.append(hostname)
 
-        client = KubernetesTester.get_populated_mongo_client(hosts=hosts)
+        client = KubernetesTester.get_connected_mongo_client(hosts=hosts)
 
         assert client.primary is not None
         assert len(KubernetesTester.get_replica_set_secondaries(client)) == 2