Skip to content

Commit 0617ed4

Browse files
committed
fix typo
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 85deee8 commit 0617ed4

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ private ConsoleEndpoint generateAccessEndpoint(Long vmId, String sessionUuid, St
425425
return consoleEndpoint;
426426
}
427427

428-
protected ConsoleConnectionDetails getConsoleConnectionDetailsFoxExternalVm(ConsoleConnectionDetails details,
429-
VirtualMachine vm, HostVO host) {
428+
protected ConsoleConnectionDetails getConsoleConnectionDetailsForExternalVm(ConsoleConnectionDetails details,
429+
VirtualMachine vm, HostVO host) {
430430
Answer answer = managementServer.getExternalVmConsole(vm, host);
431431
if (answer == null) {
432432
logger.error("Unable to get console access details for external {} on {}: answer is null.", vm, host);
@@ -481,7 +481,7 @@ protected ConsoleConnectionDetails getConsoleConnectionDetails(VirtualMachine vm
481481
}
482482
ConsoleConnectionDetails details = new ConsoleConnectionDetails(vm.getVncPassword(), locale, tag, displayName);
483483
if (Hypervisor.HypervisorType.External.equals(host.getHypervisorType())) {
484-
return getConsoleConnectionDetailsFoxExternalVm(details, vm, host);
484+
return getConsoleConnectionDetailsForExternalVm(details, vm, host);
485485
}
486486
Pair<String, Integer> hostPortInfo = getHostAndPortForKVMMaintenanceHostIfNeeded(host, vmDetails);
487487
if (hostPortInfo == null) {

server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public void returnsNullWhenAnswerIsNull() {
339339

340340
Mockito.when(managementServer.getExternalVmConsole(vm, host)).thenReturn(null);
341341

342-
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsFoxExternalVm(details, vm, host);
342+
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsForExternalVm(details, vm, host);
343343

344344
Assert.assertNull(result);
345345
}
@@ -355,7 +355,7 @@ public void returnsNullWhenAnswerResultIsFalse() {
355355
Mockito.when(answer.getDetails()).thenReturn("Error details");
356356
Mockito.when(managementServer.getExternalVmConsole(vm, host)).thenReturn(answer);
357357

358-
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsFoxExternalVm(details, vm, host);
358+
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsForExternalVm(details, vm, host);
359359

360360
Assert.assertNull(result);
361361
}
@@ -370,7 +370,7 @@ public void returnsNullWhenAnswerIsNotOfTypeGetExternalConsoleAnswer() {
370370
Mockito.when(answer.getResult()).thenReturn(true);
371371
Mockito.when(managementServer.getExternalVmConsole(vm, host)).thenReturn(answer);
372372

373-
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsFoxExternalVm(details, vm, host);
373+
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsForExternalVm(details, vm, host);
374374

375375
Assert.assertNull(result);
376376
}
@@ -392,7 +392,7 @@ public void setsDetailsWhenAnswerIsValid() {
392392
Mockito.when(answer.getPassword()).thenReturn(expectedPassword);
393393
Mockito.when(managementServer.getExternalVmConsole(vm, host)).thenReturn(answer);
394394

395-
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsFoxExternalVm(details, vm, host);
395+
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsForExternalVm(details, vm, host);
396396

397397
Assert.assertNotNull(result);
398398
Assert.assertEquals(expectedHost, result.getHost());
@@ -413,7 +413,7 @@ public void doesNotSetSidWhenPasswordIsBlank() {
413413
Mockito.when(answer.getPassword()).thenReturn("");
414414
Mockito.when(managementServer.getExternalVmConsole(vm, host)).thenReturn(answer);
415415

416-
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsFoxExternalVm(details, vm, host);
416+
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsForExternalVm(details, vm, host);
417417

418418
Assert.assertNotNull(result);
419419
Assert.assertEquals("10.0.0.1", result.getHost());
@@ -487,12 +487,12 @@ public void returnsDetailsForExternalHypervisor() {
487487
Mockito.when(host.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.External);
488488
Mockito.when(vmInstanceDetailsDao.listDetailsKeyPairs(Mockito.anyLong(), Mockito.anyList())).thenReturn(Map.of());
489489

490-
Mockito.doReturn(details).when(consoleAccessManager).getConsoleConnectionDetailsFoxExternalVm(Mockito.any(), Mockito.eq(vm), Mockito.eq(host));
490+
Mockito.doReturn(details).when(consoleAccessManager).getConsoleConnectionDetailsForExternalVm(Mockito.any(), Mockito.eq(vm), Mockito.eq(host));
491491

492492
ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetails(vm, host);
493493

494494
Assert.assertNotNull(result);
495-
Mockito.verify(consoleAccessManager).getConsoleConnectionDetailsFoxExternalVm(Mockito.any(), Mockito.eq(vm), Mockito.eq(host));
495+
Mockito.verify(consoleAccessManager).getConsoleConnectionDetailsForExternalVm(Mockito.any(), Mockito.eq(vm), Mockito.eq(host));
496496
}
497497

498498
@Test

0 commit comments

Comments
 (0)