From b3b8114779da87f951f5d7c7092d852f3fe532bc Mon Sep 17 00:00:00 2001 From: "A. Jesse Jiryu Davis" Date: Tue, 27 Sep 2016 09:08:05 -0400 Subject: [PATCH] Update SDAM tests from Specs repo. --- .../rs/new_primary_new_setversion.json | 192 ++++++------- .../rs/null_election_id.json | 272 +++++++++--------- .../rs/primary_disconnect_electionid.json | 266 +++++++++-------- .../rs/primary_disconnect_setversion.json | 266 +++++++++-------- .../rs/primary_mismatched_me.json | 28 +- .../rs/primary_reports_new_member.json | 139 +++++++++ .../primary_to_no_primary_mismatched_me.json | 54 ++-- .../rs/rsother_discovered.json | 52 ++-- .../rs/secondary_mismatched_me.json | 38 +-- .../single/direct_connection_rsarbiter.json | 43 +-- .../single/direct_connection_rsprimary.json | 41 +-- .../single/direct_connection_rssecondary.json | 43 +-- .../single/not_ok_response.json | 1 - 13 files changed, 786 insertions(+), 649 deletions(-) create mode 100644 test/discovery_and_monitoring/rs/primary_reports_new_member.json diff --git a/test/discovery_and_monitoring/rs/new_primary_new_setversion.json b/test/discovery_and_monitoring/rs/new_primary_new_setversion.json index 6bd1e1d86..ee3a2992d 100644 --- a/test/discovery_and_monitoring/rs/new_primary_new_setversion.json +++ b/test/discovery_and_monitoring/rs/new_primary_new_setversion.json @@ -1,123 +1,123 @@ { - "description": "New primary with greater setVersion", + "description": "New primary with greater setVersion", + "uri": "mongodb://a/?replicaSet=rs", "phases": [ { + "responses": [ + [ + "a:27017", + { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, + "electionId": { + "$oid": "000000000000000000000001" + } + } + ] + ], "outcome": { "servers": { "a:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000001" - }, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, + } + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, - "responses": [ - [ - "a:27017", - { - "electionId": { - "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 - } - ] - ] - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, { + "responses": [ + [ + "b:27017", + { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 2, + "electionId": { + "$oid": "000000000000000000000001" + } + } + ] + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 2, "electionId": { "$oid": "000000000000000000000001" - }, - "setName": "rs", - "setVersion": 2, - "type": "RSPrimary" + } } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, - "responses": [ - [ - "b:27017", - { - "electionId": { - "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 2 - } - ] - ] - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, { + "responses": [ + [ + "a:27017", + { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, + "electionId": { + "$oid": "000000000000000000000001" + } + } + ] + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 2, "electionId": { "$oid": "000000000000000000000001" - }, - "setName": "rs", - "setVersion": 2, - "type": "RSPrimary" + } } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, - "responses": [ - [ - "a:27017", - { - "electionId": { - "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 - } - ] - ] + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } } - ], - "uri": "mongodb://a/?replicaSet=rs" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/rs/null_election_id.json b/test/discovery_and_monitoring/rs/null_election_id.json index e1f0d0f69..07a69c168 100644 --- a/test/discovery_and_monitoring/rs/null_election_id.json +++ b/test/discovery_and_monitoring/rs/null_election_id.json @@ -1,174 +1,174 @@ { - "description": "Primaries with and without electionIds", + "description": "Primaries with and without electionIds", + "uri": "mongodb://a/?replicaSet=rs", "phases": [ { - "outcome": { - "servers": { - "a:27017": { - "electionId": null, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, - "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, - "c:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, "hosts": [ - "a:27017", - "b:27017", + "a:27017", + "b:27017", "c:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + ], + "setVersion": 1, + "setName": "rs" } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, + "electionId": null + }, "b:27017": { + "type": "Unknown", + "setName": null, + "electionId": null + }, + "c:27017": { + "type": "Unknown", + "setName": null, + "electionId": null + } + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, + { + "responses": [ + [ + "b:27017", + { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017", + "c:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000002" - }, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, - "c:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + } } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, - "responses": [ - [ - "b:27017", - { + ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "Unknown", + "setName": null, + "electionId": null + }, + "b:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000002" - }, + } + }, + "c:27017": { + "type": "Unknown", + "setName": null, + "electionId": null + } + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, + { + "responses": [ + [ + "a:27017", + { + "ok": 1, + "ismaster": true, "hosts": [ - "a:27017", - "b:27017", + "a:27017", + "b:27017", "c:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + ], + "setVersion": 1, + "setName": "rs" } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "c:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, - "responses": [ - [ - "a:27017", - { - "hosts": [ - "a:27017", - "b:27017", - "c:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 - } - ] - ] - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, { - "outcome": { - "servers": { - "a:27017": { - "electionId": null, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, - "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, - "c:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, "responses": [ [ - "c:27017", + "c:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017", + "c:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017", - "c:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } ] - ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, + "electionId": null + }, + "b:27017": { + "type": "Unknown", + "setName": null, + "electionId": null + }, + "c:27017": { + "type": "Unknown", + "setName": null, + "electionId": null + } + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } } - ], - "uri": "mongodb://a/?replicaSet=rs" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/rs/primary_disconnect_electionid.json b/test/discovery_and_monitoring/rs/primary_disconnect_electionid.json index 4f79afd61..e2aecf2fb 100644 --- a/test/discovery_and_monitoring/rs/primary_disconnect_electionid.json +++ b/test/discovery_and_monitoring/rs/primary_disconnect_electionid.json @@ -1,197 +1,195 @@ { - "description": "Disconnected from primary, reject primary with stale electionId", + "description": "Disconnected from primary, reject primary with stale electionId", + "uri": "mongodb://a/?replicaSet=rs", "phases": [ { - "outcome": { - "servers": { - "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, - "b:27017": { - "electionId": { - "$oid": "000000000000000000000002" - }, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } - ], + ], [ - "b:27017", + "b:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000002" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, + "electionId": { + "$oid": "000000000000000000000002" + } } - }, - "setName": "rs", - "topologyType": "ReplicaSetNoPrimary" - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "b:27017", + "b:27017", {} ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetNoPrimary" - }, + }, + "topologyType": "ReplicaSetNoPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": { - "$oid": "000000000000000000000003" - }, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, + }, + "topologyType": "ReplicaSetNoPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000003" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000003" - }, - "setName": "rs", - "setVersion": 1, - "type": "RSPrimary" - }, + } + }, "b:27017": { - "setName": "rs", - "setVersion": 2, - "type": "RSSecondary" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "b:27017", + "b:27017", { + "ok": 1, + "ismaster": false, + "secondary": true, "hosts": [ - "a:27017", + "a:27017", "b:27017" - ], - "ismaster": false, - "ok": 1, - "secondary": true, - "setName": "rs", - "setVersion": 2 + ], + "setName": "rs" } ] - ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 1, + "electionId": { + "$oid": "000000000000000000000003" + } + }, + "b:27017": { + "type": "RSSecondary", + "setName": "rs" + } + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } } - ], - "uri": "mongodb://a/?replicaSet=rs" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/rs/primary_disconnect_setversion.json b/test/discovery_and_monitoring/rs/primary_disconnect_setversion.json index 984882897..2a97c6a75 100644 --- a/test/discovery_and_monitoring/rs/primary_disconnect_setversion.json +++ b/test/discovery_and_monitoring/rs/primary_disconnect_setversion.json @@ -1,197 +1,195 @@ { - "description": "Disconnected from primary, reject primary with stale setVersion", + "description": "Disconnected from primary, reject primary with stale setVersion", + "uri": "mongodb://a/?replicaSet=rs", "phases": [ { - "outcome": { - "servers": { - "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, - "b:27017": { - "electionId": { - "$oid": "000000000000000000000001" - }, - "setName": "rs", - "setVersion": 2, - "type": "RSPrimary" - } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } - ], + ], [ - "b:27017", + "b:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 2, "electionId": { "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 2 + } } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "RSPrimary", + "setName": "rs", + "setVersion": 2, + "electionId": { + "$oid": "000000000000000000000001" + } } - }, - "setName": "rs", - "topologyType": "ReplicaSetNoPrimary" - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "b:27017", + "b:27017", {} ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetNoPrimary" - }, + }, + "topologyType": "ReplicaSetNoPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 1, "electionId": { "$oid": "000000000000000000000001" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 1 + } } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { - "electionId": { - "$oid": "000000000000000000000002" - }, - "setName": "rs", - "setVersion": 2, - "type": "RSPrimary" - }, + "type": "Unknown", + "setName": null, + "electionId": null + }, "b:27017": { - "electionId": null, - "setName": null, - "type": "Unknown" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, + }, + "topologyType": "ReplicaSetNoPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, + "hosts": [ + "a:27017", + "b:27017" + ], + "setName": "rs", + "setVersion": 2, "electionId": { "$oid": "000000000000000000000002" - }, - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": true, - "ok": 1, - "setName": "rs", - "setVersion": 2 + } } ] - ] - }, - { + ], "outcome": { "servers": { "a:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 2, "electionId": { "$oid": "000000000000000000000002" - }, - "setName": "rs", - "setVersion": 2, - "type": "RSPrimary" - }, + } + }, "b:27017": { - "setName": "rs", - "setVersion": 2, - "type": "RSSecondary" + "type": "Unknown", + "setName": null, + "electionId": null } - }, - "setName": "rs", - "topologyType": "ReplicaSetWithPrimary" - }, + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } + }, + { "responses": [ [ - "b:27017", + "b:27017", { + "ok": 1, + "ismaster": false, + "secondary": true, "hosts": [ - "a:27017", + "a:27017", "b:27017" - ], - "ismaster": false, - "ok": 1, - "secondary": true, - "setName": "rs", - "setVersion": 2 + ], + "setName": "rs" } ] - ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs", + "setVersion": 2, + "electionId": { + "$oid": "000000000000000000000002" + } + }, + "b:27017": { + "type": "RSSecondary", + "setName": "rs" + } + }, + "topologyType": "ReplicaSetWithPrimary", + "setName": "rs" + } } - ], - "uri": "mongodb://a/?replicaSet=rs" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/rs/primary_mismatched_me.json b/test/discovery_and_monitoring/rs/primary_mismatched_me.json index fd9eb9831..13435eaed 100644 --- a/test/discovery_and_monitoring/rs/primary_mismatched_me.json +++ b/test/discovery_and_monitoring/rs/primary_mismatched_me.json @@ -1,37 +1,37 @@ { - "description": "Primary mismatched me", + "description": "Primary mismatched me", "phases": [ { "outcome": { "servers": { "a:27017": { - "setName": null, + "setName": null, "type": "Unknown" - }, + }, "b:27017": { - "setName": null, + "setName": null, "type": "Unknown" } - }, - "setName": "rs", + }, + "setName": "rs", "topologyType": "ReplicaSetNoPrimary" - }, + }, "responses": [ [ - "localhost:27017", + "localhost:27017", { "hosts": [ - "a:27017", + "a:27017", "b:27017" - ], - "ismaster": true, - "me": "a:27017", - "ok": 1, + ], + "ismaster": true, + "me": "a:27017", + "ok": 1, "setName": "rs" } ] ] } - ], + ], "uri": "mongodb://localhost:27017/?replicaSet=rs" } diff --git a/test/discovery_and_monitoring/rs/primary_reports_new_member.json b/test/discovery_and_monitoring/rs/primary_reports_new_member.json new file mode 100644 index 000000000..cf6f66ab7 --- /dev/null +++ b/test/discovery_and_monitoring/rs/primary_reports_new_member.json @@ -0,0 +1,139 @@ +{ + "description": "Primary reports a new member", + "phases": [ + { + "outcome": { + "servers": { + "a:27017": { + "setName": "rs", + "type": "RSSecondary" + }, + "b:27017": { + "setName": null, + "type": "Unknown" + } + }, + "setName": "rs", + "topologyType": "ReplicaSetNoPrimary" + }, + "responses": [ + [ + "a:27017", + { + "hosts": [ + "a:27017", + "b:27017" + ], + "ismaster": false, + "ok": 1, + "secondary": true, + "setName": "rs" + } + ] + ] + }, + { + "outcome": { + "servers": { + "a:27017": { + "setName": "rs", + "type": "RSSecondary" + }, + "b:27017": { + "setName": "rs", + "type": "RSPrimary" + } + }, + "setName": "rs", + "topologyType": "ReplicaSetWithPrimary" + }, + "responses": [ + [ + "b:27017", + { + "hosts": [ + "a:27017", + "b:27017" + ], + "ismaster": true, + "ok": 1, + "setName": "rs" + } + ] + ] + }, + { + "outcome": { + "servers": { + "a:27017": { + "setName": "rs", + "type": "RSSecondary" + }, + "b:27017": { + "setName": "rs", + "type": "RSPrimary" + }, + "c:27017": { + "setName": null, + "type": "Unknown" + } + }, + "setName": "rs", + "topologyType": "ReplicaSetWithPrimary" + }, + "responses": [ + [ + "b:27017", + { + "hosts": [ + "a:27017", + "b:27017", + "c:27017" + ], + "ismaster": true, + "ok": 1, + "setName": "rs" + } + ] + ] + }, + { + "outcome": { + "servers": { + "a:27017": { + "setName": "rs", + "type": "RSSecondary" + }, + "b:27017": { + "setName": "rs", + "type": "RSPrimary" + }, + "c:27017": { + "setName": "rs", + "type": "RSSecondary" + } + }, + "setName": "rs", + "topologyType": "ReplicaSetWithPrimary" + }, + "responses": [ + [ + "c:27017", + { + "hosts": [ + "a:27017", + "b:27017", + "c:27017" + ], + "ismaster": false, + "ok": 1, + "primary": "b:27017", + "secondary": true, + "setName": "rs" + } + ] + ] + } + ], + "uri": "mongodb://a/?replicaSet=rs" +} diff --git a/test/discovery_and_monitoring/rs/primary_to_no_primary_mismatched_me.json b/test/discovery_and_monitoring/rs/primary_to_no_primary_mismatched_me.json index a940701f8..952b29267 100644 --- a/test/discovery_and_monitoring/rs/primary_to_no_primary_mismatched_me.json +++ b/test/discovery_and_monitoring/rs/primary_to_no_primary_mismatched_me.json @@ -1,68 +1,68 @@ { - "description": "Primary to no primary with mismatched me", + "description": "Primary to no primary with mismatched me", "phases": [ { "outcome": { "servers": { "a:27017": { - "setName": "rs", + "setName": "rs", "type": "RSPrimary" - }, + }, "b:27017": { - "setName": null, + "setName": null, "type": "Unknown" } - }, - "setName": "rs", + }, + "setName": "rs", "topologyType": "ReplicaSetWithPrimary" - }, + }, "responses": [ [ - "a:27017", + "a:27017", { "hosts": [ - "a:27017", + "a:27017", "b:27017" - ], - "ismaster": true, - "me": "a:27017", - "ok": 1, + ], + "ismaster": true, + "me": "a:27017", + "ok": 1, "setName": "rs" } ] ] - }, + }, { "outcome": { "servers": { "c:27017": { - "setName": null, + "setName": null, "type": "Unknown" - }, + }, "d:27017": { - "setName": null, + "setName": null, "type": "Unknown" } - }, - "setName": "rs", + }, + "setName": "rs", "topologyType": "ReplicaSetNoPrimary" - }, + }, "responses": [ [ - "a:27017", + "a:27017", { "hosts": [ - "c:27017", + "c:27017", "d:27017" - ], - "ismaster": true, - "me": "c:27017", - "ok": 1, + ], + "ismaster": true, + "me": "c:27017", + "ok": 1, "setName": "rs" } ] ] } - ], + ], "uri": "mongodb://a/?replicaSet=rs" } diff --git a/test/discovery_and_monitoring/rs/rsother_discovered.json b/test/discovery_and_monitoring/rs/rsother_discovered.json index a4a8949cc..230f52991 100644 --- a/test/discovery_and_monitoring/rs/rsother_discovered.json +++ b/test/discovery_and_monitoring/rs/rsother_discovered.json @@ -1,59 +1,59 @@ { - "description": "RSOther discovered", + "description": "RSOther discovered", "phases": [ { "outcome": { "servers": { "a:27017": { - "setName": "rs", + "setName": "rs", "type": "RSOther" - }, + }, "b:27017": { - "setName": "rs", + "setName": "rs", "type": "RSOther" - }, + }, "c:27017": { - "setName": null, + "setName": null, "type": "Unknown" - }, + }, "d:27017": { - "setName": null, + "setName": null, "type": "Unknown" } - }, - "setName": "rs", + }, + "setName": "rs", "topologyType": "ReplicaSetNoPrimary" - }, + }, "responses": [ [ - "a:27017", + "a:27017", { - "hidden": true, + "hidden": true, "hosts": [ - "c:27017", + "c:27017", "d:27017" - ], - "ismaster": false, - "ok": 1, - "secondary": true, + ], + "ismaster": false, + "ok": 1, + "secondary": true, "setName": "rs" } - ], + ], [ - "b:27017", + "b:27017", { "hosts": [ - "c:27017", + "c:27017", "d:27017" - ], - "ismaster": false, - "ok": 1, - "secondary": false, + ], + "ismaster": false, + "ok": 1, + "secondary": false, "setName": "rs" } ] ] } - ], + ], "uri": "mongodb://a,b/?replicaSet=rs" } diff --git a/test/discovery_and_monitoring/rs/secondary_mismatched_me.json b/test/discovery_and_monitoring/rs/secondary_mismatched_me.json index 60059a7f7..9b83f5499 100644 --- a/test/discovery_and_monitoring/rs/secondary_mismatched_me.json +++ b/test/discovery_and_monitoring/rs/secondary_mismatched_me.json @@ -1,37 +1,37 @@ { - "description": "Secondary mismatched me", + "description": "Secondary mismatched me", "phases": [ { "outcome": { "servers": { "a:27017": { - "setName": null, + "setName": null, "type": "Unknown" - }, + }, "b:27017": { - "setName": null, + "setName": null, "type": "Unknown" } - }, - "setName": "rs", + }, + "setName": "rs", "topologyType": "ReplicaSetNoPrimary" - }, + }, "responses": [ [ - "localhost:27017", - { - "me": "a:27017", - "hosts": [ - "a:27017", - "b:27017" - ], - "ismaster": false, - "ok": 1, - "setName": "rs" - } + "localhost:27017", + { + "hosts": [ + "a:27017", + "b:27017" + ], + "ismaster": false, + "me": "a:27017", + "ok": 1, + "setName": "rs" + } ] ] } - ], + ], "uri": "mongodb://localhost:27017/?replicaSet=rs" } diff --git a/test/discovery_and_monitoring/single/direct_connection_rsarbiter.json b/test/discovery_and_monitoring/single/direct_connection_rsarbiter.json index 3c3219b0b..28f879e9f 100644 --- a/test/discovery_and_monitoring/single/direct_connection_rsarbiter.json +++ b/test/discovery_and_monitoring/single/direct_connection_rsarbiter.json @@ -1,32 +1,33 @@ { - "description": "Connect to RSArbiter", + "description": "Connect to RSArbiter", + "uri": "mongodb://a", "phases": [ { - "outcome": { - "servers": { - "a:27017": { - "setName": "rs", - "type": "RSArbiter" - } - }, - "setName": null, - "topologyType": "Single" - }, "responses": [ [ - "a:27017", + "a:27017", { - "arbiterOnly": true, + "ok": 1, + "ismaster": false, + "arbiterOnly": true, "hosts": [ - "a:27017" - ], - "ismaster": false, - "ok": 1, + "a:27017", + "b:27017" + ], "setName": "rs" } ] - ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSArbiter", + "setName": "rs" + } + }, + "topologyType": "Single", + "setName": null + } } - ], - "uri": "mongodb://a" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/single/direct_connection_rsprimary.json b/test/discovery_and_monitoring/single/direct_connection_rsprimary.json index f864c0e04..10b39f361 100644 --- a/test/discovery_and_monitoring/single/direct_connection_rsprimary.json +++ b/test/discovery_and_monitoring/single/direct_connection_rsprimary.json @@ -1,31 +1,32 @@ { - "description": "Connect to RSPrimary", + "description": "Connect to RSPrimary", + "uri": "mongodb://a", "phases": [ { - "outcome": { - "servers": { - "a:27017": { - "setName": "rs", - "type": "RSPrimary" - } - }, - "setName": null, - "topologyType": "Single" - }, "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": true, "hosts": [ - "a:27017" - ], - "ismaster": true, - "ok": 1, + "a:27017", + "b:27017" + ], "setName": "rs" } ] - ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs" + } + }, + "topologyType": "Single", + "setName": null + } } - ], - "uri": "mongodb://a" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/single/direct_connection_rssecondary.json b/test/discovery_and_monitoring/single/direct_connection_rssecondary.json index d23833f1f..675b1393e 100644 --- a/test/discovery_and_monitoring/single/direct_connection_rssecondary.json +++ b/test/discovery_and_monitoring/single/direct_connection_rssecondary.json @@ -1,32 +1,33 @@ { - "description": "Connect to RSSecondary", + "description": "Connect to RSSecondary", + "uri": "mongodb://a", "phases": [ { - "outcome": { - "servers": { - "a:27017": { - "setName": "rs", - "type": "RSSecondary" - } - }, - "setName": null, - "topologyType": "Single" - }, "responses": [ [ - "a:27017", + "a:27017", { + "ok": 1, + "ismaster": false, + "secondary": true, "hosts": [ - "a:27017" - ], - "ismaster": false, - "ok": 1, - "secondary": true, + "a:27017", + "b:27017" + ], "setName": "rs" } ] - ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSSecondary", + "setName": "rs" + } + }, + "topologyType": "Single", + "setName": null + } } - ], - "uri": "mongodb://a" -} + ] +} \ No newline at end of file diff --git a/test/discovery_and_monitoring/single/not_ok_response.json b/test/discovery_and_monitoring/single/not_ok_response.json index 0c18d29d9..2b25cdcc7 100644 --- a/test/discovery_and_monitoring/single/not_ok_response.json +++ b/test/discovery_and_monitoring/single/not_ok_response.json @@ -5,7 +5,6 @@ "outcome": { "servers": { "a:27017": { - "address": "a:27017", "setName": null, "type": "Unknown" }