59b7e6011b
While in theory both VNC and SPICE can be enabled at the same time, this is not expected to be common. Thus, rather than adding a 'SPICE console' tab, this renames the existing 'VNC console' tab to simply be 'Console'. This tab is setup to prefer exposing a VNC console, but if that is not enabled, then expose the SPICE console. The reason for this order is that the noVNC widget has had much more testing than the current spice-html5 widget. Thus if both VNC & SPICE are enabled, VNC is likely a more reliable choice at this point in time. Blueprint: libvirt-spice Change-Id: If3d3769fe8e29c5930ac8b42d841c92182c4be72 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
39 lines
1.5 KiB
Python
39 lines
1.5 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Copyright 2012 Nebula, Inc.
|
|
#
|
|
# Licensed 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.
|
|
|
|
from django.conf.urls.defaults import patterns, url
|
|
|
|
from .views import IndexView, UpdateView, DetailView, LaunchInstanceView
|
|
|
|
|
|
INSTANCES = r'^(?P<instance_id>[^/]+)/%s$'
|
|
VIEW_MOD = 'openstack_dashboard.dashboards.project.instances.views'
|
|
|
|
|
|
urlpatterns = patterns(VIEW_MOD,
|
|
url(r'^$', IndexView.as_view(), name='index'),
|
|
url(r'^launch$', LaunchInstanceView.as_view(), name='launch'),
|
|
url(r'^(?P<instance_id>[^/]+)/$', DetailView.as_view(), name='detail'),
|
|
url(INSTANCES % 'update', UpdateView.as_view(), name='update'),
|
|
url(INSTANCES % 'console', 'console', name='console'),
|
|
url(INSTANCES % 'vnc', 'vnc', name='vnc'),
|
|
url(INSTANCES % 'spice', 'spice', name='spice'),
|
|
)
|