openstack/python-keystoneclient
Code Issues Proposed changes

Merge pull request #3 from anotherjesse/standardize

Browse Source 
Standardize OS API variable naming and project cleanup.
This commit is contained in:
Gabriel Hurley
2011-12-21 13:07:32 -08:00
parent 6c164d2fe0 6e970244a0
commit 5704463a70
15 changed files with 125 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
README.rst
View File

@@ -27,7 +27,7 @@ By way of a quick-start::
# use v2.0 auth with http://example.com:5000/v2.0") # use v2.0 auth with http://example.com:5000/v2.0")
>>> from keystoneclient.v2_0 import client >>> from keystoneclient.v2_0 import client
>>> keystone = client.Client(username=USERNAME, password=API_KEY, project_id=TENANT, auth_url=KEYSTONE_URL) >>> keystone = client.Client(username=USERNAME, password=PASSWORD, tenant_name=TENANT, auth_url=KEYSTONE_URL)
>>> keystone.tenants.list() >>> keystone.tenants.list()
>>> tenant = keystone.tenants.create(name="test", descrption="My new tenant!", enabled=True) >>> tenant = keystone.tenants.create(name="test", descrption="My new tenant!", enabled=True)
>>> tenant.delete() >>> tenant.delete()
@@ -48,17 +48,16 @@ You'll need to provide your OpenStack username and API key. You can do this
with the ``--username``, ``--apikey`` and ``--projectid`` params, but it's with the ``--username``, ``--apikey`` and ``--projectid`` params, but it's
easier to just set them as environment variables:: easier to just set them as environment variables::
export KEYSTONE_USERNAME=openstack export OS_TENANT_NAME=project
export KEYSTONE_API_KEY=yadayada export OS_USERNAME=user
export KEYSTONE_PROJECTID=yadayada export OS_PASSWORD=pass
You will also need to define the authentication url with ``--url`` and the You will also need to define the authentication url with ``--url`` and the
version of the API with ``--version``. Or set them as an environment version of the API with ``--version``. Or set them as an environment
variables as well:: variables as well::
export KEYSTONE_URL=http://example.com:5000/v2.0 export OS_AUTH_URL=http://example.com:5000/v2.0
export KEYSTONE_ADMIN_URL=http://example.com:35357/v2.0 export KEYSTONE_ADMIN_URL=http://example.com:35357/v2.0
export KEYSTONE_VERSION=2.0
Since Keystone can return multiple regions in the Service Catalog, you Since Keystone can return multiple regions in the Service Catalog, you
can specify the one you want with ``--region_name`` (or can specify the one you want with ``--region_name`` (or
@@ -67,8 +66,8 @@ can specify the one you want with ``--region_name`` (or
You'll find complete documentation on the shell by running You'll find complete documentation on the shell by running
``keystone help``:: ``keystone help``::
usage: keystone [--username USERNAME] [--apikey APIKEY] [--projectid PROJECTID] usage: keystone [--username user] [--password password]
[--url URL] [--version VERSION] [--region_name NAME] [--tenant_name tenant] [--auth_url URL]
<subcommand> ... <subcommand> ...
Command-line interface to the OpenStack Keystone API. Command-line interface to the OpenStack Keystone API.
@@ -79,15 +78,15 @@ You'll find complete documentation on the shell by running
Optional arguments: Optional arguments:
--username USERNAME Defaults to env[KEYSTONE_USERNAME]. --username USER Defaults to env[OS_USERNAME].
--apikey APIKEY Defaults to env[KEYSTONE_API_KEY]. --password PASSWORD Defaults to env[OS_PASSWORD].
--apikey PROJECTID Defaults to env[KEYSTONE_PROJECT_ID]. --tenant_name TENANT_NAME Defaults to env[OS_TENANT_NAME].
--url AUTH_URL Defaults to env[KEYSTONE_URL] or --tenant_id TENANT_ID Defaults to env[OS_TENANT_ID].
--url ADMIN_URL Defaults to env[KEYSTONE_ADMIN_URL] --url AUTH_URL Defaults to env[OS_AUTH_URL] or
--version VERSION Defaults to env[KEYSTONE_VERSION] or 2.0. --version VERSION Defaults to env[KEYSTONE_VERSION] or 2.0.
--region_name NAME The region name in the Keystone Service Catalog --region_name NAME The region name in the Keystone Service
to use after authentication. Defaults to Catalog to use after authentication.
env[KEYSTONE_REGION_NAME] or the first item Defaults to env[KEYSTONE_REGION_NAME] or the
in the list returned. first item in the list returned.
See "keystone help COMMAND" for help on a specific command. See "keystone help COMMAND" for help on a specific command.

36
docs/shell.rst
View File

@@ -12,27 +12,33 @@ The :program:`keystone` shell utility
The :program:`keystone` shell utility interacts with OpenStack Keystone API The :program:`keystone` shell utility interacts with OpenStack Keystone API
from the command line. It supports the entirety of the OpenStack Keystone API. from the command line. It supports the entirety of the OpenStack Keystone API.
First, you'll need an OpenStack Keystone account and an API key. You get this First, you'll need an OpenStack Keystone account. You get this by using the
by using the `keystone-manage` command in OpenStack Keystone. `keystone-manage` command in OpenStack Keystone.
You'll need to provide :program:`keystone` with your OpenStack username and You'll need to provide :program:`keystone` with your OpenStack username and
API key. You can do this with the :option:`--username`, :option:`--apikey` password. You can do this with the :option:`--username`, :option:`--password`.
and :option:`--projectid` options, but it's easier to just set them as You can optionally specify a :option:`--tenant_id` or :option:`--tenant_name`,
environment variables by setting two environment variables: to scope your token to a specific tenant. If you don't specify a tenant, you
will be scoped to your default tenant if you have one. Instead of using
options, it is easier to just set them as environment variables:
.. envvar:: KEYSTONE_USERNAME .. envvar:: OS_USERNAME
Your Keystone username. Your Keystone username.
.. envvar:: KEYSTONE_API_KEY .. envvar:: OS_PASSWORD
Your API key. Your Keystone password.
.. envvar:: KEYSTONE_PROJECT_ID .. envvar:: OS_TENANT_NAME
Project for work. Name of Keystone Tenant.
.. envvar:: KEYSTONE_URL .. envvar:: OS_TENANT_ID
ID of Keystone Tenant.
.. envvar:: OS_AUTH_URL
The OpenStack API server URL. The OpenStack API server URL.
@@ -42,10 +48,10 @@ environment variables by setting two environment variables:
For example, in Bash you'd use:: For example, in Bash you'd use::
export KEYSTONE_USERNAME=yourname export OS_USERNAME=yourname
export KEYSTONE_API_KEY=yadayadayada export OS_PASSWORD=yadayadayada
export KEYSTONE_PROJECT_ID=myproject export OS_TENANT_NAME=myproject
export KEYSTONE_URL=http://... export OS_AUTH_URL=http://example.com:5000/v2.0/
export KEYSTONE_VERSION=2.0 export KEYSTONE_VERSION=2.0
From there, all shell commands take the form:: From there, all shell commands take the form::

15
keystoneclient/client.py
View File

@@ -38,19 +38,20 @@ class HTTPClient(httplib2.Http):
USER_AGENT = 'python-keystoneclient' USER_AGENT = 'python-keystoneclient'
def __init__(self, username=None, password=None, token=None, def __init__(self, username=None, tenant_id=None, tenant_name=None,
project_id=None, auth_url=None, region_name=None, password=None, auth_url=None, region_name=None, timeout=None,
timeout=None, endpoint=None): endpoint=None, token=None):
super(HTTPClient, self).__init__(timeout=timeout) super(HTTPClient, self).__init__(timeout=timeout)
self.user = username self.username = username
self.tenant_id = tenant_id
self.tenant_name = tenant_name
self.password = password self.password = password
self.project_id = unicode(project_id)
self.auth_url = auth_url self.auth_url = auth_url
self.version = 'v2.0' self.version = 'v2.0'
self.region_name = region_name self.region_name = region_name
self.auth_token = token
self.management_url = endpoint self.management_url = endpoint
self.auth_token = token or password
# httplib2 overrides # httplib2 overrides
self.force_exception_to_status_code = True self.force_exception_to_status_code = True
@@ -140,8 +141,6 @@ class HTTPClient(httplib2.Http):
kwargs.setdefault('headers', {}) kwargs.setdefault('headers', {})
if self.auth_token and self.auth_token != self.password: if self.auth_token and self.auth_token != self.password:
kwargs['headers']['X-Auth-Token'] = self.auth_token kwargs['headers']['X-Auth-Token'] = self.auth_token
if self.project_id:
kwargs['headers']['X-Auth-Project-Id'] = self.project_id
# Perform the request once. If we get a 401 back then it # Perform the request once. If we get a 401 back then it
# might be because the auth token expired, so try to # might be because the auth token expired, so try to

66
keystoneclient/shell.py
View File

@@ -56,20 +56,24 @@ class OpenStackIdentityShell(object):
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
parser.add_argument('--username', parser.add_argument('--username',
default=env('KEYSTONE_USERNAME'), default=env('OS_USERNAME'),
help='Defaults to env[KEYSTONE_USERNAME].') help='Defaults to env[OS_USERNAME].')
parser.add_argument('--apikey', parser.add_argument('--password',
default=env('KEYSTONE_API_KEY'), default=env('OS_PASSWORD'),
help='Defaults to env[KEYSTONE_API_KEY].') help='Defaults to env[OS_PASSWORD].')
parser.add_argument('--projectid', parser.add_argument('--tenant_name',
default=env('KEYSTONE_PROJECT_ID'), default=env('OS_TENANT_NAME'),
help='Defaults to env[KEYSTONE_PROJECT_ID].') help='Defaults to env[OS_TENANT_NAME].')
parser.add_argument('--tenant_id',
default=env('OS_TENANT_ID'),
help='Defaults to env[OS_TENANT_ID].')
parser.add_argument('--url', parser.add_argument('--url',
default=env('KEYSTONE_URL'), default=env('OS_AUTH_URL'),
help='Defaults to env[KEYSTONE_URL].') help='Defaults to env[OS_AUTH_URL].')
parser.add_argument('--region_name', parser.add_argument('--region_name',
default=env('KEYSTONE_REGION_NAME'), default=env('KEYSTONE_REGION_NAME'),
@@ -144,37 +148,27 @@ class OpenStackIdentityShell(object):
self.do_help(args) self.do_help(args)
return 0 return 0
user, apikey, projectid, url, region_name = \
args.username, args.apikey, args.projectid, args.url, \
args.region_name
#FIXME(usrleon): Here should be restrict for project id same as #FIXME(usrleon): Here should be restrict for project id same as
# for username or apikey but for compatibility it is not. # for username or apikey but for compatibility it is not.
if not user: if not args.username:
raise exc.CommandError("You must provide a username, either" raise exc.CommandError("You must provide a username:"
"via --username or via " "via --username or env[OS_USERNAME]")
"env[KEYSTONE_USERNAME]") if not args.password:
if not apikey: raise exc.CommandError("You must provide a password, either"
raise exc.CommandError("You must provide an API key, either" "via --password or env[OS_PASSWORD]")
"via --apikey or via"
"env[KEYSTONE_API_KEY]")
if options.version and options.version != '1.0':
if not projectid:
raise exc.CommandError("You must provide an projectid, either"
"via --projectid or via"
"env[KEYSTONE_PROJECT_ID")
if not url: if not args.url:
raise exc.CommandError("You must provide a auth url, either" raise exc.CommandError("You must provide a auth url, either"
"via --url or via" "via --auth_url or via"
"env[KEYSTONE_URL") "env[OS_AUTH_URL")
self.cs = self.get_api_class(options.version)(user, self.cs = self.get_api_class(options.version)(username=args.username,
apikey, tenant_name=args.tenant_name,
projectid, tenant_id=args.tenant_id,
url, password=args.password,
region_name=region_name) auth_url=args.auth_url,
region_name=args.region_name)
try: try:
self.cs.authenticate() self.cs.authenticate()

31
keystoneclient/v2_0/client.py
View File

@@ -12,7 +12,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import urlparse
import logging import logging
from keystoneclient import client from keystoneclient import client
@@ -34,7 +33,8 @@ class Client(client.HTTPClient):
:param string username: Username for authentication. (optional) :param string username: Username for authentication. (optional)
:param string password: Password for authentication. (optional) :param string password: Password for authentication. (optional)
:param string token: Token for authentication. (optional) :param string token: Token for authentication. (optional)
:param string project_id: Tenant/Project id. (optional) :param string tenant_name: Tenant id. (optional)
:param string tenant_id: Tenant name. (optional)
:param string auth_url: Keystone service endpoint for authorization. :param string auth_url: Keystone service endpoint for authorization.
:param string region_name: Name of a region to select when choosing an :param string region_name: Name of a region to select when choosing an
endpoint from the service catalog. endpoint from the service catalog.
@@ -50,7 +50,7 @@ class Client(client.HTTPClient):
>>> from keystoneclient.v2_0 import client >>> from keystoneclient.v2_0 import client
>>> keystone = client.Client(username=USER, >>> keystone = client.Client(username=USER,
password=PASS, password=PASS,
project_id=TENANT, tenant_name=TENANT_NAME,
auth_url=KEYSTONE_URL) auth_url=KEYSTONE_URL)
>>> keystone.tenants.list() >>> keystone.tenants.list()
... ...
@@ -87,11 +87,12 @@ class Client(client.HTTPClient):
""" """
self.management_url = self.auth_url self.management_url = self.auth_url
try: try:
raw_token = self.tokens.authenticate(username=self.user, raw_token = self.tokens.authenticate(username=self.username,
password=self.password, tenant_id=self.tenant_id,
tenant=self.project_id, tenant_name=self.tenant_name,
token=self.auth_token, password=self.password,
return_raw=True) token=self.auth_token,
return_raw=True)
self._extract_service_catalog(self.auth_url, raw_token) self._extract_service_catalog(self.auth_url, raw_token)
return True return True
except (exceptions.AuthorizationFailure, exceptions.Unauthorized): except (exceptions.AuthorizationFailure, exceptions.Unauthorized):
@@ -108,9 +109,13 @@ class Client(client.HTTPClient):
self.auth_token = self.service_catalog.get_token() self.auth_token = self.service_catalog.get_token()
except KeyError: except KeyError:
raise exceptions.AuthorizationFailure() raise exceptions.AuthorizationFailure()
if self.project_id:
# FIXME(ja): we should be lazy about setting managment_url.
# in fact we should rewrite the client to support the service
# catalog (api calls should be directable to any endpoints)
try:
self.management_url = self.service_catalog.url_for(attr='region',
filter_value=self.region_name, endpoint_type='adminURL')
except:
# Unscoped tokens don't return a service catalog # Unscoped tokens don't return a service catalog
self.management_url = self.service_catalog.url_for( _logger.exception("unable to retrieve service catalog with token")
attr='region',
filter_value=self.region_name)
return self.service_catalog

10
keystoneclient/v2_0/tokens.py
View File

@@ -21,8 +21,8 @@ class Token(base.Resource):
class TokenManager(base.ManagerWithFind): class TokenManager(base.ManagerWithFind):
resource_class = Token resource_class = Token
def authenticate(self, username=None, password=None, tenant=None, def authenticate(self, username=None, tenant_id=None, tenant_name=None,
token=None, return_raw=False): password=None, token=None, return_raw=False):
if token and token != password: if token and token != password:
params = {"auth": {"token": {"id": token}}} params = {"auth": {"token": {"id": token}}}
elif username and password: elif username and password:
@@ -30,8 +30,10 @@ class TokenManager(base.ManagerWithFind):
"password": password}}} "password": password}}}
else: else:
raise ValueError('A username and password or token is required.') raise ValueError('A username and password or token is required.')
if tenant: if tenant_id:
params['auth']['tenantId'] = tenant params['auth']['tenantId'] = tenant_id
elif tenant_name:
params['auth']['tenantName'] = tenant_name
return self._create('/tokens', params, "access", return_raw=return_raw) return self._create('/tokens', params, "access", return_raw=return_raw)
def endpoints(self, token): def endpoints(self, token):

6
tests/test_http.py
View File

@@ -11,8 +11,8 @@ mock_request = mock.Mock(return_value=(fake_response, fake_body))
def get_client(): def get_client():
cl = client.HTTPClient(username="username", password="apikey", cl = client.HTTPClient(username="username", password="password",
project_id="project_id", auth_url="auth_test") tenant_id="tenant", auth_url="auth_test")
return cl return cl
@@ -33,7 +33,6 @@ class ClientTest(utils.TestCase):
def test_get_call(): def test_get_call():
resp, body = cl.get("/hi") resp, body = cl.get("/hi")
headers = {"X-Auth-Token": "token", headers = {"X-Auth-Token": "token",
"X-Auth-Project-Id": "project_id",
"User-Agent": cl.USER_AGENT, "User-Agent": cl.USER_AGENT,
} }
mock_request.assert_called_with("http://127.0.0.1:5000/" mock_request.assert_called_with("http://127.0.0.1:5000/"
@@ -52,7 +51,6 @@ class ClientTest(utils.TestCase):
cl.post("/hi", body=[1, 2, 3]) cl.post("/hi", body=[1, 2, 3])
headers = { headers = {
"X-Auth-Token": "token", "X-Auth-Token": "token",
"X-Auth-Project-Id": "project_id",
"Content-Type": "application/json", "Content-Type": "application/json",
"User-Agent": cl.USER_AGENT "User-Agent": cl.USER_AGENT
} }

8
tests/test_shell.py
View File

@@ -13,10 +13,10 @@ class ShellTest(utils.TestCase):
def setUp(self): def setUp(self):
global _old_env global _old_env
fake_env = { fake_env = {
'KEYSTONE_USERNAME': 'username', 'OS_USERNAME': 'username',
'KEYSTONE_API_KEY': 'password', 'OS_PASSWORD': 'password',
'KEYSTONE_PROJECT_ID': 'project_id', 'OS_TENANT_ID': 'tenant_id',
'KEYSTONE_URL': 'http://127.0.0.1:5000', 'OS_AUTH_URL': 'http://127.0.0.1:5000/v2.0',
} }
_old_env, os.environ = os.environ, fake_env.copy() _old_env, os.environ = os.environ, fake_env.copy()

4
tests/utils.py
View File

@@ -8,7 +8,7 @@ from keystoneclient.v2_0 import client
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
TEST_TENANT = '1' TEST_TENANT_ID = '1'
TEST_TENANT_NAME = 'aTenant' TEST_TENANT_NAME = 'aTenant'
TEST_TOKEN = 'aToken' TEST_TOKEN = 'aToken'
TEST_USER = 'test' TEST_USER = 'test'
@@ -70,7 +70,7 @@ class TestCase(unittest.TestCase):
httplib2.Http.request = self.mox.CreateMockAnything() httplib2.Http.request = self.mox.CreateMockAnything()
self.client = client.Client(username=self.TEST_USER, self.client = client.Client(username=self.TEST_USER,
token=self.TEST_TOKEN, token=self.TEST_TOKEN,
project_id=self.TEST_TENANT, tenant_name=self.TEST_TENANT_NAME,
auth_url=self.TEST_URL, auth_url=self.TEST_URL,
endpoint=self.TEST_URL) endpoint=self.TEST_URL)

20
tests/v2_0/test_auth.py
View File

@@ -36,7 +36,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
"username": self.TEST_USER, "username": self.TEST_USER,
"password": self.TEST_TOKEN, "password": self.TEST_TOKEN,
}, },
"tenantId": self.TEST_TENANT "tenantId": self.TEST_TENANT_ID
} }
} }
self.TEST_REQUEST_HEADERS = { self.TEST_REQUEST_HEADERS = {
@@ -47,7 +47,6 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
def test_authenticate_failure(self): def test_authenticate_failure(self):
self.TEST_REQUEST_BODY['auth']['passwordCredentials']['password'] = \ self.TEST_REQUEST_BODY['auth']['passwordCredentials']['password'] = \
'bad_key' 'bad_key'
self.TEST_REQUEST_HEADERS['X-Auth-Project-Id'] = '1'
resp = httplib2.Response({ resp = httplib2.Response({
"status": 401, "status": 401,
"body": json.dumps({"unauthorized": { "body": json.dumps({"unauthorized": {
@@ -70,11 +69,10 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
with self.assertRaises(exceptions.Unauthorized): with self.assertRaises(exceptions.Unauthorized):
client.Client(username=self.TEST_USER, client.Client(username=self.TEST_USER,
password="bad_key", password="bad_key",
project_id=self.TEST_TENANT, tenant_id=self.TEST_TENANT_ID,
auth_url=self.TEST_URL) auth_url=self.TEST_URL)
def test_auth_redirect(self): def test_auth_redirect(self):
self.TEST_REQUEST_HEADERS['X-Auth-Project-Id'] = '1'
correct_response = json.dumps(self.TEST_RESPONSE_DICT) correct_response = json.dumps(self.TEST_RESPONSE_DICT)
dict_responses = [ dict_responses = [
{"headers": {'location': self.TEST_ADMIN_URL + "/tokens"}, {"headers": {'location': self.TEST_ADMIN_URL + "/tokens"},
@@ -101,17 +99,16 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
cs = client.Client(username=self.TEST_USER, cs = client.Client(username=self.TEST_USER,
password=self.TEST_TOKEN, password=self.TEST_TOKEN,
project_id=self.TEST_TENANT, tenant_id=self.TEST_TENANT_ID,
auth_url=self.TEST_URL) auth_url=self.TEST_URL)
self.assertEqual(cs.management_url, self.assertEqual(cs.management_url,
self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3] self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3]
['endpoints'][0]["publicURL"]) ['endpoints'][0]["adminURL"])
self.assertEqual(cs.auth_token, self.assertEqual(cs.auth_token,
self.TEST_RESPONSE_DICT["access"]["token"]["id"]) self.TEST_RESPONSE_DICT["access"]["token"]["id"])
def test_authenticate_success_password_scoped(self): def test_authenticate_success_password_scoped(self):
self.TEST_REQUEST_HEADERS['X-Auth-Project-Id'] = '1'
resp = httplib2.Response({ resp = httplib2.Response({
"status": 200, "status": 200,
"body": json.dumps(self.TEST_RESPONSE_DICT), "body": json.dumps(self.TEST_RESPONSE_DICT),
@@ -126,11 +123,11 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
cs = client.Client(username=self.TEST_USER, cs = client.Client(username=self.TEST_USER,
password=self.TEST_TOKEN, password=self.TEST_TOKEN,
project_id=self.TEST_TENANT, tenant_id=self.TEST_TENANT_ID,
auth_url=self.TEST_URL) auth_url=self.TEST_URL)
self.assertEqual(cs.management_url, self.assertEqual(cs.management_url,
self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3] self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3]
['endpoints'][0]["publicURL"]) ['endpoints'][0]["adminURL"])
self.assertEqual(cs.auth_token, self.assertEqual(cs.auth_token,
self.TEST_RESPONSE_DICT["access"]["token"]["id"]) self.TEST_RESPONSE_DICT["access"]["token"]["id"])
@@ -159,7 +156,6 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
def test_authenticate_success_token_scoped(self): def test_authenticate_success_token_scoped(self):
del self.TEST_REQUEST_BODY['auth']['passwordCredentials'] del self.TEST_REQUEST_BODY['auth']['passwordCredentials']
self.TEST_REQUEST_BODY['auth']['token'] = {'id': self.TEST_TOKEN} self.TEST_REQUEST_BODY['auth']['token'] = {'id': self.TEST_TOKEN}
self.TEST_REQUEST_HEADERS['X-Auth-Project-Id'] = '1'
self.TEST_REQUEST_HEADERS['X-Auth-Token'] = self.TEST_TOKEN self.TEST_REQUEST_HEADERS['X-Auth-Token'] = self.TEST_TOKEN
resp = httplib2.Response({ resp = httplib2.Response({
"status": 200, "status": 200,
@@ -174,11 +170,11 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
cs = client.Client(token=self.TEST_TOKEN, cs = client.Client(token=self.TEST_TOKEN,
project_id=self.TEST_TENANT, tenant_id=self.TEST_TENANT_ID,
auth_url=self.TEST_URL) auth_url=self.TEST_URL)
self.assertEqual(cs.management_url, self.assertEqual(cs.management_url,
self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3] self.TEST_RESPONSE_DICT["access"]["serviceCatalog"][3]
['endpoints'][0]["publicURL"]) ['endpoints'][0]["adminURL"])
self.assertEqual(cs.auth_token, self.assertEqual(cs.auth_token,
self.TEST_RESPONSE_DICT["access"]["token"]["id"]) self.TEST_RESPONSE_DICT["access"]["token"]["id"])

6
tests/v2_0/test_roles.py
View File

@@ -10,11 +10,9 @@ from tests import utils
class RoleTests(utils.TestCase): class RoleTests(utils.TestCase):
def setUp(self): def setUp(self):
super(RoleTests, self).setUp() super(RoleTests, self).setUp()
self.TEST_REQUEST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_REQUEST_HEADERS = {'X-Auth-Token': 'aToken',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_POST_HEADERS = {'Content-Type': 'application/json',
'Content-Type': 'application/json',
'X-Auth-Token': 'aToken', 'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_ROLES = { self.TEST_ROLES = {

6
tests/v2_0/test_services.py
View File

@@ -10,11 +10,9 @@ from tests import utils
class ServiceTests(utils.TestCase): class ServiceTests(utils.TestCase):
def setUp(self): def setUp(self):
super(ServiceTests, self).setUp() super(ServiceTests, self).setUp()
self.TEST_REQUEST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_REQUEST_HEADERS = {'X-Auth-Token': 'aToken',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_POST_HEADERS = {'Content-Type': 'application/json',
'Content-Type': 'application/json',
'X-Auth-Token': 'aToken', 'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_SERVICES = {"OS-KSADM:services": { self.TEST_SERVICES = {"OS-KSADM:services": {

7
tests/v2_0/test_tenants.py
View File

@@ -10,11 +10,9 @@ from tests import utils
class TenantTests(utils.TestCase): class TenantTests(utils.TestCase):
def setUp(self): def setUp(self):
super(TenantTests, self).setUp() super(TenantTests, self).setUp()
self.TEST_REQUEST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_REQUEST_HEADERS = {'X-Auth-Token': 'aToken',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_POST_HEADERS = {'Content-Type': 'application/json',
'Content-Type': 'application/json',
'X-Auth-Token': 'aToken', 'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_TENANTS = {"tenants": { self.TEST_TENANTS = {"tenants": {
@@ -144,7 +142,6 @@ class TenantTests(utils.TestCase):
req_body['tenant']['name'], req_body['tenant']['name'],
req_body['tenant']['description'], req_body['tenant']['description'],
req_body['tenant']['enabled']) req_body['tenant']['enabled'])
print tenant
self.assertTrue(isinstance(tenant, tenants.Tenant)) self.assertTrue(isinstance(tenant, tenants.Tenant))
self.assertEqual(tenant.id, 4) self.assertEqual(tenant.id, 4)
self.assertEqual(tenant.name, "tenantX") self.assertEqual(tenant.name, "tenantX")

6
tests/v2_0/test_tokens.py
View File

@@ -10,11 +10,9 @@ from tests import utils
class TokenTests(utils.TestCase): class TokenTests(utils.TestCase):
def setUp(self): def setUp(self):
#super(ServiceTests, self).setUp() #super(ServiceTests, self).setUp()
self.TEST_REQUEST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_REQUEST_HEADERS = {'X-Auth-Token': 'aToken',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_POST_HEADERS = {'Content-Type': 'application/json',
'Content-Type': 'application/json',
'X-Auth-Token': 'aToken', 'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
''' '''

6
tests/v2_0/test_users.py
View File

@@ -10,11 +10,9 @@ from tests import utils
class UserTests(utils.TestCase): class UserTests(utils.TestCase):
def setUp(self): def setUp(self):
super(UserTests, self).setUp() super(UserTests, self).setUp()
self.TEST_REQUEST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_REQUEST_HEADERS = {'X-Auth-Token': 'aToken',
'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_POST_HEADERS = {'X-Auth-Project-Id': '1', self.TEST_POST_HEADERS = {'Content-Type': 'application/json',
'Content-Type': 'application/json',
'X-Auth-Token': 'aToken', 'X-Auth-Token': 'aToken',
'User-Agent': 'python-keystoneclient'} 'User-Agent': 'python-keystoneclient'}
self.TEST_USERS = { self.TEST_USERS = {