Skip to content

Commit 364f4ce

Browse files
committed
fixup
1 parent aa011bf commit 364f4ce

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionServiceTest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import com.cloud.storage.VMTemplateVO;
6262
import com.cloud.storage.dao.VMTemplateDao;
6363
import com.cloud.template.TemplateApiService;
64-
import com.cloud.template.VirtualMachineTemplate;
6564
import com.cloud.user.Account;
6665
import com.cloud.user.AccountManager;
6766
import com.cloud.user.AccountVO;
@@ -213,17 +212,13 @@ public void addKubernetesSupportedVersionIsoUrlTest() throws ResourceAllocationE
213212
when(cmd.getChecksum()).thenReturn(null);
214213
when(cmd.getMinimumCpu()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU);
215214
when(cmd.getMinimumRamSize()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE);
216-
Account systemAccount = new AccountVO("system", 1L, "", Account.Type.ADMIN, "uuid");
217-
when(accountManager.getSystemAccount()).thenReturn(systemAccount);
218215
CallContext callContext = Mockito.mock(CallContext.class);
219216
try (MockedStatic<ComponentContext> mockedComponentContext = Mockito.mockStatic(ComponentContext.class);
220217
MockedStatic<CallContext> mockedCallContext = Mockito.mockStatic(CallContext.class)) {
221218
mockedComponentContext.when(() -> ComponentContext.inject(Mockito.any(RegisterIsoCmd.class))).thenReturn(
222219
new RegisterIsoCmd());
223220
mockedCallContext.when(CallContext::current).thenReturn(callContext);
224221

225-
when(templateService.registerIso(Mockito.any(RegisterIsoCmd.class))).thenReturn(
226-
Mockito.mock(VirtualMachineTemplate.class));
227222
VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
228223
when(templateVO.getId()).thenReturn(1L);
229224
when(templateDao.findById(Mockito.anyLong())).thenReturn(templateVO);

ui/src/views/AutogenView.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,9 @@ export default {
12811281
if (possibleApi === 'listTemplates') {
12821282
params.templatefilter = 'executable'
12831283
} else if (possibleApi === 'listIsos') {
1284+
if (this.$route.path.startsWith('/kubernetesiso')) {
1285+
params.bootable = false
1286+
}
12841287
params.isofilter = 'executable'
12851288
} else if (possibleApi === 'listHosts') {
12861289
params.type = 'routing'

0 commit comments

Comments
 (0)