From 4c03b599ed511f68b8ac822cbb12a9b64e5b0810 Mon Sep 17 00:00:00 2001
From: "Daniel (dB.) Doubrovkine" <dblock@amazon.com>
Date: Wed, 18 Dec 2024 01:22:07 -0500
Subject: [PATCH] Added missing wlm tests. (#744)

Signed-off-by: dblock <dblock@amazon.com>
---
 .../workload-management/query_group.yaml      | 67 -------------------
 .../workload-management/wlm/query_group.yaml  | 41 ++++++++++++
 2 files changed, 41 insertions(+), 67 deletions(-)
 delete mode 100644 tests/plugins/workload-management/query_group.yaml
 create mode 100644 tests/plugins/workload-management/wlm/query_group.yaml

diff --git a/tests/plugins/workload-management/query_group.yaml b/tests/plugins/workload-management/query_group.yaml
deleted file mode 100644
index 6f2b86367..000000000
--- a/tests/plugins/workload-management/query_group.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-$schema: ../../../json_schemas/test_story.schema.yaml
-
-description: This story tests all endpoints relevant to QueryGroups, from creation to deletion.
-
-prologues:
-  - path: /_wlm/query_group
-    version: '>= 2.17'
-    method: PUT
-    request:
-      payload:
-        name: analytics
-        resource_limits:
-          memory: 0.1
-        resiliency_mode: monitor
-    status: [200]
-  - path: /_wlm/query_group
-    version: '>= 2.17'
-    method: PUT
-    request:
-      payload:
-        name: analytics2
-        resource_limits:
-          memory: 0.15
-          cpu: 0.05
-        resiliency_mode: monitor
-    status: [200]
-
-chapters:
-  - synopsis: Update the QueryGroup named `analytics2`, with resiliency_mode to be enforced and memory to be 0.25 and cpu to be 0.25.
-    version: '>= 2.17'
-    path: /_wlm/query_group/{name}
-    method: PUT
-    parameters:
-      name: analytics2
-    request:
-      payload:
-        resource_limits:
-          memory: 0.25
-          cpu: 0.25
-        resiliency_mode: enforced
-    response:
-      status: 200
-  - synopsis: Get the QueryGroup named `analytics2`.
-    version: '>= 2.17'
-    path: /_wlm/query_group/{name}
-    method: GET
-    parameters:
-      name: analytics2
-    response:
-      status: 200
-      payload:
-        query_groups:
-          - name: analytics2
-            resource_limits:
-              memory: 0.25
-              cpu: 0.25
-            resiliency_mode: enforced
-
-epilogues:
-  - path: /_wlm/query_group/analytics
-    version: '>= 2.17'
-    method: DELETE
-    status: [200]
-  - path: /_wlm/query_group/analytics2
-    version: '>= 2.17'
-    method: DELETE
-    status: [200]
diff --git a/tests/plugins/workload-management/wlm/query_group.yaml b/tests/plugins/workload-management/wlm/query_group.yaml
new file mode 100644
index 000000000..aa6a68b9d
--- /dev/null
+++ b/tests/plugins/workload-management/wlm/query_group.yaml
@@ -0,0 +1,41 @@
+$schema: ../../../../json_schemas/test_story.schema.yaml
+
+description: This story tests all endpoints relevant to QueryGroups, from creation to deletion.
+version: '>= 2.17'
+
+chapters:
+  - synopsis: Create a QueryGroup.
+    path: /_wlm/query_group
+    method: PUT
+    request:
+      payload:
+        name: analytics
+        resource_limits:
+          memory: 0.1
+        resiliency_mode: monitor
+  - synopsis: Get the QueryGroup by name.
+    path: /_wlm/query_group/{name}
+    method: GET
+    parameters:
+      name: analytics
+    response:
+      status: 200
+      payload:
+        query_groups:
+          - name: analytics
+            resource_limits:
+              memory: 0.1
+            resiliency_mode: monitor
+  - synopsis: Get all QueryGroups.
+    path: /_wlm/query_group
+    method: GET
+  - synopsis: Delete a QueryGroup.
+    path: /_wlm/query_group/{name}
+    parameters:
+      name: analytics
+    method: DELETE
+
+epilogues:
+  - path: /_wlm/query_group/analytics
+    method: DELETE
+    status: [200, 404]