diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-30 21:14:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-30 21:14:14 +0000 |
| commit | 14b09e824bca0c64ac8494e6a35c5dcbda13f70b (patch) | |
| tree | 2cadea97634121ddb73eea3ef595c1f2171cfdbc | |
| parent | 04c03752f52bd648dc70b0b9d5eda3fd277dd86c (diff) | |
| parent | 6c996e807a93cb2fd27780e312d4604f98872b2c (diff) | |
| download | python-keystoneclient-14b09e824bca0c64ac8494e6a35c5dcbda13f70b.tar.gz | |
Merge "Added delete token"
| -rw-r--r-- | keystoneclient/v2_0/tokens.py | 3 | ||||
| -rw-r--r-- | tests/v2_0/test_tokens.py | 57 |
2 files changed, 24 insertions, 36 deletions
diff --git a/keystoneclient/v2_0/tokens.py b/keystoneclient/v2_0/tokens.py index 0b3c579..22e5ea6 100644 --- a/keystoneclient/v2_0/tokens.py +++ b/keystoneclient/v2_0/tokens.py @@ -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") diff --git a/tests/v2_0/test_tokens.py b/tests/v2_0/test_tokens.py index 1edcba6..a8abc95 100644 --- a/tests/v2_0/test_tokens.py +++ b/tests/v2_0/test_tokens.py @@ -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), - }) - - 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'])) + "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'])) + 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) |