From e1992714a14d96b4ba64acc76c327788505d743a Mon Sep 17 00:00:00 2001 From: Nathalie Jonathan Date: Tue, 31 Dec 2024 13:18:53 -0800 Subject: [PATCH] Moved test models folder to tests/plugins/ml/ml/models, removed duplicate map keys in ml._common.yaml, removed excluded parts and until property in the test files. Signed-off-by: Nathalie Jonathan --- spec/schemas/ml._common.yaml | 13 ------------- tests/plugins/ml/{ => ml}/models/chunk.yaml | 8 ++------ tests/plugins/ml/{ => ml}/models/load.yaml | 11 ++--------- tests/plugins/ml/{ => ml}/models/meta.yaml | 8 ++------ tests/plugins/ml/{ => ml}/models/predict.yaml | 14 ++------------ .../plugins/ml/{ => ml}/models/register_meta.yaml | 8 ++------ tests/plugins/ml/{ => ml}/models/search.yaml | 6 +----- tests/plugins/ml/{ => ml}/models/undeploy.yaml | 14 ++------------ tests/plugins/ml/{ => ml}/models/unload.yaml | 14 ++------------ tests/plugins/ml/{ => ml}/models/upload.yaml | 11 ++--------- tests/plugins/ml/{ => ml}/models/upload_chunk.yaml | 8 ++------ 11 files changed, 19 insertions(+), 96 deletions(-) rename tests/plugins/ml/{ => ml}/models/chunk.yaml (92%) rename tests/plugins/ml/{ => ml}/models/load.yaml (88%) rename tests/plugins/ml/{ => ml}/models/meta.yaml (85%) rename tests/plugins/ml/{ => ml}/models/predict.yaml (90%) rename tests/plugins/ml/{ => ml}/models/register_meta.yaml (85%) rename tests/plugins/ml/{ => ml}/models/search.yaml (83%) rename tests/plugins/ml/{ => ml}/models/undeploy.yaml (88%) rename tests/plugins/ml/{ => ml}/models/unload.yaml (88%) rename tests/plugins/ml/{ => ml}/models/upload.yaml (77%) rename tests/plugins/ml/{ => ml}/models/upload_chunk.yaml (92%) diff --git a/spec/schemas/ml._common.yaml b/spec/schemas/ml._common.yaml index f3d3bfa3..5fbc9eef 100644 --- a/spec/schemas/ml._common.yaml +++ b/spec/schemas/ml._common.yaml @@ -232,7 +232,6 @@ components: type: object properties: inference_results: - # Update this once the PR for ML Model APIs (#733) has been merged type: array items: $ref: '#/components/schemas/InferenceResults' @@ -950,18 +949,6 @@ components: $ref: '#/components/schemas/ByteBuffer' required: - data - ByteBuffer: - type: object - properties: - array: - type: string - description: The byte buffer array. - order: - type: string - description: The byte buffer order. - enum: - - BIG_ENDIAN - - LITTLE_ENDIAN Credential: type: object properties: diff --git a/tests/plugins/ml/models/chunk.yaml b/tests/plugins/ml/ml/models/chunk.yaml similarity index 92% rename from tests/plugins/ml/models/chunk.yaml rename to tests/plugins/ml/ml/models/chunk.yaml index 20b9cabc..bc429f7b 100644 --- a/tests/plugins/ml/models/chunk.yaml +++ b/tests/plugins/ml/ml/models/chunk.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test deprecated chunk API for chunk upload. -distributions: - excluded: - - amazon-managed - - amazon-serverless prologues: - path: /_cluster/settings method: PUT @@ -74,4 +70,4 @@ chapters: response: status: 200 payload: - status: Uploaded + status: Uploaded \ No newline at end of file diff --git a/tests/plugins/ml/models/load.yaml b/tests/plugins/ml/ml/models/load.yaml similarity index 88% rename from tests/plugins/ml/models/load.yaml rename to tests/plugins/ml/ml/models/load.yaml index 8f2b69b8..55a0cd24 100644 --- a/tests/plugins/ml/models/load.yaml +++ b/tests/plugins/ml/ml/models/load.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the deployment of a model using load API (deprecated). -distributions: - excluded: - - amazon-managed - - amazon-serverless warnings: multiple-paths-detected: false prologues: @@ -26,9 +22,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: model_id: payload.model_id epilogues: @@ -67,4 +60,4 @@ chapters: model_id: payload.model_id retry: count: 3 - wait: 10000 + wait: 10000 \ No newline at end of file diff --git a/tests/plugins/ml/models/meta.yaml b/tests/plugins/ml/ml/models/meta.yaml similarity index 85% rename from tests/plugins/ml/models/meta.yaml rename to tests/plugins/ml/ml/models/meta.yaml index af2a4244..2dc9d1d9 100644 --- a/tests/plugins/ml/models/meta.yaml +++ b/tests/plugins/ml/ml/models/meta.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test deprecated meta API for model creation. -distributions: - excluded: - - amazon-managed - - amazon-serverless prologues: - path: /_cluster/settings method: PUT @@ -38,4 +34,4 @@ chapters: response: status: 200 output: - model_id: payload.model_id + model_id: payload.model_id \ No newline at end of file diff --git a/tests/plugins/ml/models/predict.yaml b/tests/plugins/ml/ml/models/predict.yaml similarity index 90% rename from tests/plugins/ml/models/predict.yaml rename to tests/plugins/ml/ml/models/predict.yaml index 27838101..4c5c7a39 100644 --- a/tests/plugins/ml/models/predict.yaml +++ b/tests/plugins/ml/ml/models/predict.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the prediction of new data. -distributions: - excluded: - - amazon-managed - - amazon-serverless prologues: - path: /_cluster/settings method: PUT @@ -41,9 +37,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: model_id: payload.model_id - path: /_plugins/_ml/models/{model_id}/_deploy @@ -61,9 +54,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: model_id: payload.model_id epilogues: @@ -103,4 +93,4 @@ chapters: inference_results: - output: - data: - - 101 + - 101 \ No newline at end of file diff --git a/tests/plugins/ml/models/register_meta.yaml b/tests/plugins/ml/ml/models/register_meta.yaml similarity index 85% rename from tests/plugins/ml/models/register_meta.yaml rename to tests/plugins/ml/ml/models/register_meta.yaml index 2e270de5..77268c25 100644 --- a/tests/plugins/ml/models/register_meta.yaml +++ b/tests/plugins/ml/ml/models/register_meta.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the creation of model metadata. -distributions: - excluded: - - amazon-managed - - amazon-serverless version: '>= 2.11' prologues: - path: /_cluster/settings @@ -39,4 +35,4 @@ chapters: response: status: 200 output: - model_id: payload.model_id + model_id: payload.model_id \ No newline at end of file diff --git a/tests/plugins/ml/models/search.yaml b/tests/plugins/ml/ml/models/search.yaml similarity index 83% rename from tests/plugins/ml/models/search.yaml rename to tests/plugins/ml/ml/models/search.yaml index 98d79fa5..17a85f43 100644 --- a/tests/plugins/ml/models/search.yaml +++ b/tests/plugins/ml/ml/models/search.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the search of models. -distributions: - excluded: - - amazon-managed - - amazon-serverless version: '>= 2.11' prologues: - path: /_plugins/_ml/models/_register diff --git a/tests/plugins/ml/models/undeploy.yaml b/tests/plugins/ml/ml/models/undeploy.yaml similarity index 88% rename from tests/plugins/ml/models/undeploy.yaml rename to tests/plugins/ml/ml/models/undeploy.yaml index d230545d..84c03d32 100644 --- a/tests/plugins/ml/models/undeploy.yaml +++ b/tests/plugins/ml/ml/models/undeploy.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the undeployment of specific models from specific nodes and a model from all nodes. -distributions: - excluded: - - amazon-managed - - amazon-serverless version: '>= 2.11' prologues: - path: /_cluster/settings @@ -31,9 +27,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: model_id: payload.model_id - path: /_plugins/_ml/models/{model_id}/_deploy @@ -51,9 +44,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: node_id: payload.worker_node[0] model_id: payload.model_id @@ -86,4 +76,4 @@ chapters: parameters: model_id: ${get_completed_register_model_task.model_id} response: - status: 200 + status: 200 \ No newline at end of file diff --git a/tests/plugins/ml/models/unload.yaml b/tests/plugins/ml/ml/models/unload.yaml similarity index 88% rename from tests/plugins/ml/models/unload.yaml rename to tests/plugins/ml/ml/models/unload.yaml index ceb3e10c..49079bc1 100644 --- a/tests/plugins/ml/models/unload.yaml +++ b/tests/plugins/ml/ml/models/unload.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the unload (deprecated) of specific models from specific nodes and a model from all nodes. -distributions: - excluded: - - amazon-managed - - amazon-serverless prologues: - path: /_cluster/settings method: PUT @@ -30,9 +26,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: model_id: payload.model_id - path: /_plugins/_ml/models/{model_id}/_deploy @@ -50,9 +43,6 @@ prologues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: node_id: payload.worker_node[0] model_id: payload.model_id @@ -85,4 +75,4 @@ chapters: parameters: model_id: ${get_completed_register_model_task.model_id} response: - status: 200 + status: 200 \ No newline at end of file diff --git a/tests/plugins/ml/models/upload.yaml b/tests/plugins/ml/ml/models/upload.yaml similarity index 77% rename from tests/plugins/ml/models/upload.yaml rename to tests/plugins/ml/ml/models/upload.yaml index 301a6c08..f1ba3022 100644 --- a/tests/plugins/ml/models/upload.yaml +++ b/tests/plugins/ml/ml/models/upload.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test the creation of models using upload API (deprecated). -distributions: - excluded: - - amazon-managed - - amazon-serverless epilogues: - path: /_plugins/_ml/tasks/{task_id} id: get_completed_task @@ -14,9 +10,6 @@ epilogues: retry: count: 3 wait: 10000 - until: - - path: payload.state - equal: COMPLETED output: model_id: payload.model_id - path: /_plugins/_ml/models/{model_id} @@ -37,4 +30,4 @@ chapters: response: status: 200 output: - task_id: payload.task_id + task_id: payload.task_id \ No newline at end of file diff --git a/tests/plugins/ml/models/upload_chunk.yaml b/tests/plugins/ml/ml/models/upload_chunk.yaml similarity index 92% rename from tests/plugins/ml/models/upload_chunk.yaml rename to tests/plugins/ml/ml/models/upload_chunk.yaml index 2a5626ea..334844d6 100644 --- a/tests/plugins/ml/models/upload_chunk.yaml +++ b/tests/plugins/ml/ml/models/upload_chunk.yaml @@ -1,10 +1,6 @@ -$schema: ../../../../json_schemas/test_story.schema.yaml +$schema: ../../../../../json_schemas/test_story.schema.yaml description: Test uploading model chunk. -distributions: - excluded: - - amazon-managed - - amazon-serverless version: '>= 2.11' prologues: - path: /_cluster/settings @@ -75,4 +71,4 @@ chapters: response: status: 200 payload: - status: Uploaded + status: Uploaded \ No newline at end of file