Skip to content

Commit 00bb6de

Browse files
Switch EIS license to enterprise
1 parent 05c333c commit 00bb6de

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class BaseMockEISAuthServerTest extends ESRestTestCase {
3838

3939
private static ElasticsearchCluster cluster = ElasticsearchCluster.local()
4040
.distribution(DistributionType.DEFAULT)
41-
.setting("xpack.license.self_generated.type", "basic")
41+
.setting("xpack.license.self_generated.type", "trial")
4242
.setting("xpack.security.enabled", "true")
4343
// Adding both settings unless one feature flag is disabled in a particular environment
4444
.setting("xpack.inference.elastic.url", mockEISServer::getUrl)

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,28 @@ public void testPutModel_RestrictedWithBasicLicense() throws Exception {
4545
sendRestrictedRequest("PUT", endpoint, modelConfig);
4646
}
4747

48+
public void testUpdateModel_RestrictedWithBasicLicense() throws Exception {
49+
var endpoint = Strings.format("_inference/%s/%s/_update?error_trace", TaskType.SPARSE_EMBEDDING, "endpoint-id");
50+
var requestBody = """
51+
{
52+
"task_settings": {
53+
"num_threads": 2
54+
}
55+
}
56+
""";
57+
sendRestrictedRequest("PUT", endpoint, requestBody);
58+
}
59+
60+
public void testPerformInference_RestrictedWithBasicLicense() throws Exception {
61+
var endpoint = Strings.format("_inference/%s/%s?error_trace", TaskType.SPARSE_EMBEDDING, "endpoint-id");
62+
var requestBody = """
63+
{
64+
"input": ["washing", "machine"]
65+
}
66+
""";
67+
sendRestrictedRequest("POST", endpoint, requestBody);
68+
}
69+
4870
public void testGetServices_NonRestrictedWithBasicLicense() throws Exception {
4971
var endpoint = "_inference/_services";
5072
sendNonRestrictedRequest("GET", endpoint, null, 200, false);

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public class InferencePlugin extends Plugin
243243
public static final LicensedFeature.Momentary EIS_INFERENCE_FEATURE = LicensedFeature.momentary(
244244
"inference",
245245
"Elastic Inference Service",
246-
License.OperationMode.BASIC
246+
License.OperationMode.ENTERPRISE
247247
);
248248

249249
public static final String X_ELASTIC_PRODUCT_USE_CASE_HTTP_HEADER = "X-elastic-product-use-case";

0 commit comments

Comments
 (0)