Commit 30f5f787 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou Committed by Georgios D. Tsoukalas
Browse files

cyclades ui: Move connect/console urls under ui

parent fb5ed7c8
......@@ -50,10 +50,6 @@ astakos_proxy = partial(proxy, proxy_base=BASE_ASTAKOS_PROXY_PATH,
cyclades_patterns = patterns('',
(prefix_pattern(UI_PREFIX), include('synnefo.ui.urls')),
url(r'^machines/console$', 'synnefo.ui.views.machines_console',
name='ui_machines_console'),
url(r'^machines/connect$', 'synnefo.ui.views.machines_connect',
name='ui_machines_connect'),
(prefix_pattern(VMAPI_PREFIX), include('synnefo.vmapi.urls')),
(prefix_pattern(PLANKTON_PREFIX), include('synnefo.plankton.urls')),
(prefix_pattern(HELPDESK_PREFIX), include('synnefo.helpdesk.urls')),
......
......@@ -1379,7 +1379,7 @@
port: data.port,
password: data.password
}
return '/machines/console?' + $.param(url_params);
return synnefo.config.ui_console_url + '?' + $.param(url_params);
},
// action helper
......@@ -1499,7 +1499,7 @@
},
get_connection_info: function(host_os, success, error) {
var url = "/machines/connect";
var url = synnefo.config.ui_connect_url;
params = {
ip_address: this.get_public_nic().get('ipv4'),
hostname: this.get_hostname(),
......
......@@ -630,6 +630,8 @@
synnefo.config.use_glance = {{ use_glance }};
synnefo.config.indicators_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/indicators/';
synnefo.config.machines_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/machines/';
synnefo.config.ui_console_url = '{% url ui_machines_console %}';
synnefo.config.ui_connect_url = '{% url ui_machines_connect %}';
synnefo.config.support_ssh_os_list = {{ support_ssh_os_list|safe }};
synnefo.config.unknown_os = {{ unknown_os|safe }};
synnefo.config.os_created_users = {{ os_created_users|safe }};
......
......@@ -37,7 +37,11 @@ import os
urlpatterns = patterns('',
url(r'^$', 'synnefo.ui.views.home', name='ui_index'),
url(r'userdata/', include('synnefo.ui.userdata.urls'))
url(r'userdata/', include('synnefo.ui.userdata.urls')),
url(r'^machines/console$', 'synnefo.ui.views.machines_console',
name='ui_machines_console'),
url(r'^machines/connect$', 'synnefo.ui.views.machines_connect',
name='ui_machines_connect'),
)
if settings.DEBUG or settings.TEST:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment