Skip to content

Commit 91266c7

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 8191477 commit 91266c7

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
@@ -23,7 +23,6 @@
2323
import org.junit.Test;
2424

2525
public class ZeroTokenNodesIT {
26-
2726
@Before
2827
public void checkScyllaVersion() {
2928
// minOSS = "6.2.0",
@@ -44,7 +43,7 @@ public void checkScyllaVersion() {
4443
public void should_not_ignore_zero_token_peer_when_option_is_enabled() {
4544
CqlSession session = null;
4645
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
47-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(3).withIpPrefix("127.0.1.").build()) {
46+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(3).build()) {
4847
ccmBridge.create();
4948
ccmBridge.startWithArgs("--wait-for-binary-proto");
5049
ccmBridge.addWithoutStart(4, "dc1");
@@ -63,8 +62,13 @@ public void should_not_ignore_zero_token_peer_when_option_is_enabled() {
6362
Collection<Node> nodes = session.getMetadata().getNodes().values();
6463
Set<String> toStrings =
6564
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
65+
6666
assertThat(toStrings)
67-
.containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042", "/127.0.1.4:9042");
67+
.containsOnly(
68+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
69+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
70+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)),
71+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(4)));
6872
} finally {
6973
if (session != null) session.close();
7074
}
@@ -74,7 +78,7 @@ public void should_not_ignore_zero_token_peer_when_option_is_enabled() {
7478
public void should_not_discover_zero_token_DC_when_option_is_disabled() {
7579
CqlSession session = null;
7680
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
77-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).withIpPrefix("127.0.1.").build()) {
81+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).build()) {
7882
ccmBridge.create();
7983
ccmBridge.updateNodeConfig(3, "join_ring", false);
8084
ccmBridge.updateNodeConfig(4, "join_ring", false);
@@ -97,11 +101,15 @@ public void should_not_discover_zero_token_DC_when_option_is_disabled() {
97101
Objects.requireNonNull(rs.one()).getInetAddress("rpc_address");
98102
landedOn.add(Objects.requireNonNull(broadcastRpcInetAddress).toString());
99103
}
100-
assertThat(landedOn).containsOnly("/127.0.1.1", "/127.0.1.2");
104+
assertThat(landedOn)
105+
.containsOnly("/" + ccmBridge.getNodeIpAddress(1), "/" + ccmBridge.getNodeIpAddress(2));
101106
Collection<Node> nodes = session.getMetadata().getNodes().values();
102107
Set<String> toStrings =
103108
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
104-
assertThat(toStrings).containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042");
109+
assertThat(toStrings)
110+
.containsOnly(
111+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
112+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)));
105113
} finally {
106114
if (session != null) session.close();
107115
}
@@ -111,7 +119,7 @@ public void should_not_discover_zero_token_DC_when_option_is_disabled() {
111119
public void should_discover_zero_token_DC_when_option_is_enabled() {
112120
CqlSession session = null;
113121
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
114-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).withIpPrefix("127.0.1.").build()) {
122+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).build()) {
115123
ccmBridge.create();
116124
ccmBridge.updateNodeConfig(3, "join_ring", false);
117125
ccmBridge.updateNodeConfig(4, "join_ring", false);
@@ -136,13 +144,18 @@ public void should_discover_zero_token_DC_when_option_is_enabled() {
136144
landedOn.add(Objects.requireNonNull(broadcastRpcInetAddress).toString());
137145
}
138146
// LBP should still target local datacenter:
139-
assertThat(landedOn).containsOnly("/127.0.1.1", "/127.0.1.2");
147+
assertThat(landedOn)
148+
.containsOnly("/" + ccmBridge.getNodeIpAddress(1), "/" + ccmBridge.getNodeIpAddress(2));
140149
Collection<Node> nodes = session.getMetadata().getNodes().values();
141150
Set<String> toStrings =
142151
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
143152
// Metadata should have all nodes:
144153
assertThat(toStrings)
145-
.containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042", "/127.0.1.4:9042");
154+
.containsOnly(
155+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
156+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
157+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)),
158+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(4)));
146159
} finally {
147160
if (session != null) session.close();
148161
}
@@ -152,7 +165,7 @@ public void should_discover_zero_token_DC_when_option_is_enabled() {
152165
public void should_connect_to_zero_token_contact_point() {
153166
CqlSession session = null;
154167
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
155-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2).withIpPrefix("127.0.1.").build()) {
168+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2).build()) {
156169
ccmBridge.create();
157170
ccmBridge.startWithArgs("--wait-for-binary-proto");
158171
ccmBridge.addWithoutStart(3, "dc1");
@@ -169,7 +182,11 @@ public void should_connect_to_zero_token_contact_point() {
169182
Collection<Node> nodes = session.getMetadata().getNodes().values();
170183
Set<String> toStrings =
171184
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
172-
assertThat(toStrings).containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042");
185+
assertThat(toStrings)
186+
.containsOnly(
187+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
188+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
189+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)));
173190
} finally {
174191
if (session != null) session.close();
175192
}
@@ -182,7 +199,7 @@ public void should_connect_to_zero_token_DC() {
182199
// method.
183200
CqlSession session = null;
184201
CcmBridge.Builder ccmBridgeBuilder = CcmBridge.builder();
185-
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).withIpPrefix("127.0.1.").build()) {
202+
try (CcmBridge ccmBridge = ccmBridgeBuilder.withNodes(2, 2).build()) {
186203
ccmBridge.create();
187204
ccmBridge.updateNodeConfig(3, "join_ring", false);
188205
ccmBridge.updateNodeConfig(4, "join_ring", false);
@@ -207,12 +224,17 @@ public void should_connect_to_zero_token_DC() {
207224
landedOn.add(Objects.requireNonNull(broadcastRpcInetAddress).toString());
208225
}
209226
// LBP should still target local datacenter:
210-
assertThat(landedOn).containsOnly("/127.0.1.1", "/127.0.1.2");
227+
assertThat(landedOn)
228+
.containsOnly("/" + ccmBridge.getNodeIpAddress(1), "/" + ccmBridge.getNodeIpAddress(2));
211229
Collection<Node> nodes = session.getMetadata().getNodes().values();
212230
Set<String> toStrings =
213231
nodes.stream().map(Node::getEndPoint).map(EndPoint::toString).collect(Collectors.toSet());
214232
// Metadata should have valid ordinary peers plus zero-token contact point:
215-
assertThat(toStrings).containsOnly("/127.0.1.1:9042", "/127.0.1.2:9042", "/127.0.1.3:9042");
233+
assertThat(toStrings)
234+
.containsOnly(
235+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(1)),
236+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(2)),
237+
String.format("/%s:9042", ccmBridge.getNodeIpAddress(3)));
216238
} finally {
217239
if (session != null) session.close();
218240
}

‎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)