-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Merged
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
7a8e3ab
extension/proxmox: add console access for instances
shwstppr c5a727e
match response
shwstppr 85deee8
tests and changes
shwstppr 0617ed4
fix typo
shwstppr d5c642a
improve log, error
shwstppr 2f6234b
Merge remote-tracking branch 'apache/main' into proxmox-console
shwstppr 63f5f94
server,extension: allow returning direct console url
shwstppr e46f5cc
address review, scripts consistency
shwstppr 5f95f77
change for one-time ticket as password
shwstppr a3846c2
Merge remote-tracking branch 'apache/main' into proxmox-console
shwstppr c3a0d46
main merge test fix
shwstppr f82ee7d
fix on cpvm
shwstppr 19814b0
console-proxy: close session if unable to connect to VNC server
shwstppr ff4ab2d
review changes
shwstppr e06cbf9
fix test
shwstppr 1e911a9
change
shwstppr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
55 changes: 55 additions & 0 deletions
55
core/src/main/java/com/cloud/agent/api/GetExternalConsoleAnswer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package com.cloud.agent.api; | ||
|
|
||
| public class GetExternalConsoleAnswer extends Answer { | ||
|
|
||
| private String host; | ||
| private int port; | ||
| @LogLevel(LogLevel.Log4jLevel.Off) | ||
| private String password; | ||
| private String protocol; | ||
|
|
||
| public GetExternalConsoleAnswer(Command command, String details) { | ||
| super(command, false, details); | ||
| } | ||
|
|
||
| public GetExternalConsoleAnswer(Command command, String host, int port, String password, String protocol) { | ||
| super(command, true, ""); | ||
| this.host = host; | ||
| this.port = port; | ||
| this.password = password; | ||
| this.protocol = protocol; | ||
| } | ||
|
|
||
| public String getHost() { | ||
| return host; | ||
| } | ||
|
|
||
| public int getPort() { | ||
| return port; | ||
| } | ||
|
|
||
| public String getPassword() { | ||
| return password; | ||
| } | ||
|
|
||
| public String getProtocol() { | ||
| return protocol; | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
core/src/main/java/com/cloud/agent/api/GetExternalConsoleCommand.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package com.cloud.agent.api; | ||
|
|
||
| import com.cloud.agent.api.to.VirtualMachineTO; | ||
|
|
||
| public class GetExternalConsoleCommand extends Command { | ||
| String vmName; | ||
| VirtualMachineTO vm; | ||
| protected boolean executeInSequence; | ||
|
|
||
| public GetExternalConsoleCommand(String vmName, VirtualMachineTO vm) { | ||
| this.vmName = vmName; | ||
| this.vm = vm; | ||
| this.executeInSequence = false; | ||
| } | ||
|
|
||
| public String getVmName() { | ||
| return this.vmName; | ||
| } | ||
|
|
||
| public void setVirtualMachine(VirtualMachineTO vm) { | ||
| this.vm = vm; | ||
| } | ||
|
|
||
| public VirtualMachineTO getVirtualMachine() { | ||
| return vm; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean executeInSequence() { | ||
| return executeInSequence; | ||
| } | ||
|
|
||
| public void setExecuteInSequence(boolean executeInSequence) { | ||
| this.executeInSequence = executeInSequence; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.