Skip to content

Commit 2540497

Browse files
Fix arch type reference to choose right template
1 parent 671c672 commit 2540497

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ protected String getCksClusterPreferredArch(String systemVMPreferredArchitecture
556556
if (cksIso == null) {
557557
return systemVMPreferredArchitecture;
558558
}
559-
String cksIsoArchName = cksIso.getArch().name();
559+
String cksIsoArchName = cksIso.getArch().getType();
560560
return cksIsoArchName.equals(systemVMPreferredArchitecture) ? systemVMPreferredArchitecture : cksIsoArchName;
561561
}
562562

plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImplTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ public void testGetCksClusterPreferredArchDifferentArchsPreferCKSIsoArch() {
430430
VMTemplateVO cksIso = Mockito.mock(VMTemplateVO.class);
431431
Mockito.when(cksIso.getArch()).thenReturn(CPU.CPUArch.arm64);
432432
String cksClusterPreferredArch = kubernetesClusterManager.getCksClusterPreferredArch(systemVMArch, cksIso);
433-
Assert.assertEquals(CPU.CPUArch.arm64.name(), cksClusterPreferredArch);
433+
Assert.assertEquals(CPU.CPUArch.arm64.getType(), cksClusterPreferredArch);
434434
}
435435

436436
@Test
@@ -439,6 +439,6 @@ public void testGetCksClusterPreferredArchSameArch() {
439439
VMTemplateVO cksIso = Mockito.mock(VMTemplateVO.class);
440440
Mockito.when(cksIso.getArch()).thenReturn(CPU.CPUArch.amd64);
441441
String cksClusterPreferredArch = kubernetesClusterManager.getCksClusterPreferredArch(systemVMArch, cksIso);
442-
Assert.assertEquals(CPU.CPUArch.amd64.name(), cksClusterPreferredArch);
442+
Assert.assertEquals(CPU.CPUArch.amd64.getType(), cksClusterPreferredArch);
443443
}
444444
}

0 commit comments

Comments
 (0)