summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/sharding_initialization_mongod_test.cpp
diff options
context:
space:
mode:
authorBen Caimano <ben.caimano@10gen.com>2020-10-20 22:12:53 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-10-26 16:38:32 +0000
commit0c09bf00d7fdadc80215f7cd4829271c2e6a0dc8 (patch)
tree8aa874228884509b62849d59e8b0b7c4267e62db /src/mongo/db/s/sharding_initialization_mongod_test.cpp
parent051ad2e47f7ce1f5b76d89b65515c23777791919 (diff)
downloadmongo-0c09bf00d7fdadc80215f7cd4829271c2e6a0dc8.tar.gz
SERVER-50508 Rename ConnectionType::MASTER to ConnectionType::kStandalone
Diffstat (limited to 'src/mongo/db/s/sharding_initialization_mongod_test.cpp')
-rw-r--r--src/mongo/db/s/sharding_initialization_mongod_test.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mongo/db/s/sharding_initialization_mongod_test.cpp b/src/mongo/db/s/sharding_initialization_mongod_test.cpp
index a724a245f84..44b90529a89 100644
--- a/src/mongo/db/s/sharding_initialization_mongod_test.cpp
+++ b/src/mongo/db/s/sharding_initialization_mongod_test.cpp
@@ -172,7 +172,7 @@ TEST_F(ShardingInitializationMongoDTest, ValidShardIdentitySucceeds) {
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
@@ -189,7 +189,7 @@ TEST_F(ShardingInitializationMongoDTest, InitWhilePreviouslyInErrorStateWillStay
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
@@ -222,7 +222,7 @@ TEST_F(ShardingInitializationMongoDTest, InitializeAgainWithMatchingShardIdentit
auto clusterID = OID::gen();
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(clusterID);
@@ -230,7 +230,7 @@ TEST_F(ShardingInitializationMongoDTest, InitializeAgainWithMatchingShardIdentit
ShardIdentityType shardIdentity2;
shardIdentity2.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity2.setShardName(kShardName);
shardIdentity2.setClusterId(clusterID);
@@ -255,7 +255,7 @@ TEST_F(ShardingInitializationMongoDTest, InitializeAgainWithMatchingReplSetNameS
auto clusterID = OID::gen();
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(clusterID);
@@ -263,7 +263,7 @@ TEST_F(ShardingInitializationMongoDTest, InitializeAgainWithMatchingReplSetNameS
ShardIdentityType shardIdentity2;
shardIdentity2.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "b:2,c:3", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "b:2,c:3", "config"));
shardIdentity2.setShardName(kShardName);
shardIdentity2.setClusterId(clusterID);
@@ -319,7 +319,7 @@ TEST_F(ShardingInitializationMongoDTest,
serverGlobalParams.overrideShardIdentity = [] {
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
ASSERT_OK(shardIdentity.validate());
@@ -363,7 +363,7 @@ TEST_F(ShardingInitializationMongoDTest,
serverGlobalParams.overrideShardIdentity = [] {
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
ASSERT_OK(shardIdentity.validate());
@@ -406,7 +406,7 @@ TEST_F(ShardingInitializationMongoDTest,
serverGlobalParams.overrideShardIdentity = [] {
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
ASSERT_OK(shardIdentity.validate());
@@ -469,8 +469,8 @@ TEST_F(ShardingInitializationMongoDTest,
BSONObj validShardIdentity = [&] {
ShardIdentityType shardIdentity;
- shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ shardIdentity.setConfigsvrConnectionString(ConnectionString(
+ ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
ASSERT_OK(shardIdentity.validate());
@@ -516,7 +516,7 @@ TEST_F(ShardingInitializationMongoDTest,
BSONObj validShardIdentity = [&] {
ShardIdentityType shardIdentity;
shardIdentity.setConfigsvrConnectionString(
- ConnectionString(ConnectionString::SET, "a:1,b:2", "config"));
+ ConnectionString(ConnectionString::ConnectionType::kReplicaSet, "a:1,b:2", "config"));
shardIdentity.setShardName(kShardName);
shardIdentity.setClusterId(OID::gen());
ASSERT_OK(shardIdentity.validate());