openstack/horizon
Code Issues Proposed changes

Enable to set protocols of WebSocket for serial console

Browse Source 
This patch enables to set protocols of WebSocket for serial console.
Also, this enables to use serial console not only from instance
but also plugins.
e.g. Zun UI can access container console provided by docker.

Change-Id: Ib0df9ddfc74f98bfea75abce3b5d5479e3cd47bd
Needed-By: I41f236f2762613e56748bb05eb7ce0e4c26158d2
Closes-Bug: #1698092
This commit is contained in:
Shu Muto 2017-06-15 18:06:47 +09:00
parent 8f84c0726d
commit 4493b6f75f
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/dashboards/project/instances/views.py
View File

@ -222,11 +222,10 @@ def rdp(request, instance_id):
class SerialConsoleView(generic.TemplateView): class SerialConsoleView(generic.TemplateView):
template_name = 'project/instances/serial_console.html' template_name = 'serial_console.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(SerialConsoleView, self).get_context_data(**kwargs) context = super(SerialConsoleView, self).get_context_data(**kwargs)
context['instance_id'] = self.kwargs['instance_id']
instance = None instance = None
try: try:
instance = api.nova.server_get(self.request, instance = api.nova.server_get(self.request,
@ -236,13 +235,14 @@ class SerialConsoleView(generic.TemplateView):
"Cannot find instance %s.") % self.kwargs['instance_id'] "Cannot find instance %s.") % self.kwargs['instance_id']
# name is unknown, so leave it blank for the window title # name is unknown, so leave it blank for the window title
# in full-screen mode, so only the instance id is shown. # in full-screen mode, so only the instance id is shown.
context['instance_name'] = '' context['page_title'] = self.kwargs['instance_id']
return context return context
context['instance_name'] = instance.name context['page_title'] = "%s (%s)" % (instance.name, instance.id)
try: try:
console_url = project_console.get_console(self.request, console_url = project_console.get_console(self.request,
"SERIAL", instance)[1] "SERIAL", instance)[1]
context["console_url"] = console_url context["console_url"] = console_url
context["protocols"] = "['binary', 'base64']"
except exceptions.NotAvailable: except exceptions.NotAvailable:
context["error_message"] = _( context["error_message"] = _(
"Cannot get console for instance %s.") % self.kwargs[ "Cannot get console for instance %s.") % self.kwargs[

18
openstack_dashboard/static/js/angular/directives/serialConsole.js vendored
View File

@ -19,10 +19,6 @@ limitations under the License.
'use strict'; 'use strict';
angular.module('serialConsoleApp', []) angular.module('serialConsoleApp', [])
.constant('protocols', [
'binary',
'base64'
])
.constant('states', [ .constant('states', [
gettext('Connecting'), gettext('Connecting'),
gettext('Open'), gettext('Open'),
@ -36,16 +32,17 @@ limitations under the License.
* *
* @description * @description
* The serial-console element creates a terminal based on the widely-used term.js. * The serial-console element creates a terminal based on the widely-used term.js.
* The "connection" attribute is input to a WebSocket object, which connects * The "connection" and "protocols" attributes are input to a WebSocket object,
* to a server. In Horizon, this directive is used to connect to nova-serialproxy, * which connects to a server. In Horizon, this directive is used to connect to
* opening a serial console to any instance. Each key the user types is transmitted * nova-serialproxy, opening a serial console to any instance. Each key the user
* to the instance, and each character the instance reponds with is displayed. * types is transmitted to the instance, and each character the instance reponds
* with is displayed.
*/ */
.directive('serialConsole', serialConsole); .directive('serialConsole', serialConsole);
serialConsole.$inject = ['protocols', 'states']; serialConsole.$inject = ['states'];
function serialConsole(protocols, states) { function serialConsole(states) {
return { return {
scope: true, scope: true,
template: '<div id="terminalNode"></div><br>{{statusMessage()}}', template: '<div id="terminalNode"></div><br>{{statusMessage()}}',
@ -53,6 +50,7 @@ limitations under the License.
link: function postLink(scope, element, attrs) { link: function postLink(scope, element, attrs) {
var connection = scope.$eval(attrs.connection); var connection = scope.$eval(attrs.connection);
var protocols = scope.$eval(attrs.protocols);
var term = new Terminal(); var term = new Terminal();
var socket = new WebSocket(connection, protocols); var socket = new WebSocket(connection, protocols);

4
openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html → openstack_dashboard/templates/serial_console.html
View File

@ -4,7 +4,7 @@
<head> <head>
<meta content='IE=edge' http-equiv='X-UA-Compatible' /> <meta content='IE=edge' http-equiv='X-UA-Compatible' />
<meta content='text/html; charset=utf-8' http-equiv='Content-Type' /> <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
<title>{{instance_name}} ({{instance_id}})</title> <title>{{page_title}}</title>
<link rel="stylesheet" href="{{ STATIC_URL }}dashboard/scss/serial_console.css" type="text/css" media="screen"> <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/scss/serial_console.css" type="text/css" media="screen">
<script src="{% url 'horizon:jsi18n' 'horizon' %}"></script> <script src="{% url 'horizon:jsi18n' 'horizon' %}"></script>
<script src='{{ STATIC_URL }}horizon/lib/termjs/term.js'></script> <script src='{{ STATIC_URL }}horizon/lib/termjs/term.js'></script>
@ -17,7 +17,7 @@
{% if error_message %} {% if error_message %}
{{ error_message }} {{ error_message }}
{% else %} {% else %}
<serial-console connection='"{{console_url}}"'></serial-console> <serial-console connection='"{{console_url}}"' protocols='{{protocols}}'></serial-console>
{% endif %} {% endif %}
</body> </body>