Moved test models folder to tests/plugins/ml/ml/models, removed dupli…

…cate map keys in ml._common.yaml, removed excluded parts and until property in the test files. Signed-off-by: Nathalie Jonathan <[email protected]>
nathaliellenaa · Dec 31, 2024 · 1e2619d · 1e2619d
1 parent 8eadec0
commit 1e2619d
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 96 deletions.
diff --git a/spec/schemas/ml._common.yaml b/spec/schemas/ml._common.yaml
@@ -201,7 +201,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'
@@ -705,18 +704,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 → tests/plugins/ml/ml/models/chunk.yaml b/tests/plugins/ml/models/chunk.yaml → 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
diff --git a/tests/plugins/ml/models/load.yaml → tests/plugins/ml/ml/models/load.yaml b/tests/plugins/ml/models/load.yaml → 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
diff --git a/tests/plugins/ml/models/meta.yaml → tests/plugins/ml/ml/models/meta.yaml b/tests/plugins/ml/models/meta.yaml → 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
diff --git a/tests/plugins/ml/models/predict.yaml → tests/plugins/ml/ml/models/predict.yaml b/tests/plugins/ml/models/predict.yaml → 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
diff --git a/tests/plugins/ml/models/register_meta.yaml → ...s/plugins/ml/ml/models/register_meta.yaml b/tests/plugins/ml/models/register_meta.yaml → ...s/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
diff --git a/tests/plugins/ml/models/search.yaml → tests/plugins/ml/ml/models/search.yaml b/tests/plugins/ml/models/search.yaml → 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 → tests/plugins/ml/ml/models/undeploy.yaml b/tests/plugins/ml/models/undeploy.yaml → 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
diff --git a/tests/plugins/ml/models/unload.yaml → tests/plugins/ml/ml/models/unload.yaml b/tests/plugins/ml/models/unload.yaml → 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
diff --git a/tests/plugins/ml/models/upload.yaml → tests/plugins/ml/ml/models/upload.yaml b/tests/plugins/ml/models/upload.yaml → 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
diff --git a/tests/plugins/ml/models/upload_chunk.yaml → tests/plugins/ml/ml/models/upload_chunk.yaml b/tests/plugins/ml/models/upload_chunk.yaml → 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