openstack/python-keystoneclient
Code Issues Proposed changes

Added delete token

Browse Source 
Change-Id: I202f89f74702df6b775d4fa3ca3fca2111709949
This commit is contained in:
Dolph Mathews
2012-01-30 10:20:12 -06:00
parent d29168fa3f
commit 6c996e807a
2 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystoneclient/v2_0/tokens.py
View File

@@ -36,5 +36,8 @@ class TokenManager(base.ManagerWithFind):
params['auth']['tenantName'] = tenant_name
return self._create('/tokens', params, "access", return_raw=return_raw)
def delete(self, token):
return self._delete("/tokens/%s" % base.getid(token))
def endpoints(self, token):
return self._get("/tokens/%s/endpoints" % base.getid(token), "token")

55
tests/v2_0/test_tokens.py
View File

@@ -1,47 +1,32 @@
#import urlparse
#import json
import urlparse
#import httplib2
import httplib2
#from keystoneclient.v2_0 import tokens
from tests import utils
class TokenTests(utils.TestCase):
def setUp(self):
#super(ServiceTests, self).setUp()
self.TEST_REQUEST_HEADERS = {'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {'Content-Type': 'application/json',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'}
'''
def test_create(self):
req_body = {"OS-KSADM:service": {"name": "swift",
"type": "object-store",
"description": "Swift-compatible service."}}
resp_body = {"OS-KSADM:service": {"name": "swift",
"type": "object-store",
"description": "Swift-compatible service.",
"id": 3}}
super(TokenTests, self).setUp()
self.TEST_REQUEST_HEADERS = {
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {
'Content-Type': 'application/json',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'}
def test_delete(self):
resp = httplib2.Response({
"status": 200,
"body": json.dumps(resp_body),
})
"body": ""})
req = httplib2.Http.request(
urlparse.urljoin(self.TEST_URL, 'v2.0/tokens/1'),
'DELETE',
headers=self.TEST_REQUEST_HEADERS)
req.AndReturn((resp, resp['body']))
httplib2.Http.request(urlparse.urljoin(self.TEST_URL,
'v2.0/OS-KSADM/services'),
'POST',
body=json.dumps(req_body),
headers=self.TEST_POST_HEADERS) \
.AndReturn((resp, resp['body']))
self.mox.ReplayAll()
service = self.client.services.create(
req_body['OS-KSADM:service']['name'],
req_body['OS-KSADM:service']['type'],
req_body['OS-KSADM:service']['description'])
self.assertTrue(isinstance(service, services.Service))
self.assertEqual(service.id, 3)
self.assertEqual(service.name, req_body['OS-KSADM:service']['name'])
'''
self.client.tokens.delete(1)