Skip to content

Remove hardcoded check for CCM-281 #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olim7t merged 1 commit into from
Jul 3, 2015
Merged

Remove hardcoded check for CCM-281 #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,33 +191,24 @@ private static File createTempStore(String storePath) {
}

public static CCMBridge create(String name, String... options) {
// This leads to a confusing CCM error message so check explicitly:
checkArgument(!"current".equals(name.toLowerCase()),
"cluster can't be called \"current\"");
CCMBridge bridge = new CCMBridge();
bridge.execute(CCM_COMMAND + " create %s -b -i %s %s " + Joiner.on(" ").join(options), name, IP_PREFIX, CASSANDRA_VERSION);
return bridge;
}

public static CCMBridge create(String name, int nbNodes, String... options) {
checkArgument(!"current".equals(name.toLowerCase()),
"cluster can't be called \"current\"");
CCMBridge bridge = new CCMBridge();
bridge.execute(CCM_COMMAND + " create %s -n %d -s -i %s -b %s " + Joiner.on(" ").join(options), name, nbNodes, IP_PREFIX, CASSANDRA_VERSION);
return bridge;
}

public static CCMBridge createWithCustomVersion(String name, int nbNodes, String cassandraVersion) {
checkArgument(!"current".equals(name.toLowerCase()),
"cluster can't be called \"current\"");
CCMBridge bridge = new CCMBridge();
bridge.execute(CCM_COMMAND + " create %s -n %d -s -i %s -b -v %s ", name, nbNodes, IP_PREFIX, cassandraVersion);
return bridge;
}

public static CCMBridge create(String name, int nbNodesDC1, int nbNodesDC2) {
checkArgument(!"current".equals(name.toLowerCase()),
"cluster can't be called \"current\"");
CCMBridge bridge = new CCMBridge();
bridge.execute(CCM_COMMAND + " create %s -n %d:%d -s -i %s -b %s", name, nbNodesDC1, nbNodesDC2, IP_PREFIX, CASSANDRA_VERSION);
return bridge;
Expand Down