Skip to content

Commit 1654ec5

Browse files
dkropachevdkropachev
committed
tests: remove unnecessary withIpPrefix calls
Since cluster is running on it's own ip prefix we can safely run them without specifing particular ip prefix.
1 parent c804c30 commit 1654ec5

File tree

2 files changed

+40
-19
lines changed

2 files changed

+40
-19
lines changed

‎integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/ZeroTokenNodesIT.java‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.junit.Test;
2525

2626
public class ZeroTokenNodesIT {
27-
2827
@Before
2928
public void checkScyllaVersion() {
3029
// minOSS = "6.2.0",
@@ -45,7 +44,7 @@ public void checkScyllaVersion() {
4544
public void should_not_ignore_zero_token_peer_when_option_is_enabled() {
4645
CqlSession session = null;
4746
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
48-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(3).withIpPrefix("127.0.1.").build()) {
47+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(3).build()) {
4948
ccmBridge.create();
5049
ccmBridge.startWithArgs("--wait-for-binary-proto");
5150
ccmBridge.addWithoutStart(4, "dc1");
@@ -64,8 +63,13 @@ public void should_not_ignore_zero_token_peer_when_option_is_enabled() {
6463
Collection<Node> nodes = session.getMetadata().getNodes().values();
6564
Set<String> toStrings =
6665
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
66+
6767
assertThat(toStrings)
68-
.containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042", "/127.0.1.4:9042");
68+
.containsOnly(
69+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
70+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
71+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)),
72+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(4)));
6973
} finally {
7074
if (session != null) session.close();
7175
}
@@ -75,7 +79,7 @@ public void should_not_ignore_zero_token_peer_when_option_is_enabled() {
7579
public void should_not_discover_zero_token_DC_when_option_is_disabled() {
7680
CqlSession session = null;
7781
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
78-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).withIpPrefix("127.0.1.").build()) {
82+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).build()) {
7983
ccmBridge.create();
8084
ccmBridge.updateNodeConfig(3, "join_ring", false);
8185
ccmBridge.updateNodeConfig(4, "join_ring", false);
@@ -98,11 +102,15 @@ public void should_not_discover_zero_token_DC_when_option_is_disabled() {
98102
Objects.requireNonNull(rs.one()).getInetAddress("rpc_address");
99103
landedOn.add(Objects.requireNonNull(broadcastRpcInetAddress).toString());
100104
}
101-
assertThat(landedOn).containsOnly("/127.0.1.1", "/127.0.1.2");
105+
assertThat(landedOn)
106+
.containsOnly("/" + ccmBridge.getNodeIpAddress(1), "/" + ccmBridge.getNodeIpAddress(2));
102107
Collection<Node> nodes = session.getMetadata().getNodes().values();
103108
Set<String> toStrings =
104109
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
105-
assertThat(toStrings).containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042");
110+
assertThat(toStrings)
111+
.containsOnly(
112+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
113+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)));
106114
} finally {
107115
if (session != null) session.close();
108116
}
@@ -112,7 +120,7 @@ public void should_not_discover_zero_token_DC_when_option_is_disabled() {
112120
public void should_discover_zero_token_DC_when_option_is_enabled() {
113121
CqlSession session = null;
114122
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
115-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).withIpPrefix("127.0.1.").build()) {
123+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).build()) {
116124
ccmBridge.create();
117125
ccmBridge.updateNodeConfig(3, "join_ring", false);
118126
ccmBridge.updateNodeConfig(4, "join_ring", false);
@@ -137,13 +145,18 @@ public void should_discover_zero_token_DC_when_option_is_enabled() {
137145
landedOn.add(Objects.requireNonNull(broadcastRpcInetAddress).toString());
138146
}
139147
// LBP should still target local datacenter:
140-
assertThat(landedOn).containsOnly("/127.0.1.1", "/127.0.1.2");
148+
assertThat(landedOn)
149+
.containsOnly("/" + ccmBridge.getNodeIpAddress(1), "/" + ccmBridge.getNodeIpAddress(2));
141150
Collection<Node> nodes = session.getMetadata().getNodes().values();
142151
Set<String> toStrings =
143152
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
144153
// Metadata should have all nodes:
145154
assertThat(toStrings)
146-
.containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042", "/127.0.1.4:9042");
155+
.containsOnly(
156+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
157+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
158+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)),
159+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(4)));
147160
} finally {
148161
if (session != null) session.close();
149162
}
@@ -153,7 +166,7 @@ public void should_discover_zero_token_DC_when_option_is_enabled() {
153166
public void should_connect_to_zero_token_contact_point() {
154167
CqlSession session = null;
155168
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
156-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2).withIpPrefix("127.0.1.").build()) {
169+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2).build()) {
157170
ccmBridge.create();
158171
ccmBridge.startWithArgs("--wait-for-binary-proto");
159172
ccmBridge.addWithoutStart(3, "dc1");
@@ -170,7 +183,11 @@ public void should_connect_to_zero_token_contact_point() {
170183
Collection<Node> nodes = session.getMetadata().getNodes().values();
171184
Set<String> toStrings =
172185
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
173-
assertThat(toStrings).containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042");
186+
assertThat(toStrings)
187+
.containsOnly(
188+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
189+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
190+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)));
174191
} finally {
175192
if (session != null) session.close();
176193
}
@@ -183,7 +200,7 @@ public void should_connect_to_zero_token_DC() {
183200
// method.
184201
CqlSession session = null;
185202
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
186-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).withIpPrefix("127.0.1.").build()) {
203+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).build()) {
187204
ccmBridge.create();
188205
ccmBridge.updateNodeConfig(3, "join_ring", false);
189206
ccmBridge.updateNodeConfig(4, "join_ring", false);
@@ -208,12 +225,17 @@ public void should_connect_to_zero_token_DC() {
208225
landedOn.add(Objects.requireNonNull(broadcastRpcInetAddress).toString());
209226
}
210227
// LBP should still target local datacenter:
211-
assertThat(landedOn).containsOnly("/127.0.1.1", "/127.0.1.2");
228+
assertThat(landedOn)
229+
.containsOnly("/" + ccmBridge.getNodeIpAddress(1), "/" + ccmBridge.getNodeIpAddress(2));
212230
Collection<Node> nodes = session.getMetadata().getNodes().values();
213231
Set<String> toStrings =
214232
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
215233
// Metadata should have valid ordinary peers plus zero-token contact point:
216-
assertThat(toStrings).containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042");
234+
assertThat(toStrings)
235+
.containsOnly(
236+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
237+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
238+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)));
217239
} finally {
218240
if (session != null) session.close();
219241
}

‎integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class MockResolverIT {
6363

6464
@Test
6565
public void should_connect_with_mocked_hostname() {
66-
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder().withNodes(1).withIpPrefix("127.0.1.");
66+
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder().withNodes(1);
6767
try (CcmBridge ccmBridge = ccmBridgeBuilder.build()) {
6868
MultimapHostResolverProvider.removeResolverEntries("test.cluster.fake");
6969
MultimapHostResolverProvider.addResolverEntry(
@@ -258,7 +258,7 @@ public void cannot_reconnect_with_resolved_socket() {
258258
CqlSession session;
259259
Collection<Node> nodes;
260260
Set<Node> filteredNodes;
261-
try (CcmBridge ccmBridge = CcmBridge.builder().withNodes(3).withIpPrefix("127.0.1.").build()) {
261+
try (CcmBridge ccmBridge = CcmBridge.builder().withNodes(3).build()) {
262262
MultimapHostResolverProvider.removeResolverEntries("test.cluster.fake");
263263
MultimapHostResolverProvider.addResolverEntry(
264264
"test.cluster.fake", ccmBridge.getNodeIpAddress(1));
@@ -319,8 +319,7 @@ public void cannot_reconnect_with_resolved_socket() {
319319
LOG.warn(
320320
"Launching another cluster until we lose resolved socket from metadata (run {}).",
321321
counter);
322-
try (CcmBridge ccmBridge =
323-
CcmBridge.builder().withNodes(3).withIpPrefix("127.0." + counter + ".").build()) {
322+
try (CcmBridge ccmBridge = CcmBridge.builder().withNodes(3).build()) {
324323
MultimapHostResolverProvider.removeResolverEntries("test.cluster.fake");
325324
MultimapHostResolverProvider.addResolverEntry(
326325
"test.cluster.fake", ccmBridge.getNodeIpAddress(1));
@@ -374,7 +373,7 @@ public void cannot_reconnect_with_resolved_socket() {
374373
InetSocketAddress address = (InetSocketAddress) iterator.next().getEndPoint().resolve();
375374
assertFalse(address.isUnresolved());
376375
}
377-
try (CcmBridge ccmBridge = CcmBridge.builder().withNodes(3).withIpPrefix("127.1.1.").build()) {
376+
try (CcmBridge ccmBridge = CcmBridge.builder().withNodes(3).build()) {
378377
MultimapHostResolverProvider.removeResolverEntries("test.cluster.fake");
379378
MultimapHostResolverProvider.addResolverEntry(
380379
"test.cluster.fake", ccmBridge.getNodeIpAddress(1));

0 commit comments

Comments
 (0)