Use initial cluster port for boltkit

Author: lutovich

driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java

@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
- * <p>
+ *
  * This file is part of Neo4j.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java

@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
- * <p>
+ *
  * This file is part of Neo4j.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterControl.java

@@ -37,7 +37,7 @@ static boolean boltKitAvailable()
     {
         try
         {
-            executeCommand( "neoctrl-cluster", "-h" );
+            executeCommand( "neoctrl-cluster", "--help" );
             return true;
         }
         catch ( ClusterControlException e )
@@ -46,11 +46,12 @@ static boolean boltKitAvailable()
         }
     }
 
-    static void installCluster( String neo4jVersion, int cores, int readReplicas, String password, Path path )
+    static void installCluster( String neo4jVersion, int cores, int readReplicas, String password, int port,
+            Path path )
     {
         executeCommand( "neoctrl-cluster", "install",
-                "-c", String.valueOf( cores ), "-r", String.valueOf( readReplicas ),
-                "-p", password,
+                "--cores", String.valueOf( cores ), "--read-replicas", String.valueOf( readReplicas ),
+                "--password", password, "--initial-port", String.valueOf( port ),
                 neo4jVersion, path.toString() );
     }
 
@@ -66,7 +67,7 @@ static void stopCluster( Path path )
 
     static void killCluster( Path path )
     {
-        executeCommand( "neoctrl-cluster", "stop", "-k", path.toString() );
+        executeCommand( "neoctrl-cluster", "stop", "--kill", path.toString() );
     }
 
     private static String executeCommand( String... command )

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterMember.java

@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
- * <p>
+ *
  * This file is part of Neo4j.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterRule.java

@@ -38,6 +38,7 @@ public class ClusterRule extends ExternalResource
 {
     private static final Path CLUSTER_DIR = Paths.get( "target", "test-cluster" ).toAbsolutePath();
     private static final String PASSWORD = "test";
+    private static final int INITIAL_PORT = 20_000;
 
     public Cluster getCluster()
     {
@@ -60,7 +61,7 @@ protected void before() throws Throwable
             {
                 delete( CLUSTER_DIR );
                 // todo: get version from env
-                SharedCluster.install( "3.1.0-M13-beta3", 3, 2, PASSWORD, CLUSTER_DIR );
+                SharedCluster.install( "3.1.0-M13-beta3", 3, 2, PASSWORD, INITIAL_PORT, CLUSTER_DIR );
                 SharedCluster.start();
             }
             finally

driver/src/test/java/org/neo4j/driver/v1/util/cc/SharedCluster.java

@@ -1,15 +1,15 @@
 /**
  * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
- * <p>
+ *
  * This file is part of Neo4j.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,10 +45,10 @@ static boolean exists()
         return clusterInstance != null;
     }
 
-    static void install( String neo4jVersion, int cores, int readReplicas, String password, Path path )
+    static void install( String neo4jVersion, int cores, int readReplicas, String password, int port, Path path )
     {
         assertClusterDoesNotExist();
-        ClusterControl.installCluster( neo4jVersion, cores, readReplicas, password, path );
+        ClusterControl.installCluster( neo4jVersion, cores, readReplicas, password, port, path );
         clusterInstance = new Cluster( path, password );
     }