Revision 6e416d7b

b/snf-astakos-app/astakos/api/keystone_urls.py
1
# Copyright 2013 GRNET S.A. All rights reserved.
2
#
3
# Redistribution and use in source and binary forms, with or
4
# without modification, are permitted provided that the following
5
# conditions are met:
6
#
7
#   1. Redistributions of source code must retain the above
8
#      copyright notice, this list of conditions and the following
9
#      disclaimer.
10
#
11
#   2. Redistributions in binary form must reproduce the above
12
#      copyright notice, this list of conditions and the following
13
#      disclaimer in the documentation and/or other materials
14
#      provided with the distribution.
15
#
16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
20
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
24
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27
# POSSIBILITY OF SUCH DAMAGE.
28
#
29
# The views and conclusions contained in the software and
30
# documentation are those of the authors and should not be
31
# interpreted as representing official policies, either expressed
32
# or implied, of GRNET S.A.
33

  
34
from django.conf.urls.defaults import patterns, url
35

  
36
urlpatterns = patterns(
37
    'astakos.api.tokens',
38
    url(r'tokens/?$', 'authenticate'),
39
    url(r'tokens/(?P<token>.+?)/endpoints', 'get_endpoints'),
40
)
b/snf-astakos-app/astakos/api/urls.py
56 56
    'astakos.api.service',
57 57
    url(r'^service/user_catalogs/?$', 'get_uuid_displayname_catalogs'),
58 58
)
59

  
60
urlpatterns += patterns(
61
    'astakos.api.tokens',
62
    url(r'tokens/?$', 'authenticate'),
63
    url(r'tokens/(?P<token>.+?)/endpoints', 'get_endpoints'),
64
)
b/snf-astakos-app/astakos/urls.py
34 34
from django.conf.urls.defaults import include, patterns
35 35
from synnefo.lib import join_urls
36 36
from astakos.im.settings import (
37
    BASE_PATH, ACCOUNTS_PREFIX, VIEWS_PREFIX, KEYSTONE_PREFIX
38
)
37
    BASE_PATH, ACCOUNTS_PREFIX, VIEWS_PREFIX, KEYSTONE_PREFIX)
39 38
from snf_django.lib.api.utils import prefix_pattern
40 39

  
41 40
astakos_patterns = patterns(
42 41
    '',
43 42
    (prefix_pattern(VIEWS_PREFIX), include('astakos.im.urls')),
44 43
    (prefix_pattern(ACCOUNTS_PREFIX), include('astakos.api.urls')),
45
    #(prefix_pattern(KEYSTONE_PREFIX), include('astakos.api.keystone_urls')),
44
    (prefix_pattern(KEYSTONE_PREFIX), include('astakos.api.keystone_urls')),
46 45
)
47 46

  
48 47
# Compatibility: expose some API URLs at top-level

Also available in: Unified diff