fix tests; add permissions

Author: prwhelan

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

@@ -110,6 +110,8 @@ public void testAttachWithModelId() throws IOException {
         var results = infer(inferenceId, List.of("washing machine"));
         assertNotNull(results.get("sparse_embedding"));
 
+        deleteModel(inferenceId);
+
         forceStopMlNodeDeployment(deploymentId);
     }
 
@@ -225,6 +227,7 @@ public void testNumAllocationsIsUpdated() throws IOException {
             )
         );
 
+        deleteModel(inferenceId);
         forceStopMlNodeDeployment(deploymentId);
     }
 
@@ -266,6 +269,7 @@ public void testUpdateWhenInferenceEndpointCreatesDeployment() throws IOExceptio
             is(Map.of("num_allocations", 2, "num_threads", 1, "model_id", modelId))
         );
 
+        deleteModel(inferenceId);
         forceStopMlNodeDeployment(deploymentId);
     }
 
@@ -309,6 +313,8 @@ public void testCannotUpdateAnotherInferenceEndpointsCreatedDeployment() throws
             )
         );
 
+        deleteModel(inferenceId);
+        deleteModel(secondInferenceId);
         forceStopMlNodeDeployment(deploymentId);
     }
 
@@ -331,6 +337,7 @@ public void testStoppingDeploymentAttachedToInferenceEndpoint() throws IOExcepti
             )
         );
 
+        deleteModel(inferenceId);
         // Force stop will stop the deployment
         forceStopMlNodeDeployment(deploymentId);
     }
@@ -358,16 +365,6 @@ private String endpointConfig(String modelId, String deploymentId) {
             """, modelId, deploymentId);
     }
 
-    private String updatedEndpointConfig(int numAllocations) {
-        return Strings.format("""
-            {
-              "service_settings": {
-                "num_allocations": %d
-              }
-            }
-            """, numAllocations);
-    }
-
     private Response startMlNodeDeploymemnt(String modelId, String deploymentId) throws IOException {
         String endPoint = "/_ml/trained_models/"
             + modelId
@@ -413,16 +410,6 @@ private Response updateMlNodeDeploymemnt(String deploymentId, int numAllocations
         return client().performRequest(request);
     }
 
-    private Map<String, Object> updateMlNodeDeploymemnt(String deploymentId, String body) throws IOException {
-        String endPoint = "/_ml/trained_models/" + deploymentId + "/deployment/_update";
-
-        Request request = new Request("POST", endPoint);
-        request.setJsonEntity(body);
-        var response = client().performRequest(request);
-        assertStatusOkOrCreated(response);
-        return entityAsMap(response);
-    }
-
     protected void stopMlNodeDeployment(String deploymentId) throws IOException {
         String endpoint = "/_ml/trained_models/" + deploymentId + "/deployment/_stop";
         Request request = new Request("POST", endpoint);

x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java

@@ -174,6 +174,7 @@ public class Constants {
         "cluster:admin/xpack/enrich/get",
         "cluster:admin/xpack/enrich/put",
         "cluster:admin/xpack/enrich/reindex",
+        "cluster:admin/xpack/inference/clear_inference_endpoint_cache",
         "cluster:admin/xpack/inference/delete",
         "cluster:admin/xpack/inference/put",
         "cluster:admin/xpack/inference/update",