-
Notifications
You must be signed in to change notification settings - Fork 17
RFD 189: Console Access - Add console endpoint to CNAPI #44
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
Draft
nwilkens
wants to merge
1
commit into
master
Choose a base branch
from
rfd-0189-console-access
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
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
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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -336,6 +336,92 @@ VM.vnc = function handlerVmVnc(req, res, next) { | |||||
| }; | ||||||
|
|
||||||
|
|
||||||
| /** | ||||||
| * Query the server for the VM's console host and port. | ||||||
| * | ||||||
| * Returns connection details for the VM's console (serial console for KVM, | ||||||
| * zone console for other brands). | ||||||
| * | ||||||
| * @name VmConsole | ||||||
| * @endpoint GET /servers/:server_uuid/vms/:uuid/console | ||||||
| * @section Virtual Machine API | ||||||
| * | ||||||
| * @response 200 Object Request succeeded | ||||||
| * @response 404 Object No such VM | ||||||
| * @response 404 Object No such server | ||||||
| */ | ||||||
|
|
||||||
| var vmConsoleTimeoutSeconds = 10; | ||||||
| VM.console = function handlerVmConsole(req, res, next) { | ||||||
| var responded; | ||||||
|
|
||||||
| if (validation.ensureParamsValid(req, res, vmValidationRules)) { | ||||||
| next(); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| var timeout = setTimeout(function () { | ||||||
| responded = true; | ||||||
| next(new restify.InternalError( | ||||||
| 'Time-out reached waiting for machine_load request to return')); | ||||||
| }, vmConsoleTimeoutSeconds * 1000); | ||||||
|
|
||||||
| var types = ['console']; | ||||||
|
|
||||||
| req.stash.vm.info( | ||||||
| { req_id: req.getId(), types: types }, | ||||||
| function (error, infoResponse) { | ||||||
| var vminfo; | ||||||
| clearTimeout(timeout); | ||||||
|
|
||||||
| if (responded && error) { | ||||||
| req.log.error(error.message); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| if (responded) { | ||||||
| req.log.warn('Got a reply back from an expired request'); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| if (error) { | ||||||
| if (errDetails(error).restCode === 'VmNotFound') { | ||||||
| next(new restify.ResourceNotFoundError('VM ' + | ||||||
| req.params.uuid + ' not found')); | ||||||
| } else { | ||||||
| next(new restify.InternalError(error.message)); | ||||||
| } | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| try { | ||||||
| vminfo = JSON.parse(infoResponse); | ||||||
| } catch (e) { | ||||||
| req.log.error({infoResponse: infoResponse, err: e}, | ||||||
| 'failed to parse JSON'); | ||||||
| next(new restify.InternalError( | ||||||
| 'failed to parse JSON response from vm.info')); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| // Ensure console info exists | ||||||
| if (!vminfo.console || !vminfo.console.host || !vminfo.console.port) { | ||||||
|
||||||
| if (!vminfo.console || !vminfo.console.host || !vminfo.console.port) { | |
| if (!vminfo.console || !vminfo.console.host || !vminfo.console.port || !vminfo.console.type) { |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error message references 'machine_load request' but this endpoint is for console information, not machine loading. The message should be updated to reflect the actual operation.