Use unittest2 instead of unittest.

This allows the test to run on RHEL 6.2
and python 2.6.

Fixed bug 933076

Change-Id: Idb026114ac1813266d77a70d13b0c3b9467f5199
Restores proper PUT method for user update now that KSL supports it.

Change-Id: Ifd68a9878489efa29442f1035d0393ada9c6d3ff
Display token and service catalog for user

* Adds commands 'token', 'catalog' and 'endpoint-get' to keystone CLI
* Fixes bug 930421

Change-Id: I9eceea3bf98a5c87b122fa663c96f7119ef8d3cc
Add tenant commands to cli

* Adds tenant-list, tenant-get and tenant-update to keystone command
* Removes tenant-enable and tenant-disable
* Fixes more overlap in cli args, clean up command args, particularly
  removing nargs from arguments that are not optional.
* Fixes bug 932235

Change-Id: I1aafec1b2a3943e0f6c86f0228ab29f181a7ffce
Added condition requirement to argparse

Change-Id: Ibffdcbd3ed7e2c2e982023455d60d10a6001ff23
Fix inconsistient method names and add tests

Fixes bug 937104

https://review.openstack.org/3527 renamed methods in RoleManager:
get_user_role_refs() -> roles_for_user()
add_user_to_tenant() -> add_user_role()
remove_user_from_tenant() -> remove_user_role()

* Calls to old method names in Tenant and TenantManager are fixed.
* Add tests for all renamed and affected methods.

Change-Id: Idf569d7dd737c5ccc38b4ea8212d5336998ae0f1
Remove internal '-' from flag names

Fixes bug 936400
* global --auth-url becomes --auth_url
* user-create --default-tenant becomes --tenant_id

Change-Id: I483bb369556f4da2a6de61a39d00a7adbe1cf12e
Move --version to --identity_api_version

* Default to OS_IDENTITY_API_VERSION before KEYSTONE_VERSION
* Copy in 'env' function from python-novaclient hat supports multiple env var names
* Fixes bug 936162

Change-Id: I3b4013408465ea45788517cb31afb7fc652e6e95
Help output tweaks, Vol I

Fixes bug 936399 and bug 936424

* Refer to 'Identiy API' rather than 'Keystone API'
* 'keystone help' and 'keystone --help' now produce the same output,
  the list of sub-commands
* updates README

Change-Id: I179149807a0aa66947e4ac17ad2839a653a55888
Merge "Fix inconsistient method names and add tests"
Merge "Use unittest2 instead of unittest."
Improve usability of CLI.

  * Fixes bug #936422
  * Fixes bug #932223
  * Depends on bcwaldon's review: https://review.openstack.org/#change,4305
  * This review proposes making changes outlined in this spreadsheet:
    https://docs.google.com/spreadsheet/ccc?key=0Ak6TA47h_6fwdGZwRE5WWEJBdEhnckpMTG5RcWFjY3c#gid=0
    This cleans up the CLI, normalizing commands and arguments, correcting
    optional and required arguments and flags.
  * included https://review.openstack.org/4270 here per Brian's request

  Note that some commands have changed names to conform to noun-verb form:
  user-update-password  ->  user-password-update
  add-user-role  ->  user-role-add
  remove-user-role  ->  user-role-remove
  ec2-create-credentials  ->  ec2-credentials-create
  ec2-list-credentials  ->  ec2-credentials-list
  ec2-delete-credentials  ->  ec2-credentials-delete
  token  ->  token-get

Change-Id: I8128fa105a1b8002199211f9e475b1a7a6229b8c
Merge "Help output tweaks, Vol I"
Fix --tenant_id corner case with ec2-create-creds command

And add some tests for that case

Rebased after CLI changes merged
Rebased again after more bit rot discovered

Change-Id: I95fa5ab19bff1d5e884b5c3675a123b134866e21
Clean up EC2 CRUD

Fixes bug 932427

* adds ec2-credentials-get
* cleans up ec2-credentials-list output
* display status of 3c2-credentials-delete
* add basic shell tests

Rebased 27Feb2012

Change-Id: Ic06ba9e2e49bad872f9091e1830d5296b0d411aa
Endpoints: Add create, delete, list support

This adds the ability for admins to list, create and delete
endpoints in the service catalog.

New endpoints can be created and associated with an existing
service, similar to the original Keystone.

The current, file-backed templated catalog driver does not support these
actions.  This requires that the SQL catalog backend is merged:

https://review.openstack.org/#change,4464

Update: As per discussion on above review, Remove use of OS-KSADM key,
        update tests accordingly.

Change-Id: Ie6f219fe989327bd61e293ce100b70dbf7f6de52
Merge "Endpoints: Add create, delete, list support"
Remove trailing whitespaces in regular file

Change-Id: I49c7f59fd1c695ccfccbd597a15e01d2d140eb20
Make ec2-credentials-* commands work properly for non-admin user

* Add user id to token-get output
* Save authenticated user and tenant IDs in client in Client._extract_service_catalog()
* Handle default user and tenant IDs in ec2-credentials-* commands

Fixed bug 947011

Change-Id: I97750f666ba03f32f0bb1be0c2df5ad8a321b433
Removed ?fresh=nonsense (bug 936405)

Change-Id: I69f7411967ef23348854c206efc79a3cf7d3755d