Skip to content

Commit 2cefcc3

Browse files
committed
fix test that sets max cpu, memory globally
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent a84d2d7 commit 2cefcc3

File tree

1 file changed

+33
-17
lines changed

1 file changed

+33
-17
lines changed

server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,25 @@
1616
// under the License.
1717
package com.cloud.hypervisor;
1818

19+
import java.io.UnsupportedEncodingException;
20+
import java.util.Arrays;
21+
import java.util.HashMap;
22+
import java.util.Map;
23+
24+
import org.apache.cloudstack.api.ApiConstants;
25+
import org.apache.cloudstack.framework.config.ConfigKey;
26+
import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
27+
import org.junit.After;
28+
import org.junit.Assert;
29+
import org.junit.Before;
30+
import org.junit.Test;
31+
import org.junit.runner.RunWith;
32+
import org.mockito.InjectMocks;
33+
import org.mockito.Mock;
34+
import org.mockito.Mockito;
35+
import org.mockito.Spy;
36+
import org.mockito.junit.MockitoJUnitRunner;
37+
1938
import com.cloud.agent.api.to.NicTO;
2039
import com.cloud.agent.api.to.VirtualMachineTO;
2140
import com.cloud.configuration.ConfigurationManagerImpl;
@@ -34,23 +53,6 @@
3453
import com.cloud.utils.Pair;
3554
import com.cloud.vm.VirtualMachine;
3655
import com.cloud.vm.VirtualMachineProfile;
37-
import org.apache.cloudstack.api.ApiConstants;
38-
import org.apache.cloudstack.framework.config.ConfigKey;
39-
import org.apache.cloudstack.utils.bytescale.ByteScaleUtils;
40-
import org.junit.Assert;
41-
import org.junit.Before;
42-
import org.junit.Test;
43-
import org.junit.runner.RunWith;
44-
import org.mockito.InjectMocks;
45-
import org.mockito.Mock;
46-
import org.mockito.Mockito;
47-
import org.mockito.Spy;
48-
import org.mockito.junit.MockitoJUnitRunner;
49-
50-
import java.io.UnsupportedEncodingException;
51-
import java.util.Arrays;
52-
import java.util.HashMap;
53-
import java.util.Map;
5456

5557
@RunWith(MockitoJUnitRunner.class)
5658
public class KVMGuruTest {
@@ -111,8 +113,15 @@ public class KVMGuruTest {
111113
private static final String detail2Key = "detail2";
112114
private static final String detail2Value = "value2";
113115

116+
private ConfigKey<Integer> originalVmServiceOfferingMaxCpuCores;
117+
private ConfigKey<Integer> originalVmServiceOfferingMaxRAMSize;
118+
114119
@Before
115120
public void setup() throws UnsupportedEncodingException {
121+
// Preserve the original value for restoration in tearDown
122+
originalVmServiceOfferingMaxCpuCores = ConfigurationManagerImpl.VM_SERVICE_OFFERING_MAX_CPU_CORES;
123+
originalVmServiceOfferingMaxRAMSize = ConfigurationManagerImpl.VM_SERVICE_OFFERING_MAX_RAM_SIZE;
124+
116125
Mockito.when(vmTO.getLimitCpuUse()).thenReturn(true);
117126
Mockito.when(vmProfile.getVirtualMachine()).thenReturn(vm);
118127
Mockito.when(vm.getHostId()).thenReturn(hostId);
@@ -134,6 +143,13 @@ public void setup() throws UnsupportedEncodingException {
134143
Arrays.asList(detail1, detail2));
135144
}
136145

146+
@After
147+
public void tearDown() {
148+
// Restore the original value
149+
ConfigurationManagerImpl.VM_SERVICE_OFFERING_MAX_CPU_CORES = originalVmServiceOfferingMaxCpuCores;
150+
ConfigurationManagerImpl.VM_SERVICE_OFFERING_MAX_RAM_SIZE = originalVmServiceOfferingMaxRAMSize;
151+
}
152+
137153
@Test
138154
public void testSetVmQuotaPercentage() {
139155
guru.setVmQuotaPercentage(vmTO, vmProfile);

0 commit comments

Comments
 (0)