add for test-cluster

Signed-off-by: Mingshi Liu <[email protected]>
mingshl · Apr 19, 2024 · 02f81b1 · 02f81b1
1 parent a179c2c
commit 02f81b1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/plugin/src/test/java/org/opensearch/ml/rest/MLCommonsRestTestCase.java b/plugin/src/test/java/org/opensearch/ml/rest/MLCommonsRestTestCase.java
@@ -94,7 +94,7 @@
 import com.google.gson.JsonArray;
 
 public abstract class MLCommonsRestTestCase extends OpenSearchRestTestCase {
-    protected Gson gson = new Gson();
+    protected static Gson gson = new Gson();
     public static long CUSTOM_MODEL_TIMEOUT = 20_000; // 20 seconds
 
     protected boolean isHttps() {
@@ -600,7 +600,7 @@ public void getModel(RestClient client, String modelId, Consumer<Map<String, Obj
         verifyResponse(function, response);
     }
 
-    public void getTask(RestClient client, String taskId, Consumer<Map<String, Object>> function) throws IOException {
+    public static void getTask(RestClient client, String taskId, Consumer<Map<String, Object>> function) throws IOException {
         Response response = TestHelper.makeRequest(client, "GET", "/_plugins/_ml/tasks/" + taskId, null, "", null);
         verifyResponse(function, response);
     }
@@ -635,7 +635,7 @@ public void searchTasks(RestClient client, String query, Consumer<Map<String, Ob
         verifyResponse(function, response);
     }
 
-    private void verifyResponse(Consumer<Map<String, Object>> verificationConsumer, Response response) throws IOException {
+    private static void verifyResponse(Consumer<Map<String, Object>> verificationConsumer, Response response) throws IOException {
         Map<String, Object> map = parseResponseToMap(response);
         if (verificationConsumer != null) {
             verificationConsumer.accept(map);

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLGuardrailsIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLGuardrailsIT.java
@@ -237,7 +237,7 @@ protected boolean checkThrottlingOpenAI(Map responseMap) {
         return message.equals("You exceeded your current quota, please check your plan and billing details.");
     }
 
-    protected Map parseResponseToMap(Response response) throws IOException {
+    public static Map parseResponseToMap(Response response) throws IOException {
         HttpEntity entity = response.getEntity();
         assertNotNull(response);
         String entityString = TestHelper.httpEntityToString(entity);

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceIngestProcessorIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceIngestProcessorIT.java
@@ -11,8 +11,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.http.HttpHeaders;
+import org.apache.http.message.BasicHeader;
 import org.junit.Before;
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLRemoteInferenceIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLRemoteInferenceIT.java
@@ -11,7 +11,6 @@
 import java.util.function.Consumer;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.message.BasicHeader;
 import org.junit.Before;
@@ -805,14 +804,6 @@ protected boolean checkThrottlingOpenAI(Map responseMap) {
         return message.equals("You exceeded your current quota, please check your plan and billing details.");
     }
 
-    protected Map parseResponseToMap(Response response) throws IOException {
-        HttpEntity entity = response.getEntity();
-        assertNotNull(response);
-        String entityString = TestHelper.httpEntityToString(entity);
-        return gson.fromJson(entityString, Map.class);
-    }
-
-    protected void disableClusterConnectorAccessControl() throws IOException {
     public static void disableClusterConnectorAccessControl() throws IOException {
         Response response = TestHelper
             .makeRequest(

diff --git a/plugin/src/test/resources/org/opensearch/ml/bwc/2.4.0.0/opensearch-ml-2.4.0.0.zip b/plugin/src/test/resources/org/opensearch/ml/bwc/2.4.0.0/opensearch-ml-2.4.0.0.zip