Skip to content

Commit 3016174

Browse files
ruai0511ruai0511
committed
fix UT
Signed-off-by: Ruirui Zhang <mariazrr@amazon.com>
1 parent e0249dd commit 3016174

15 files changed

+101
-70
lines changed

‎plugins/workload-management/src/javaRestTest/java/org/opensearch/rest/WorkloadManagementRestIT.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@
1515
import org.opensearch.test.rest.OpenSearchRestTestCase;
1616

1717
import java.io.IOException;
18+
import java.util.Locale;
1819

1920
public class WorkloadManagementRestIT extends OpenSearchRestTestCase {
2021

2122
public void testCreate() throws Exception {
23+
setWlmMode("enabled");
2224
Response response = performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics", "enforced", 0.4, 0.2));
2325
assertEquals(response.getStatusLine().getStatusCode(), 200);
2426
performOperation("DELETE", "_wlm/workload_group/analytics", null);
2527
}
2628

2729
public void testMultipleCreate() throws Exception {
30+
setWlmMode("enabled");
2831
Response response = performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics2", "enforced", 0.4, 0.2));
2932
assertEquals(response.getStatusLine().getStatusCode(), 200);
3033

@@ -40,6 +43,7 @@ public void testMultipleCreate() throws Exception {
4043
}
4144

4245
public void testGet() throws Exception {
46+
setWlmMode("enabled");
4347
Response response = performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics3", "enforced", 0.4, 0.2));
4448
assertEquals(response.getStatusLine().getStatusCode(), 200);
4549

@@ -56,6 +60,7 @@ public void testGet() throws Exception {
5660
}
5761

5862
public void testDelete() throws Exception {
63+
setWlmMode("enabled");
5964
Response response = performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics4", "enforced", 0.4, 0.2));
6065
assertEquals(response.getStatusLine().getStatusCode(), 200);
6166

@@ -67,6 +72,7 @@ public void testDelete() throws Exception {
6772
}
6873

6974
public void testUpdate() throws Exception {
75+
setWlmMode("enabled");
7076
Response response = performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics5", "enforced", 0.4, 0.2));
7177
assertEquals(response.getStatusLine().getStatusCode(), 200);
7278

@@ -93,6 +99,7 @@ public void testUpdate() throws Exception {
9399
}
94100

95101
public void testCRUD() throws Exception {
102+
setWlmMode("enabled");
96103
Response response = performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics6", "enforced", 0.4, 0.2));
97104
assertEquals(response.getStatusLine().getStatusCode(), 200);
98105

@@ -129,6 +136,16 @@ public void testCRUD() throws Exception {
129136
performOperation("DELETE", "_wlm/workload_group/users3", null);
130137
}
131138

139+
public void testOperationWhenWlmDisabled() throws Exception {
140+
setWlmMode("disabled");
141+
assertThrows(
142+
ResponseException.class,
143+
() -> performOperation("PUT", "_wlm/workload_group", getCreateJson("analytics", "enforced", 0.4, 0.2))
144+
);
145+
assertThrows(ResponseException.class, () -> performOperation("DELETE", "_wlm/workload_group/analytics4", null));
146+
assertOK(performOperation("GET", "_wlm/workload_group/", null));
147+
}
148+
132149
static String getCreateJson(String name, String resiliencyMode, double cpu, double memory) {
133150
return "{\n"
134151
+ " \"name\": \""
@@ -171,4 +188,19 @@ Response performOperation(String method, String uriPath, String json) throws IOE
171188
}
172189
return client().performRequest(request);
173190
}
191+
192+
public void setWlmMode(String mode) throws Exception {
193+
String settingJson = String.format(Locale.ROOT, """
194+
{
195+
"persistent": {
196+
"wlm.workload_group.mode": "%s"
197+
}
198+
}
199+
""", mode);
200+
201+
Request request = new Request("PUT", "/_cluster/settings");
202+
request.setJsonEntity(settingJson);
203+
Response response = client().performRequest(request);
204+
assertEquals(200, response.getStatusLine().getStatusCode());
205+
}
174206
}

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/WorkloadManagementTestUtils.java‎ renamed to ‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/WorkloadGroupTestUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import static org.junit.Assert.assertTrue;
4141
import static org.mockito.Mockito.mock;
4242

43-
public class WorkloadManagementTestUtils {
43+
public class WorkloadGroupTestUtils {
4444
public static final String NAME_ONE = "workload_group_one";
4545
public static final String NAME_TWO = "workload_group_two";
4646
public static final String _ID_ONE = "AgfUO5Ja9yfsYlONlYi3TQ==";

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupRequestTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import java.util.ArrayList;
1818
import java.util.List;
1919

20-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.assertEqualWorkloadGroups;
21-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.workloadGroupOne;
20+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.assertEqualWorkloadGroups;
21+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.workloadGroupOne;
2222

2323
public class CreateWorkloadGroupRequestTests extends OpenSearchTestCase {
2424

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateWorkloadGroupResponseTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.opensearch.core.rest.RestStatus;
1616
import org.opensearch.core.xcontent.ToXContent;
1717
import org.opensearch.core.xcontent.XContentBuilder;
18-
import org.opensearch.plugin.wlm.WorkloadManagementTestUtils;
18+
import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
1919
import org.opensearch.test.OpenSearchTestCase;
2020

2121
import java.io.IOException;
@@ -30,7 +30,7 @@ public class CreateWorkloadGroupResponseTests extends OpenSearchTestCase {
3030
* Test case to verify serialization and deserialization of CreateWorkloadGroupResponse.
3131
*/
3232
public void testSerialization() throws IOException {
33-
CreateWorkloadGroupResponse response = new CreateWorkloadGroupResponse(WorkloadManagementTestUtils.workloadGroupOne, RestStatus.OK);
33+
CreateWorkloadGroupResponse response = new CreateWorkloadGroupResponse(WorkloadGroupTestUtils.workloadGroupOne, RestStatus.OK);
3434
BytesStreamOutput out = new BytesStreamOutput();
3535
response.writeTo(out);
3636
StreamInput streamInput = out.bytes().streamInput();
@@ -42,15 +42,15 @@ public void testSerialization() throws IOException {
4242
List<WorkloadGroup> listTwo = new ArrayList<>();
4343
listOne.add(responseGroup);
4444
listTwo.add(otherResponseGroup);
45-
WorkloadManagementTestUtils.assertEqualWorkloadGroups(listOne, listTwo, false);
45+
WorkloadGroupTestUtils.assertEqualWorkloadGroups(listOne, listTwo, false);
4646
}
4747

4848
/**
4949
* Test case to validate the toXContent method of CreateWorkloadGroupResponse.
5050
*/
5151
public void testToXContentCreateWorkloadGroup() throws IOException {
5252
XContentBuilder builder = JsonXContent.contentBuilder().prettyPrint();
53-
CreateWorkloadGroupResponse response = new CreateWorkloadGroupResponse(WorkloadManagementTestUtils.workloadGroupOne, RestStatus.OK);
53+
CreateWorkloadGroupResponse response = new CreateWorkloadGroupResponse(WorkloadGroupTestUtils.workloadGroupOne, RestStatus.OK);
5454
String actual = response.toXContent(builder, mock(ToXContent.Params.class)).toString();
5555
String expected = "{\n"
5656
+ " \"_id\" : \"AgfUO5Ja9yfsYlONlYi3TQ==\",\n"

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/DeleteWorkloadGroupRequestTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.opensearch.action.ActionRequestValidationException;
1212
import org.opensearch.common.io.stream.BytesStreamOutput;
1313
import org.opensearch.core.common.io.stream.StreamInput;
14-
import org.opensearch.plugin.wlm.WorkloadManagementTestUtils;
14+
import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
1515
import org.opensearch.test.OpenSearchTestCase;
1616

1717
import java.io.IOException;
@@ -22,8 +22,8 @@ public class DeleteWorkloadGroupRequestTests extends OpenSearchTestCase {
2222
* Test case to verify the serialization and deserialization of DeleteWorkloadGroupRequest.
2323
*/
2424
public void testSerialization() throws IOException {
25-
DeleteWorkloadGroupRequest request = new DeleteWorkloadGroupRequest(WorkloadManagementTestUtils.NAME_ONE);
26-
assertEquals(WorkloadManagementTestUtils.NAME_ONE, request.getName());
25+
DeleteWorkloadGroupRequest request = new DeleteWorkloadGroupRequest(WorkloadGroupTestUtils.NAME_ONE);
26+
assertEquals(WorkloadGroupTestUtils.NAME_ONE, request.getName());
2727
BytesStreamOutput out = new BytesStreamOutput();
2828
request.writeTo(out);
2929
StreamInput streamInput = out.bytes().streamInput();

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupRequestTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.opensearch.common.io.stream.BytesStreamOutput;
1212
import org.opensearch.core.common.io.stream.StreamInput;
13-
import org.opensearch.plugin.wlm.WorkloadManagementTestUtils;
13+
import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
1414
import org.opensearch.test.OpenSearchTestCase;
1515

1616
import java.io.IOException;
@@ -21,8 +21,8 @@ public class GetWorkloadGroupRequestTests extends OpenSearchTestCase {
2121
* Test case to verify the serialization and deserialization of GetWorkloadGroupRequest.
2222
*/
2323
public void testSerialization() throws IOException {
24-
GetWorkloadGroupRequest request = new GetWorkloadGroupRequest(WorkloadManagementTestUtils.NAME_ONE);
25-
assertEquals(WorkloadManagementTestUtils.NAME_ONE, request.getName());
24+
GetWorkloadGroupRequest request = new GetWorkloadGroupRequest(WorkloadGroupTestUtils.NAME_ONE);
25+
assertEquals(WorkloadGroupTestUtils.NAME_ONE, request.getName());
2626
BytesStreamOutput out = new BytesStreamOutput();
2727
request.writeTo(out);
2828
StreamInput streamInput = out.bytes().streamInput();

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetWorkloadGroupResponseTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.opensearch.core.rest.RestStatus;
1616
import org.opensearch.core.xcontent.ToXContent;
1717
import org.opensearch.core.xcontent.XContentBuilder;
18-
import org.opensearch.plugin.wlm.WorkloadManagementTestUtils;
18+
import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
1919
import org.opensearch.test.OpenSearchTestCase;
2020

2121
import java.io.IOException;
@@ -31,7 +31,7 @@ public class GetWorkloadGroupResponseTests extends OpenSearchTestCase {
3131
*/
3232
public void testSerializationSingleWorkloadGroup() throws IOException {
3333
List<WorkloadGroup> list = new ArrayList<>();
34-
list.add(WorkloadManagementTestUtils.workloadGroupOne);
34+
list.add(WorkloadGroupTestUtils.workloadGroupOne);
3535
GetWorkloadGroupResponse response = new GetWorkloadGroupResponse(list, RestStatus.OK);
3636
assertEquals(response.getWorkloadGroups(), list);
3737

@@ -41,15 +41,15 @@ public void testSerializationSingleWorkloadGroup() throws IOException {
4141

4242
GetWorkloadGroupResponse otherResponse = new GetWorkloadGroupResponse(streamInput);
4343
assertEquals(response.getRestStatus(), otherResponse.getRestStatus());
44-
WorkloadManagementTestUtils.assertEqualWorkloadGroups(response.getWorkloadGroups(), otherResponse.getWorkloadGroups(), false);
44+
WorkloadGroupTestUtils.assertEqualWorkloadGroups(response.getWorkloadGroups(), otherResponse.getWorkloadGroups(), false);
4545
}
4646

4747
/**
4848
* Test case to verify the serialization and deserialization of GetWorkloadGroupResponse when the result contains multiple WorkloadGroups.
4949
*/
5050
public void testSerializationMultipleWorkloadGroup() throws IOException {
51-
GetWorkloadGroupResponse response = new GetWorkloadGroupResponse(WorkloadManagementTestUtils.workloadGroupList(), RestStatus.OK);
52-
assertEquals(response.getWorkloadGroups(), WorkloadManagementTestUtils.workloadGroupList());
51+
GetWorkloadGroupResponse response = new GetWorkloadGroupResponse(WorkloadGroupTestUtils.workloadGroupList(), RestStatus.OK);
52+
assertEquals(response.getWorkloadGroups(), WorkloadGroupTestUtils.workloadGroupList());
5353

5454
BytesStreamOutput out = new BytesStreamOutput();
5555
response.writeTo(out);
@@ -58,7 +58,7 @@ public void testSerializationMultipleWorkloadGroup() throws IOException {
5858
GetWorkloadGroupResponse otherResponse = new GetWorkloadGroupResponse(streamInput);
5959
assertEquals(response.getRestStatus(), otherResponse.getRestStatus());
6060
assertEquals(2, otherResponse.getWorkloadGroups().size());
61-
WorkloadManagementTestUtils.assertEqualWorkloadGroups(response.getWorkloadGroups(), otherResponse.getWorkloadGroups(), false);
61+
WorkloadGroupTestUtils.assertEqualWorkloadGroups(response.getWorkloadGroups(), otherResponse.getWorkloadGroups(), false);
6262
}
6363

6464
/**
@@ -83,7 +83,7 @@ public void testSerializationNull() throws IOException {
8383
*/
8484
public void testToXContentGetSingleWorkloadGroup() throws IOException {
8585
List<WorkloadGroup> workloadGroupList = new ArrayList<>();
86-
workloadGroupList.add(WorkloadManagementTestUtils.workloadGroupOne);
86+
workloadGroupList.add(WorkloadGroupTestUtils.workloadGroupOne);
8787
XContentBuilder builder = JsonXContent.contentBuilder().prettyPrint();
8888
GetWorkloadGroupResponse response = new GetWorkloadGroupResponse(workloadGroupList, RestStatus.OK);
8989
String actual = response.toXContent(builder, mock(ToXContent.Params.class)).toString();
@@ -108,8 +108,8 @@ public void testToXContentGetSingleWorkloadGroup() throws IOException {
108108
*/
109109
public void testToXContentGetMultipleWorkloadGroup() throws IOException {
110110
List<WorkloadGroup> workloadGroupList = new ArrayList<>();
111-
workloadGroupList.add(WorkloadManagementTestUtils.workloadGroupOne);
112-
workloadGroupList.add(WorkloadManagementTestUtils.workloadGroupTwo);
111+
workloadGroupList.add(WorkloadGroupTestUtils.workloadGroupOne);
112+
workloadGroupList.add(WorkloadGroupTestUtils.workloadGroupTwo);
113113
XContentBuilder builder = JsonXContent.contentBuilder().prettyPrint();
114114
GetWorkloadGroupResponse response = new GetWorkloadGroupResponse(workloadGroupList, RestStatus.OK);
115115
String actual = response.toXContent(builder, mock(ToXContent.Params.class)).toString();

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/TransportGetWorkloadGroupActionTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import org.opensearch.threadpool.ThreadPool;
1818
import org.opensearch.transport.TransportService;
1919

20-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.NAME_NONE_EXISTED;
21-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.NAME_ONE;
22-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.clusterState;
20+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.NAME_NONE_EXISTED;
21+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.NAME_ONE;
22+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.clusterState;
2323
import static org.mockito.Mockito.mock;
2424

2525
public class TransportGetWorkloadGroupActionTests extends OpenSearchTestCase {

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupRequestTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.NAME_ONE;
23-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.workloadGroupOne;
22+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.NAME_ONE;
23+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.workloadGroupOne;
2424

2525
public class UpdateWorkloadGroupRequestTests extends OpenSearchTestCase {
2626

‎plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateWorkloadGroupResponseTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import org.opensearch.core.rest.RestStatus;
1616
import org.opensearch.core.xcontent.ToXContent;
1717
import org.opensearch.core.xcontent.XContentBuilder;
18-
import org.opensearch.plugin.wlm.WorkloadManagementTestUtils;
18+
import org.opensearch.plugin.wlm.WorkloadGroupTestUtils;
1919
import org.opensearch.test.OpenSearchTestCase;
2020

2121
import java.io.IOException;
2222
import java.util.ArrayList;
2323
import java.util.List;
2424

25-
import static org.opensearch.plugin.wlm.WorkloadManagementTestUtils.workloadGroupOne;
25+
import static org.opensearch.plugin.wlm.WorkloadGroupTestUtils.workloadGroupOne;
2626
import static org.mockito.Mockito.mock;
2727

2828
public class UpdateWorkloadGroupResponseTests extends OpenSearchTestCase {
@@ -43,7 +43,7 @@ public void testSerialization() throws IOException {
4343
List<WorkloadGroup> list2 = new ArrayList<>();
4444
list1.add(responseGroup);
4545
list2.add(otherResponseGroup);
46-
WorkloadManagementTestUtils.assertEqualWorkloadGroups(list1, list2, false);
46+
WorkloadGroupTestUtils.assertEqualWorkloadGroups(list1, list2, false);
4747
}
4848

4949
/**

0 commit comments

Comments
 (0)