Revision b1fb3aac snf-cyclades-app/synnefo/app_settings/urls.py
b/snf-cyclades-app/synnefo/app_settings/urls.py | ||
---|---|---|
36 | 36 |
from snf_django.lib.api.proxy import proxy |
37 | 37 |
from snf_django.lib.api.utils import prefix_pattern |
38 | 38 |
from synnefo.cyclades_settings import ( |
39 |
BASE_URL, BASE_HOST, BASE_PATH, |
|
40 |
COMPUTE_PREFIX, VMAPI_PREFIX, PLANKTON_PREFIX, HELPDESK_PREFIX, |
|
41 |
ASTAKOS_BASE_URL, ASTAKOS_BASE_PATH, BASE_ASTAKOS_PROXY_PATH, |
|
42 |
ASTAKOS_ACCOUNTS_PREFIX, ASTAKOS_VIEWS_PREFIX, |
|
43 |
PROXY_USER_SERVICES) |
|
39 |
BASE_URL, BASE_HOST, BASE_PATH, COMPUTE_PREFIX, VMAPI_PREFIX, |
|
40 |
PLANKTON_PREFIX, HELPDESK_PREFIX, UI_PREFIX, ASTAKOS_BASE_URL, |
|
41 |
ASTAKOS_BASE_PATH, BASE_ASTAKOS_PROXY_PATH, ASTAKOS_ACCOUNTS_PREFIX, |
|
42 |
ASTAKOS_VIEWS_PREFIX, PROXY_USER_SERVICES) |
|
44 | 43 |
|
45 | 44 |
from urlparse import urlparse |
46 | 45 |
from functools import partial |
... | ... | |
50 | 49 |
target_base=ASTAKOS_BASE_URL) |
51 | 50 |
|
52 | 51 |
cyclades_patterns = patterns('', |
53 |
(prefix_pattern('ui'), include('synnefo.ui.urls')),
|
|
52 |
(prefix_pattern(UI_PREFIX), include('synnefo.ui.urls')),
|
|
54 | 53 |
url(r'^machines/console$', 'synnefo.ui.views.machines_console', |
55 | 54 |
name='ui_machines_console'), |
56 | 55 |
url(r'^machines/connect$', 'synnefo.ui.views.machines_connect', |
... | ... | |
64 | 63 |
urlpatterns = patterns( |
65 | 64 |
'', |
66 | 65 |
(prefix_pattern(BASE_PATH), include(cyclades_patterns)), |
67 |
)
|
|
66 |
) |
|
68 | 67 |
|
69 | 68 |
if PROXY_USER_SERVICES: |
70 | 69 |
astakos_proxy = partial(proxy, proxy_base=BASE_ASTAKOS_PROXY_PATH, |
Also available in: Unified diff