Fix after rebasing

Author: demjened

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/BaseMockEISAuthServerTest.java

@@ -40,8 +40,6 @@ public class BaseMockEISAuthServerTest extends ESRestTestCase {
  .setting("xpack.security.enabled", "true")
  // Adding both settings unless one feature flag is disabled in a particular environment
  .setting("xpack.inference.elastic.url", mockEISServer::getUrl)
- // TODO remove this once we've removed DEPRECATED_ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG and EIS_GATEWAY_URL
- .setting("xpack.inference.eis.gateway.url", mockEISServer::getUrl)
  // This plugin is located in the inference/qa/test-service-plugin package, look for TestInferenceServicePlugin
  .plugin("inference-service-test")
  .user("x_pack_rest_user", "x-pack-test-password")

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceGetModelsWithElasticInferenceServiceIT.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.xpack.inference;
 
 import org.elasticsearch.inference.TaskType;
-import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceFeature;
 
 import java.io.IOException;
 
@@ -24,17 +23,11 @@ public void testGetDefaultEndpoints() throws IOException {
  var allModels = getAllModels();
  var chatCompletionModels = getModels("_all", TaskType.CHAT_COMPLETION);
 
- if ((ElasticInferenceServiceFeature.DEPRECATED_ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG.isEnabled()
- || ElasticInferenceServiceFeature.ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG.isEnabled())) {
- assertThat(allModels, hasSize(4));
- assertThat(chatCompletionModels, hasSize(1));
-
- for (var model : chatCompletionModels) {
- assertEquals("chat_completion", model.get("task_type"));
- }
- } else {
- assertThat(allModels, hasSize(3));
- assertThat(chatCompletionModels, hasSize(0));
+ assertThat(allModels, hasSize(4));
+ assertThat(chatCompletionModels, hasSize(1));
+
+ for (var model : chatCompletionModels) {
+ assertEquals("chat_completion", model.get("task_type"));
  }
 
  }

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceGetServicesIT.java

@@ -12,7 +12,6 @@
 import org.elasticsearch.client.Request;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.inference.TaskType;
-import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceFeature;
 
 import java.io.IOException;
 import java.util.List;