delta/openstack/python-keystoneclient.git, branch feature/keystoneauth_integration

Merge remote-tracking branch 'origin/master' into merge-branch

2015-08-06T14:37:43+00:00

Conflicts:
	keystoneclient/exceptions.py
	keystoneclient/fixture/discovery.py
	keystoneclient/fixture/v2.py
	keystoneclient/fixture/v3.py
	keystoneclient/middleware/auth_token.py
	keystoneclient/middleware/s3_token.py
	keystoneclient/tests/unit/test_auth_token_middleware.py
	keystoneclient/tests/unit/test_memcache_crypt.py
	keystoneclient/tests/unit/test_s3_token_middleware.py
	requirements.txt
	test-requirements.txt

Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5

Merge "Use UUID values in v3 test fixtures"

2015-08-06T02:55:23+00:00

Deprecate openstack.common.apiclient

2015-08-05T17:28:30+00:00

Deprecate the apiclient from oslo-incubator so we can get rid of
it.

bp deprecations

Change-Id: I1c761933816da03b6c625f14d0aac43f206e88d7

Move apiclient.base.Resource into keystoneclient

2015-08-05T16:24:08+00:00

keystoneclient is using apiclient.base and in order to properly
deprecate and eventually get rid of apiclient we need to move the
symbols that keystoneclient uses out of apiclient.

This change moves apiclient.base.Resource into keystoneclient.base
by merging apiclient.base.Resource into the existing
keystoneclient.base.Resource. apiclient.base.Resource is now
renaming keystoneclient.base.Resource for backwards-compatibility.

Change-Id: Id479711b7c9437aaf171def6976aab8b303ec56d

oslo-incubator apiclient.exceptions to keystoneclient.exceptions

2015-08-05T14:59:23+00:00

Applications are using exceptions out of
keystoneclient.openstack.common.apiclient.exceptions so it's part
of the public interface. But since it's from oslo-incubator it's
not considered stable. Since keystoneclient is all stable this
creates bad situation.

With this change, all the symbols out of apiclient.exceptions are
moved into keystoneclient.exceptions rather than the other way
around (keystoneclient.exceptions used to re-export all of
apiclient.exceptions). Now we're in control of the
apiclient.exceptions and keystoneclient.exceptions that
applications are using.

Closes-Bug: 1481806
Change-Id: Ib3afa86b9d276f6a45d1ecd6f9157ee02ec8570d

Proper deprecation for HTTPClient session and adapter properties

2015-08-04T14:56:44+00:00

HTTPClient's forwarded session and adapter properties weren't
properly deprecated since the deprecations was only mentioned in
the docstring. Proper deprecation requires use of warnings/
debtcollector and documentation.

bp deprecations

Change-Id: Iea76d7bbc3bdeb13f7fdb097f13e007b4dd85c8d

Proper deprecation for HTTPClient.request methods

2015-08-04T14:56:44+00:00

HTTPClient.request and related methods weren't properly
deprecated since they were only mentioned in the docstrings.
Proper deprecation requires use of warnings/debtcollector and
documentation.

Also, fixed places where the deprecated request method was called.

bp deprecations

Change-Id: I0a16933252937ca046793bb6eb2e5cc5da03c9ae

Proper deprecation for HTTPClient.tenant_id|name

2015-08-04T14:56:44+00:00

HTTPClient tenant_id and tenant_name properties weren't properly
deprecated since they were only mentioned in the docstring. Proper
deprecation requires use of warnings/debtcollector and
documentation.

bp deprecations

Change-Id: I3c2f87df14bc9f8ffd82b99919fd1048123d0669

Proper deprecation for HTTPClient tenant_id, tenant_name parameters

2015-08-04T14:56:43+00:00

HTTPClient() tenant_id and tenant_name parameters weren't properly
deprecated since they were only mentioned in the docstring. Proper
deprecation requires use of warnings/debtcollector and documentation.

Also fixed a bunch of places in the tests where tenant_id and
tenant_name were still being used despite being deprecated.

bp deprecations

Change-Id: I9c4f596b8ff10aede6c417886638a942cb18044c

Updated from global requirements

2015-08-04T00:48:54+00:00

Change-Id: Idb9238ef74d67dc2bccf5ca49ada78507dfdf373