update(cluster-test): Bump cluster-test version to 1.7.0

Author: JisoLya

hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/conf/hugegraph.properties.template

@@ -16,8 +16,7 @@
 #
 
 # gremlin entrance to create graph
-# auth config: org.apache.hugegraph.auth.HugeFactoryAuthProxy
-gremlin.graph=org.apache.hugegraph.HugeFactory
+gremlin.graph=org.apache.hugegraph.auth.HugeFactoryAuthProxy
 
 # cache config
 #schema.cache_capacity=100000

hugegraph-cluster-test/hugegraph-clustertest-dist/src/assembly/static/conf/rest-server.properties.template

@@ -36,7 +36,12 @@ arthas.disabled_commands=jad
 # authentication configs
 # choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
 # 'org.apache.hugegraph.auth.ConfigAuthenticator'
-#auth.authenticator=
+auth.authenticator=org.apache.hugegraph.auth.StandardAuthenticator
+# true if using hstore mode
+usePD=true
+
+# default password
+auth.admin_pa=pa
 
 # for StandardAuthenticator mode
 #auth.graph_store=hugegraph

hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/ServerNodeWrapper.java

@@ -34,15 +34,20 @@
 import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_TEMPLATE_PATH;
 import static org.apache.hugegraph.ct.base.ClusterConstant.isJava11OrHigher;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class ServerNodeWrapper extends AbstractNodeWrapper {
 
+    private static List<String> hgJars = new ArrayList<>();
     public ServerNodeWrapper(int clusterIndex, int index) {
         super(clusterIndex, index);
         this.fileNames = new ArrayList<>(
@@ -54,6 +59,7 @@ public ServerNodeWrapper(int clusterIndex, int index) {
         this.startLine = "INFO: [HttpServer] Started.";
         createNodeDir(Paths.get(SERVER_PACKAGE_PATH), getNodePath());
         createLogDir();
+        loadHgJars();
     }
 
     private static void addJarsToClasspath(File directory, List<String> classpath) {
@@ -67,6 +73,36 @@ private static void addJarsToClasspath(File directory, List<String> classpath) {
         }
     }
 
+    private static void addCpJarsToClasspath(File directory, List<String> classpath) {
+        // Add jar starts with hugegraph in proper order
+        String path = directory.getAbsolutePath();
+        for (String jar : hgJars) {
+            classpath.add(path + File.separator + jar);
+        }
+        if (directory.exists() && directory.isDirectory()) {
+            File[] files =
+                    directory.listFiles((dir, name) -> name.endsWith(".jar") && !name.contains(
+                            "hugegraph"));
+            if (files != null) {
+                for (File file : files) {
+                    classpath.add(file.getAbsolutePath());
+                }
+            }
+        }
+    }
+
+    private void loadHgJars(){
+        try (InputStream is = ServerNodeWrapper.class.getResourceAsStream("/jar.txt");
+             BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                hgJars.add(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void start() {
         try {
@@ -79,14 +115,16 @@ public void start() {
             }
 
             List<String> classpath = new ArrayList<>();
-            addJarsToClasspath(new File(workPath + LIB_DIR), classpath);
+            addCpJarsToClasspath(new File(workPath + LIB_DIR), classpath);
             addJarsToClasspath(new File(workPath + EXT_DIR), classpath);
             addJarsToClasspath(new File(workPath + PLUGINS_DIR), classpath);
             String storeClassPath = String.join(":", classpath);
 
             startCmd.addAll(Arrays.asList(
                     "-Dname=HugeGraphServer" + this.index,
                     "--add-exports=java.base/jdk.internal.reflect=ALL-UNNAMED",
+                    "--add-modules=jdk.unsupported",
+                    "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED",
                     "-cp", storeClassPath,
                     "org.apache.hugegraph.dist.HugeGraphServer",
                     "./conf/gremlin-server.yaml",

hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/MultiClusterTest/BaseMultiClusterTest.java

@@ -20,12 +20,20 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
 
+import org.apache.hugegraph.SimpleClusterTest.BaseSimpleTest;
+import org.apache.hugegraph.SimpleClusterTest.BaseSimpleTest.RestClient;
 import org.apache.hugegraph.ct.env.BaseEnv;
 import org.apache.hugegraph.ct.env.MultiNodeEnv;
+import org.apache.hugegraph.serializer.direct.util.HugeException;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 
+import jakarta.ws.rs.core.Response;
+
 /**
  * MultiNode Test generate the cluster env with 3 pd node + 3 store node + 3 server node.
  * Or you can set different num of nodes by using env = new MultiNodeEnv(pdNum, storeNum, serverNum)
@@ -36,16 +44,47 @@ public class BaseMultiClusterTest {
 
     protected static BaseEnv env;
     protected static Process p;
+    protected static List<RestClient> clients = new ArrayList<>();
+    protected static String BASE_URL = "http://";
+    protected static final String GRAPH = "hugegraphapi";
+    protected static final String URL_PREFIX = "graphspaces/DEFAULT/graphs/" + GRAPH;
+    protected static final String SCHEMA_PKS = "/schema/propertykeys";
 
     @BeforeClass
     public static void initEnv() {
         env = new MultiNodeEnv();
         env.startCluster();
+        for (String addr : env.getServerRestAddrs()) {
+            clients.add(new RestClient(BASE_URL + addr));
+        }
+        initGraph();
     }
 
     @AfterClass
     public static void clearEnv() {
         env.stopCluster();
+        for (RestClient client : clients) {
+            client.close();
+        }
+    }
+
+    protected static void initGraph() {
+        BaseSimpleTest.RestClient client = clients.get(0);
+        Response r = clients.get(0).get(URL_PREFIX);
+        if (r.getStatus() != 200) {
+            String body = "{\n" +
+                          "  \"backend\": \"hstore\",\n" +
+                          "  \"serializer\": \"binary\",\n" +
+                          "  \"store\": \"hugegraphapi\",\n" +
+                          "  \"search.text_analyzer\": \"jieba\",\n" +
+                          "  \"search.text_analyzer_mode\": \"INDEX\"\n" +
+                          "}";
+            r = client.post(URL_PREFIX, body);
+            if (r.getStatus() != 201) {
+                throw new HugeException("Failed to create graph: " + GRAPH +
+                                        r.readEntity(String.class));
+            }
+        }
     }
 
     protected String execCmd(String[] cmds) throws IOException {
@@ -61,4 +100,21 @@ protected String execCmd(String[] cmds) throws IOException {
         p.destroy();
         return builder.toString();
     }
+
+    protected static String assertResponseStatus(int status,
+                                                 Response response) {
+        String content = response.readEntity(String.class);
+        String message = String.format("Response with status %s and content %s",
+                                       response.getStatus(), content);
+        Assert.assertEquals(message, status, response.getStatus());
+        return content;
+    }
+
+    public static Response createAndAssert(RestClient client, String path,
+                                           String body,
+                                           int status) {
+        Response r = client.post(path, body);
+        assertResponseStatus(status, r);
+        return r;
+    }
 }