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

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

1 files changed, 81 insertions, 0 deletions

diff --git a/keystoneclient/v3/auth.py b/keystoneclient/v3/auth.py
new file mode 100644
index 0000000..8f26d3a
--- /dev/null
+++ b/keystoneclient/v3/auth.py
@@ -0,0 +1,81 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from keystoneclient import auth
+from keystoneclient import base
+from keystoneclient import exceptions
+
+
+class Project(base.Resource):
+    """Represents an Identity project.
+
+    Attributes:
+        * id: a uuid that identifies the project
+        * name: project name
+        * description: project description
+        * enabled: boolean to indicate if project is enabled
+        * parent_id: a uuid representing this project's parent in hierarchy
+        * parents: a list or a structured dict containing the parents of this
+                   project in the hierarchy
+        * subtree: a list or a structured dict containing the subtree of this
+                   project in the hierarchy
+
+    """
+
+
+class Domain(base.Resource):
+    """Represents an Identity domain.
+
+    Attributes:
+        * id: a uuid that identifies the domain
+
+    """
+    pass
+
+
+class AuthManager(base.Manager):
+    """Retrieve auth context specific information.
+
+    The information returned by the /auth routes are entirely dependant on the
+    authentication information provided by the user.
+    """
+
+    _PROJECTS_URL = '/auth/projects'
+    _DOMAINS_URL = '/auth/domains'
+
+    def projects(self):
+        """List projects that this token can be rescoped to.
+        """
+        try:
+            return self._list(self._PROJECTS_URL,
+                              'projects',
+                              obj_class=Project)
+        except exceptions.EndpointNotFound:
+            endpoint_filter = {'interface': auth.AUTH_INTERFACE}
+            return self._list(self._PROJECTS_URL,
+                              'projects',
+                              obj_class=Project,
+                              endpoint_filter=endpoint_filter)
+
+    def domains(self):
+        """List Domains that this token can be rescoped to.
+        """
+        try:
+            return self._list(self._DOMAINS_URL,
+                              'domains',
+                              obj_class=Domain)
+        except exceptions.EndpointNotFound:
+            endpoint_filter = {'interface': auth.AUTH_INTERFACE}
+            return self._list(self._DOMAINS_URL,
+                              'domains',
+                              obj_class=Domain,
+                              endpoint_filter=endpoint_filter)