Revision d91de78c

b/snf-cyclades-app/synnefo/helpdesk/tests.py
88 88
    def setUp(self):
89 89

  
90 90
        def get_user_mock(request, *args, **kwargs):
91
            request.user_uniq = None
92
            request.user = None
91 93
            if request.META.get('HTTP_X_AUTH_TOKEN', None) == '0000':
92 94
                request.user_uniq = 'test'
93 95
                request.user = {'uniq': 'test', 'auth_token': '0000'}
......
238 240
        vms = r.context['vms']
239 241
        nets = r.context['networks']
240 242
        self.assertEqual(account, USER2)
241
        self.assertEqual(vms[0].name, "user2 vm2")
242
        self.assertEqual(vms[1].name, "user2 vm1")
243 243
        self.assertEqual(vms.count(), 2)
244
        self.assertEqual(sorted([vms[0].name, vms[1].name]),
245
                         sorted(["user2 vm1", "user2 vm2"]))
244 246
        self.assertEqual(len(nets), 0)
245 247
        self.assertEqual(r.context['account_exists'], True)
246 248

  
b/snf-cyclades-app/synnefo/helpdesk/views.py
43 43

  
44 44
from urllib import unquote
45 45

  
46
from snf_django.lib.astakos import get_user
46
import astakosclient
47
from snf_django.lib import astakos
48

  
47 49
from synnefo.db.models import VirtualMachine, NetworkInterface, Network
48
from astakosclient import AstakosClient
49 50

  
50 51
# server actions specific imports
51 52
from synnefo.api import servers
......
109 110
            raise Http404
110 111

  
111 112
        token = get_token_from_cookie(request, AUTH_COOKIE_NAME)
112
        get_user(request, settings.ASTAKOS_URL,
113
                 fallback_token=token, logger=logger)
113
        astakos.get_user(request, settings.ASTAKOS_URL,
114
                         fallback_token=token, logger=logger)
114 115
        if hasattr(request, 'user') and request.user:
115 116
            groups = request.user.get('groups', [])
116 117

  
117 118
            if not groups:
118
                logger.error("Failed to access helpdesk view %r",
119
                logger.error("Failed to access helpdesk view. User: %r",
119 120
                             request.user_uniq)
120 121
                raise PermissionDenied
121 122

  
......
131 132
                raise PermissionDenied
132 133
        else:
133 134
            logger.error("Failed to access helpdesk view %r. No authenticated "
134
                         "user found.")
135
                         "user found.", request.user_uniq)
135 136
            raise PermissionDenied
136 137

  
137 138
        logging.info("User %s accessed helpdesk view (%s)", request.user_uniq,
......
194 195
            account = None
195 196
            search_query = vmid
196 197

  
197
    astakos = AstakosClient(settings.ASTAKOS_URL, retry=2,
198
                            use_pool=True, logger=logger)
198
    astakos_client = astakosclient.AstakosClient(settings.ASTAKOS_URL, retry=2,
199
                                                 use_pool=True, logger=logger)
199 200

  
200 201
    if is_uuid:
201 202
        account = search_query
202
        account_name = astakos.get_username(auth_token, account)
203
        account_name = astakos_client.get_username(auth_token, account)
203 204

  
204 205
    if account_exists and not is_uuid:
205 206
        account_name = search_query
206
        account = astakos.get_uuid(auth_token, account_name)
207
        account = astakos_client.get_uuid(auth_token, account_name)
207 208

  
208 209
    if not account:
209 210
        account_exists = False

Also available in: Unified diff