Skip to content

extension/proxmox: add console access for instances #11601

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
shwstppr merged 16 commits into from
Sep 27, 2025
Merged

extension/proxmox: add console access for instances #11601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7a8e3ab
extension/proxmox: add console access for instances
shwstppr Sep 9, 2025
c5a727e
match response
shwstppr Sep 10, 2025
85deee8
tests and changes
shwstppr Sep 10, 2025
0617ed4
fix typo
shwstppr Sep 10, 2025
d5c642a
improve log, error
shwstppr Sep 11, 2025
2f6234b
Merge remote-tracking branch 'apache/main' into proxmox-console
shwstppr Sep 11, 2025
63f5f94
server,extension: allow returning direct console url
shwstppr Sep 11, 2025
e46f5cc
address review, scripts consistency
shwstppr Sep 11, 2025
5f95f77
change for one-time ticket as password
shwstppr Sep 18, 2025
a3846c2
Merge remote-tracking branch 'apache/main' into proxmox-console
shwstppr Sep 18, 2025
c3a0d46
main merge test fix
shwstppr Sep 18, 2025
f82ee7d
fix on cpvm
shwstppr Sep 18, 2025
19814b0
console-proxy: close session if unable to connect to VNC server
shwstppr Sep 23, 2025
ff4ab2d
review changes
shwstppr Sep 25, 2025
e06cbf9
fix test
shwstppr Sep 25, 2025
1e911a9
change
shwstppr Sep 25, 2025
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
change 
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
  • Loading branch information
@shwstppr
shwstppr committed Sep 25, 2025
commit 1e911a912371ad6e1542d0516deea99b3d8f934f
4 changes: 4 additions & 0 deletions ...org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ public String getName() {
protected Map<String, Object> loadAccessDetails(Map<String, Map<String, String>> externalDetails,
VirtualMachineTO virtualMachineTO) {
Map<String, Object> modifiedDetails = new HashMap<>();
if (MapUtils.isNotEmpty(externalDetails) && externalDetails.containsKey(ApiConstants.CALLER)) {
modifiedDetails.put(ApiConstants.CALLER, externalDetails.get(ApiConstants.CALLER));
externalDetails.remove(ApiConstants.CALLER);
}
if (MapUtils.isNotEmpty(externalDetails)) {
modifiedDetails.put(ApiConstants.EXTERNAL_DETAILS, externalDetails);
}
Expand Down
15 changes: 15 additions & 0 deletions ...apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisionerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VmDetailConstants;
import com.cloud.vm.dao.UserVmDao;

@RunWith(MockitoJUnitRunner.class)
Expand Down Expand Up @@ -205,6 +206,20 @@ public void testLoadAccessDetailsWithNullExternalDetails() {
assertEquals("test-vm", result.get(ApiConstants.VIRTUAL_MACHINE_NAME));
}

@Test
public void testLoadAccessDetails_WithCaller() {
Map<String, Map<String, String>> externalDetails = new HashMap<>();
externalDetails.put(ApiConstants.EXTENSION, Map.of("key1", "value1"));
externalDetails.put(ApiConstants.CALLER, Map.of("key2", "value2"));
Map<String, Object> result = provisioner.loadAccessDetails(externalDetails, null);

assertNotNull(result);
assertNotNull(result.get(ApiConstants.EXTERNAL_DETAILS));
assertNotNull(((Map<String, String>) result.get(ApiConstants.EXTERNAL_DETAILS)).get(ApiConstants.EXTENSION));
assertNotNull(result.get(ApiConstants.CALLER));
assertNull(result.get(VmDetailConstants.CLOUDSTACK_VM_DETAILS));
}

@Test
public void testGetExtensionCheckedPathValidFile() {
String result = provisioner.getExtensionCheckedPath("test-extension", "test-extension.sh");
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public void getConsoleConnectionDetailsForExternalVmSetsDetailsWhenAnswerIsValid

Mockito.when(answer.getResult()).thenReturn(true);
Mockito.when(answer.getUrl()).thenReturn(url);
Mockito.when(answer.getProtocol()).thenReturn("direct");
Mockito.when(answer.getProtocol()).thenReturn(ConsoleConnectionDetails.Mode.Direct.name());
Mockito.when(managementServer.getExternalVmConsole(vm, host)).thenReturn(answer);

ConsoleConnectionDetails result = consoleAccessManager.getConsoleConnectionDetailsForExternalVm(details, vm, host);
Expand Down
Loading