This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 38f028613fc Fix getRepair method in checkVolume command (#8840)
38f028613fc is described below
commit 38f028613fcfb8c2ed8c2475a0a6157494cc2e6c
Author: Vishesh <[email protected]>
AuthorDate: Tue Apr 2 17:37:58 2024 +0530
Fix getRepair method in checkVolume command (#8840)
* Fix getRepair method in checkVolume command
* Add License
---
.../user/volume/CheckAndRepairVolumeCmd.java | 5 +-
.../user/volume/CheckAndRepairVolumeCmdTest.java | 63 ++++++++++++++++++++++
2 files changed, 66 insertions(+), 2 deletions(-)
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
index 9c0d1a1058a..e28efd10852 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
@@ -29,6 +29,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.lang3.EnumUtils;
import org.apache.log4j.Logger;
import com.cloud.exception.ResourceAllocationException;
@@ -71,9 +72,9 @@ public class CheckAndRepairVolumeCmd extends BaseAsyncCmd {
public String getRepair() {
if (org.apache.commons.lang3.StringUtils.isNotEmpty(repair)) {
- RepairValues repairType = Enum.valueOf(RepairValues.class,
repair.toUpperCase());
+ RepairValues repairType =
EnumUtils.getEnumIgnoreCase(RepairValues.class, repair);
if (repairType == null) {
- throw new InvalidParameterValueException(String.format("Repair
parameter can only take the following values: %s" +
Arrays.toString(RepairValues.values())));
+ throw new InvalidParameterValueException(String.format("Repair
parameter can only take the following values: %s",
Arrays.toString(RepairValues.values())));
}
return repair.toLowerCase();
}
diff --git
a/api/src/test/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmdTest.java
b/api/src/test/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmdTest.java
new file mode 100644
index 00000000000..226ff882fa7
--- /dev/null
+++
b/api/src/test/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmdTest.java
@@ -0,0 +1,63 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.volume;
+
+import com.cloud.exception.InvalidParameterValueException;
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CheckAndRepairVolumeCmdTest extends TestCase {
+ private CheckAndRepairVolumeCmd checkAndRepairVolumeCmd;
+ private AutoCloseable closeable;
+
+ @Before
+ public void setup() {
+ closeable = MockitoAnnotations.openMocks(this);
+ checkAndRepairVolumeCmd = new CheckAndRepairVolumeCmd();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ closeable.close();
+ }
+
+ @Test
+ public void testGetRepair() {
+ ReflectionTestUtils.setField(checkAndRepairVolumeCmd, "repair", "all");
+ assertEquals("all", checkAndRepairVolumeCmd.getRepair());
+
+ ReflectionTestUtils.setField(checkAndRepairVolumeCmd, "repair",
"LEAKS");
+ assertEquals("leaks", checkAndRepairVolumeCmd.getRepair());
+
+ ReflectionTestUtils.setField(checkAndRepairVolumeCmd, "repair", null);
+ assertNull(checkAndRepairVolumeCmd.getRepair());
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void testGetRepairInvalid() {
+ ReflectionTestUtils.setField(checkAndRepairVolumeCmd, "repair",
"RANDOM STRING");
+ checkAndRepairVolumeCmd.getRepair();
+ }
+}
