From 5c6bccf1c57b06a19845c696c19274ae9f080104 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Wed, 7 Mar 2012 22:32:23 -0600 Subject: fixes lp#949648 change belongsTo validate to name Change-Id: I3d36290ad95a0440c006e2daff5b831be62957ae --- keystone/service.py | 2 +- tests/test_content_types.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keystone/service.py b/keystone/service.py index a92dc15a..9acee83b 100644 --- a/keystone/service.py +++ b/keystone/service.py @@ -365,7 +365,7 @@ class TokenController(wsgi.Application): token_id=token_id) if belongs_to: - assert token_ref['tenant']['id'] == belongs_to + assert token_ref['tenant']['name'] == belongs_to return token_ref diff --git a/tests/test_content_types.py b/tests/test_content_types.py index d98330a4..dc632abc 100644 --- a/tests/test_content_types.py +++ b/tests/test_content_types.py @@ -355,7 +355,7 @@ class CoreApiTests(object): def test_validate_token_belongs_to(self): token = self.get_scoped_token() path = ('/v2.0/tokens/%s?belongs_to=%s' - % (token, self.tenant_bar['id'])) + % (token, self.tenant_bar['name'])) r = self.admin_request(path=path,token=token) self.assertValidAuthenticationResponse(r, require_service_catalog=True) -- cgit