Revision e407f159 snf-cyclades-app/synnefo/app_settings/urls.py

b/snf-cyclades-app/synnefo/app_settings/urls.py
40 40
from snf_django.lib.api.urls import api_patterns
41 41
from synnefo.cyclades_settings import (
42 42
    BASE_PATH, COMPUTE_PREFIX, VMAPI_PREFIX,
43
    PLANKTON_PREFIX, HELPDESK_PREFIX, UI_PREFIX, ASTAKOS_BASE_URL,
44
    USERDATA_PREFIX, ADMIN_PREFIX, BASE_ASTAKOS_PROXY_PATH,
45
    ASTAKOS_ACCOUNTS_PREFIX, ASTAKOS_VIEWS_PREFIX, PROXY_USER_SERVICES,
43
    PLANKTON_PREFIX, HELPDESK_PREFIX, UI_PREFIX,
44
    USERDATA_PREFIX, ADMIN_PREFIX,
45
    ASTAKOS_AUTH_PROXY_PATH, ASTAKOS_AUTH_URL,
46
    ASTAKOS_ACCOUNT_PROXY_PATH, ASTAKOS_ACCOUNT_URL,
47
    ASTAKOS_UI_PROXY_PATH, ASTAKOS_UI_URL,
46 48
    cyclades_services)
47 49

  
48 50
from functools import partial
......
56 58
extend_endpoint_with_slash(urlpatterns, cyclades_services, 'admin')
57 59
extend_endpoint_with_slash(urlpatterns, cyclades_services, 'cyclades_userdata')
58 60

  
59
astakos_proxy = partial(proxy, proxy_base=BASE_ASTAKOS_PROXY_PATH,
60
                        target_base=ASTAKOS_BASE_URL)
61

  
62 61
cyclades_patterns = api_patterns(
63 62
    '',
64 63
    (prefix_pattern(VMAPI_PREFIX), include('synnefo.vmapi.urls')),
......
79 78
    (prefix_pattern(BASE_PATH), include(cyclades_patterns)),
80 79
)
81 80

  
82
if PROXY_USER_SERVICES:
83
    astakos_proxy = partial(proxy, proxy_base=BASE_ASTAKOS_PROXY_PATH,
84
                            target_base=ASTAKOS_BASE_URL)
85 81

  
86
    proxy_patterns = patterns(
87
        '',
88
        (prefix_pattern(ASTAKOS_VIEWS_PREFIX), astakos_proxy),
89
    )
90
    proxy_patterns += api_patterns(
91
        '',
92
        (r'^login/?$', astakos_proxy),
93
        (r'^feedback/?$', astakos_proxy),
94
        (r'^user_catalogs/?$', astakos_proxy),
95
        (prefix_pattern(ASTAKOS_ACCOUNTS_PREFIX), astakos_proxy),
96
    )
82
# --------------------------------------
83
# PROXY settings
84
astakos_auth_proxy = \
85
    partial(proxy, proxy_base=ASTAKOS_AUTH_PROXY_PATH,
86
            target_base=ASTAKOS_AUTH_URL)
87
astakos_account_proxy = \
88
    partial(proxy, proxy_base=ASTAKOS_ACCOUNT_PROXY_PATH,
89
            target_base=ASTAKOS_ACCOUNT_URL)
90
astakos_ui_proxy = \
91
    partial(proxy, proxy_base=ASTAKOS_UI_PROXY_PATH,
92
            target_base=ASTAKOS_UI_URL)
97 93

  
98
    urlpatterns += patterns(
99
        '',
100
        (prefix_pattern(BASE_ASTAKOS_PROXY_PATH), include(proxy_patterns)),
101
    )
94
urlpatterns += api_patterns(
95
    '',
96
    (prefix_pattern(ASTAKOS_AUTH_PROXY_PATH), astakos_auth_proxy),
97
    (prefix_pattern(ASTAKOS_ACCOUNT_PROXY_PATH), astakos_account_proxy),
98
)
99
urlpatterns += patterns(
100
    '',
101
    (prefix_pattern(ASTAKOS_UI_PROXY_PATH), astakos_ui_proxy),
102
)
102 103

  
104
# --------------------------------------
103 105
# set utility redirects
104 106
extend_with_root_redirects(urlpatterns, cyclades_services, 'cyclades_ui',
105 107
                           BASE_PATH)

Also available in: Unified diff