Skip to content

Fix injection of preset variables into the JS interpreter #12515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 4 commits into from
Feb 11, 2026
Merged

Fix injection of preset variables into the JS interpreter #12515

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0ffad2
Fix injection of preset variables into the JS interpreter
winterhazel Jan 25, 2026
6c819d0
Fix HeuristicRuleHelper tests
winterhazel Jan 25, 2026
d2ca3ef
Address copilot review
winterhazel Jan 27, 2026
f920c7f
Merge remote-tracking branch 'upstream/4.20' into fix-preset-variable…
winterhazel Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix HeuristicRuleHelper tests
  • Loading branch information
@winterhazel
winterhazel committed Jan 25, 2026
commit 6c819d0c141d167766e00e953a25c1d6cc6d9f06
16 changes: 16 additions & 0 deletions server/src/test/java/org/apache/cloudstack/storage/heuristics/HeuristicRuleHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.storage.heuristics;

import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.Storage;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VolumeVO;
import com.cloud.utils.exception.CloudRuntimeException;
Expand All @@ -29,6 +31,7 @@
import org.apache.cloudstack.utils.jsinterpreter.JsInterpreter;
import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
Expand Down Expand Up @@ -68,6 +71,19 @@ public class HeuristicRuleHelperTest {
@InjectMocks
HeuristicRuleHelper heuristicRuleHelperSpy = new HeuristicRuleHelper();

@Before
public void setUp() {
Mockito.doReturn("template-name").when(vmTemplateVOMock).getName();
Mockito.doReturn(Storage.ImageFormat.QCOW2).when(vmTemplateVOMock).getFormat();
Mockito.doReturn(Hypervisor.HypervisorType.KVM).when(vmTemplateVOMock).getHypervisorType();
Mockito.doReturn("snapshot-name").when(snapshotInfoMock).getName();
Mockito.doReturn(1024L).when(snapshotInfoMock).getSize();
Mockito.doReturn(Hypervisor.HypervisorType.VMware).when(snapshotInfoMock).getHypervisorType();
Mockito.doReturn("volume-name").when(volumeVOMock).getName();
Mockito.doReturn(Storage.ImageFormat.RAW).when(volumeVOMock).getFormat();
Mockito.doReturn(2048L).when(volumeVOMock).getSize();
}

@Test
public void getImageStoreIfThereIsHeuristicRuleTestZoneDoesNotHaveHeuristicRuleShouldReturnNull() {
Long zoneId = 1L;
Expand Down
Loading