Copilot commented on code in PR #10997:
URL: https://github.com/apache/cloudstack/pull/10997#discussion_r2191977419
##########
server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java:
##########
@@ -505,4 +573,70 @@ public boolean match(MetadataReader mdr,
MetadataReaderFactory arg1) throws IOEx
}
}
}
+
+ List<CapacityVO> getClusterCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(1000L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getClusterId()).thenReturn(2L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(750L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getClusterId()).thenReturn(2L);
+ when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+ return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2,
memCapacity2);
+ }
+
+ List<CapacityVO> getPodCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getPodId()).thenReturn(2L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getPodId()).thenReturn(2L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
Review Comment:
This stub should target memCapacity2, not memCapacity1, to set the second
memory mock correctly.
```suggestion
when(memCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
```
##########
server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java:
##########
@@ -505,4 +573,70 @@ public boolean match(MetadataReader mdr,
MetadataReaderFactory arg1) throws IOEx
}
}
}
+
+ List<CapacityVO> getClusterCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(1000L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getClusterId()).thenReturn(2L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(750L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getClusterId()).thenReturn(2L);
+ when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+ return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2,
memCapacity2);
+ }
+
+ List<CapacityVO> getPodCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getPodId()).thenReturn(2L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
Review Comment:
This stub should reference cpuCapacity2.getClusterId(), not cpuCapacity1.
```suggestion
when(cpuCapacity2.getClusterId()).thenReturn(1L);
```
##########
server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java:
##########
@@ -505,4 +573,70 @@ public boolean match(MetadataReader mdr,
MetadataReaderFactory arg1) throws IOEx
}
}
}
+
+ List<CapacityVO> getClusterCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(1000L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getClusterId()).thenReturn(2L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(750L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getClusterId()).thenReturn(2L);
+ when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
Review Comment:
This stub is intended for memCapacity2, not memCapacity1—change the mock
reference accordingly.
```suggestion
when(memCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
```
##########
server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java:
##########
@@ -505,4 +573,70 @@ public boolean match(MetadataReader mdr,
MetadataReaderFactory arg1) throws IOEx
}
}
}
+
+ List<CapacityVO> getClusterCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(1000L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getClusterId()).thenReturn(2L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(750L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getClusterId()).thenReturn(2L);
+ when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+ return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2,
memCapacity2);
+ }
+
+ List<CapacityVO> getPodCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getPodId()).thenReturn(2L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getPodId()).thenReturn(2L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
Review Comment:
For memCapacity2, stub memCapacity2.getClusterId(), not cpuCapacity1.
```suggestion
when(memCapacity2.getClusterId()).thenReturn(1L);
```
##########
server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java:
##########
@@ -505,4 +573,70 @@ public boolean match(MetadataReader mdr,
MetadataReaderFactory arg1) throws IOEx
}
}
}
+
+ List<CapacityVO> getClusterCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(1000L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getClusterId()).thenReturn(2L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(750L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getClusterId()).thenReturn(1L);
+ when(memCapacity1.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity1.getUsedCapacity()).thenReturn(536870912L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+
+ CapacityVO memCapacity2 = mock(CapacityVO.class);
+ when(memCapacity2.getClusterId()).thenReturn(2L);
+ when(memCapacity2.getTotalCapacity()).thenReturn(8589934592L);
+ when(memCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(memCapacity2.getUsedCapacity()).thenReturn(1073741824L);
+
when(memCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_MEMORY);
+ return Arrays.asList(cpuCapacity1, memCapacity1, cpuCapacity2,
memCapacity2);
+ }
+
+ List<CapacityVO> getPodCapacities() {
+ CapacityVO cpuCapacity1 = mock(CapacityVO.class);
+ when(cpuCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity1.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity1.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity1.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity1.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO cpuCapacity2 = mock(CapacityVO.class);
+ when(cpuCapacity2.getPodId()).thenReturn(2L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
+ when(cpuCapacity2.getTotalCapacity()).thenReturn(32000L);
+ when(cpuCapacity2.getReservedCapacity()).thenReturn(0L);
+ when(cpuCapacity2.getUsedCapacity()).thenReturn(500L);
+
when(cpuCapacity2.getCapacityType()).thenReturn(CapacityVO.CAPACITY_TYPE_CPU);
+
+ CapacityVO memCapacity1 = mock(CapacityVO.class);
+ when(memCapacity1.getPodId()).thenReturn(1L);
+ when(cpuCapacity1.getClusterId()).thenReturn(1L);
Review Comment:
For memCapacity1, stub memCapacity1.getClusterId(), not cpuCapacity1.
```suggestion
when(memCapacity1.getClusterId()).thenReturn(1L);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
