SERVER-120782: Move server-networking-and-observability files to subdirectory (#49044)

GitOrigin-RevId: 8c9416d67128f9189129a9a3b4f355116cd4a239
2026-03-06 10:20:11 -08:00
parent 4985f22d8c
commit f19b327000
27 changed files with 38 additions and 30 deletions
--- a/jstests/auth/authentication_restrictions.js
+++ b/jstests/auth/authentication_restrictions.js
@@ -2,7 +2,7 @@
 * This test checks that authentication restrictions can be set and respected.
 * @tags: [requires_sharding, requires_replication]
 */
-import {get_ipaddr, getIpv6addr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr, getIpv6addr} from "jstests/libs/network/host_ipaddr.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";

--- a/jstests/auth/authentication_restrictions_role.js
+++ b/jstests/auth/authentication_restrictions_role.js
@@ -2,7 +2,7 @@
 * This test checks that authentication restrictions can be set on roles and respected.
 * @tags: [requires_replication, requires_sharding]
 */
-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";

--- a/jstests/auth/client_source_authentication_restriction_mode.js
+++ b/jstests/auth/client_source_authentication_restriction_mode.js
@@ -1,7 +1,7 @@
 // Test that authentication restrictions can be applied on origin clients or direct peers using
 // the clientSourceAuthenticationRestrictionMode server parameter.

-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {isLinux} from "jstests/libs/os_helpers.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";
 import {ProxyProtocolServer} from "jstests/sharding/libs/proxy_protocol.js";
--- a/jstests/auth/localhostAuthBypass.js
+++ b/jstests/auth/localhostAuthBypass.js
@@ -2,7 +2,7 @@
 //
 // This test is to ensure that localhost authentication works correctly against a standalone
 // mongod whether it is hosted with "localhost" or a hostname.
-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";

 let baseName = "auth_server-6591";
 let dbpath = MongoRunner.dataPath + baseName;
--- a/jstests/libs/OWNERS.yml
+++ b/jstests/libs/OWNERS.yml
@@ -66,12 +66,6 @@ filters:
  - "mochalite.js":
    approvers:
      - 10gen/devprod-correctness
-  - "mirror_reads_helpers.js":
-    approvers:
-      - 10gen/server-networking-and-observability
-  - "conn_pool_helpers.js":
-    approvers:
-      - 10gen/server-networking-and-observability
  - "pause_after_populate.js":
    approvers:
      - 10gen/query-optimization
@@ -96,9 +90,6 @@ filters:
  - "replicated_record_ids_utils.js":
    approvers:
      - 10gen/server-storage-engine-integration
-  - "host_ipaddr.js":
-    approvers:
-      - 10gen/server-networking-and-observability
  - "feature_compatibility_version.js":
    approvers:
      - 10gen/server-catalog-and-routing-routing-and-topology
--- a/jstests/libs/network/BUILD.bazel
+++ b/jstests/libs/network/BUILD.bazel
@@ -0,0 +1,12 @@
+load("//bazel:mongo_js_rules.bzl", "all_subpackage_javascript_files", "mongo_js_library")
+
+package(default_visibility = ["//visibility:public"])
+
+mongo_js_library(
+    name = "all_javascript_files",
+    srcs = glob([
+        "*.js",
+    ]),
+)
+
+all_subpackage_javascript_files()
--- a/jstests/libs/network/OWNERS.yml
+++ b/jstests/libs/network/OWNERS.yml
@@ -0,0 +1,5 @@
+version: 2.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/server-networking-and-observability
--- a/jstests/libs/network/conn_pool_helpers.js
+++ b/jstests/libs/network/conn_pool_helpers.js
--- a/jstests/libs/network/host_ipaddr.js
+++ b/jstests/libs/network/host_ipaddr.js
--- a/jstests/libs/network/mirror_reads_helpers.js
+++ b/jstests/libs/network/mirror_reads_helpers.js
--- a/jstests/noPassthrough/admission/ingress_request_rate_limiter_ip_exemption.js
+++ b/jstests/noPassthrough/admission/ingress_request_rate_limiter_ip_exemption.js
@@ -3,7 +3,7 @@
 * @tags: [requires_fcv_80]
 */

-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {
    authenticateConnection,
    getRateLimiterStats,
--- a/jstests/noPassthrough/network/configure_mirroring_connpool.js
+++ b/jstests/noPassthrough/network/configure_mirroring_connpool.js
@@ -4,7 +4,7 @@
 * ]
 */

-import {assertHasConnPoolStats, launchFinds} from "jstests/libs/conn_pool_helpers.js";
+import {assertHasConnPoolStats, launchFinds} from "jstests/libs/network/conn_pool_helpers.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";

 const kDbName = "test";
--- a/jstests/noPassthrough/network/connection_establishment_rate_limiting_exemptions.js
+++ b/jstests/noPassthrough/network/connection_establishment_rate_limiting_exemptions.js
@@ -8,7 +8,7 @@
 * ]
 */

-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {
    getConnectionStats,
    runTestReplSet,
--- a/jstests/noPassthrough/network/connection_establishment_rate_limiting_proxy_protocol.js
+++ b/jstests/noPassthrough/network/connection_establishment_rate_limiting_proxy_protocol.js
@@ -12,7 +12,7 @@ if (_isWindows()) {
    quit();
 }

-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {ProxyProtocolServer} from "jstests/sharding/libs/proxy_protocol.js";

--- a/jstests/noPassthrough/network/drop_connections_replSet.js
+++ b/jstests/noPassthrough/network/drop_connections_replSet.js
@@ -9,7 +9,7 @@ import {
    assertHasConnPoolStats,
    checkHostHasNoOpenConnections,
    checkHostHasOpenConnections,
-} from "jstests/libs/conn_pool_helpers.js";
+} from "jstests/libs/network/conn_pool_helpers.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";

 const rst = new ReplSetTest({nodes: 3});
--- a/jstests/noPassthrough/network/drop_connections_sharded.js
+++ b/jstests/noPassthrough/network/drop_connections_sharded.js
@@ -10,7 +10,7 @@ import {
    assertHasConnPoolStats,
    checkHostHasNoOpenConnections,
    checkHostHasOpenConnections,
-} from "jstests/libs/conn_pool_helpers.js";
+} from "jstests/libs/network/conn_pool_helpers.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";

 const st = new ShardingTest({
--- a/jstests/noPassthrough/network/max_conns_different_ips_proxy_protocol.js
+++ b/jstests/noPassthrough/network/max_conns_different_ips_proxy_protocol.js
@@ -12,7 +12,7 @@ if (_isWindows()) {
    quit();
 }

-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {ProxyProtocolServer} from "jstests/sharding/libs/proxy_protocol.js";

--- a/jstests/noPassthrough/network/max_conns_override.js
+++ b/jstests/noPassthrough/network/max_conns_override.js
@@ -8,7 +8,7 @@
 * ]
 */
 import {FeatureFlagUtil} from "jstests/libs/feature_flag_util.js";
-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";
 import {ProxyProtocolServer} from "jstests/sharding/libs/proxy_protocol.js";
 import {MaxConnsOverrideHelpers} from "jstests/noPassthrough/libs/max_conns_override_helpers.js";
--- a/jstests/noPassthrough/network/max_conns_override_priority_port.js
+++ b/jstests/noPassthrough/network/max_conns_override_priority_port.js
@@ -10,7 +10,7 @@
 * ]
 */
 import {MaxConnsOverrideHelpers} from "jstests/noPassthrough/libs/max_conns_override_helpers.js";
-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";

 const kConfiguredMaxConns = 5;
--- a/jstests/noPassthrough/network/mirror_reads.js
+++ b/jstests/noPassthrough/network/mirror_reads.js
@@ -8,7 +8,7 @@
 */

 import {FeatureFlagUtil} from "jstests/libs/feature_flag_util.js";
-import {MirrorReadsHelpers} from "jstests/libs/mirror_reads_helpers.js";
+import {MirrorReadsHelpers} from "jstests/libs/network/mirror_reads_helpers.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";

 const kDbName = "mirrored_reads_test";
--- a/jstests/noPassthrough/network/priority_port_connection_enstablishment_rate_limiting_exemption.js
+++ b/jstests/noPassthrough/network/priority_port_connection_enstablishment_rate_limiting_exemption.js
@@ -14,7 +14,7 @@
 import {before, describe, it} from "jstests/libs/mochalite.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";
-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";

 describe("Tests for priority port exemption from connection (session) establishment rate limiter within JS test replica set and sharded cluster helpers", function () {
    this.nonExemptIP = get_ipaddr();
--- a/jstests/noPassthrough/network/set_step_params.js
+++ b/jstests/noPassthrough/network/set_step_params.js
@@ -2,7 +2,7 @@
 * @tags: [requires_replication, requires_sharding, sets_replica_set_matching_strategy]
 */

-import {assertHasConnPoolStats, launchFinds} from "jstests/libs/conn_pool_helpers.js";
+import {assertHasConnPoolStats, launchFinds} from "jstests/libs/network/conn_pool_helpers.js";
 import {configureFailPointForRS} from "jstests/libs/fail_point_util.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";

--- a/jstests/noPassthrough/network/targeted_mirror_reads.js
+++ b/jstests/noPassthrough/network/targeted_mirror_reads.js
@@ -9,7 +9,7 @@
 * ]
 */

-import {MirrorReadsHelpers} from "jstests/libs/mirror_reads_helpers.js";
+import {MirrorReadsHelpers} from "jstests/libs/network/mirror_reads_helpers.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";
 import {configureFailPoint} from "jstests/libs/fail_point_util.js";

--- a/jstests/replsets/localhostAuthBypass.js
+++ b/jstests/replsets/localhostAuthBypass.js
@@ -8,7 +8,7 @@ let keyfile = "jstests/libs/key1";
 let username = "foo";
 let password = "bar";

-import {get_ipaddr} from "jstests/libs/host_ipaddr.js";
+import {get_ipaddr} from "jstests/libs/network/host_ipaddr.js";
 import {ReplSetTest} from "jstests/libs/replsettest.js";

 let createUser = function (mongo) {
--- a/jstests/sharding/conn_pool_stats.js
+++ b/jstests/sharding/conn_pool_stats.js
@@ -8,7 +8,7 @@
 *   requires_fcv_83,
 * ]
 */
-import {assertHasConnPoolStats, launchFinds} from "jstests/libs/conn_pool_helpers.js";
+import {assertHasConnPoolStats, launchFinds} from "jstests/libs/network/conn_pool_helpers.js";
 import {configureFailPoint, configureFailPointForRS} from "jstests/libs/fail_point_util.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";

--- a/jstests/ssl/client_x509_rotate.js
+++ b/jstests/ssl/client_x509_rotate.js
@@ -4,7 +4,7 @@ import {
    assertHasConnPoolStats,
    checkHostHasNoOpenConnections,
    checkHostHasOpenConnections,
-} from "jstests/libs/conn_pool_helpers.js";
+} from "jstests/libs/network/conn_pool_helpers.js";
 import {ShardingTest} from "jstests/libs/shardingtest.js";
 import {copyCertificateFile} from "jstests/ssl/libs/ssl_helpers.js";

--- a/jstests/with_mongot/mongotmock/configure_mongot_connpool.js
+++ b/jstests/with_mongot/mongotmock/configure_mongot_connpool.js
@@ -6,7 +6,7 @@
 * ]
 */

-import {assertHasConnPoolStats} from "jstests/libs/conn_pool_helpers.js";
+import {assertHasConnPoolStats} from "jstests/libs/network/conn_pool_helpers.js";
 import {Thread} from "jstests/libs/parallelTester.js";
 import {getUUIDFromListCollections} from "jstests/libs/uuid_util.js";
 import {