Merge "Add trust users to AccessInfo and fixture"

1 files changed, 27 insertions, 1 deletions

diff --git a/keystoneclient/fixture/v2.py b/keystoneclient/fixture/v2.py
index 76cd1b8..f6e827c 100644
--- a/keystoneclient/fixture/v2.py
+++ b/keystoneclient/fixture/v2.py
@@ -42,7 +42,7 @@ class Token(dict):
 
     def __init__(self, token_id=None, expires=None, issued=None,
                  tenant_id=None, tenant_name=None, user_id=None,
-                 user_name=None):
+                 user_name=None, trust_id=None, trustee_user_id=None):
         super(Token, self).__init__()
 
         self.token_id = token_id or uuid.uuid4().hex
@@ -69,6 +69,12 @@ class Token(dict):
         if tenant_id or tenant_name:
             self.set_scope(tenant_id, tenant_name)
 
+        if trust_id or trustee_user_id:
+            # the trustee_user_id will generally be the same as the user_id as
+            # the token is being issued to the trustee
+            self.set_trust(id=trust_id,
+                           trustee_user_id=trustee_user_id or user_id)
+
     @property
     def root(self):
         return self.setdefault('access', {})
@@ -157,6 +163,22 @@ class Token(dict):
     def _metadata(self):
         return self.root.setdefault('metadata', {})
 
+    @property
+    def trust_id(self):
+        return self.root.setdefault('trust', {})('id')
+
+    @trust_id.setter
+    def trust_id(self, value):
+        self.root.setdefault('trust', {})['id'] = value
+
+    @property
+    def trustee_user_id(self):
+        return self.root.setdefault('trust', {}).get('trustee_user_id')
+
+    @trustee_user_id.setter
+    def trustee_user_id(self, value):
+        self.root.setdefault('trust', {})['trustee_user_id'] = value
+
     def validate(self):
         scoped = 'tenant' in self.token
         catalog = self.root.get('serviceCatalog')
@@ -186,3 +208,7 @@ class Token(dict):
     def set_scope(self, id=None, name=None):
         self.tenant_id = id or uuid.uuid4().hex
         self.tenant_name = name or uuid.uuid4().hex
+
+    def set_trust(self, id=None, trustee_user_id=None):
+        self.trust_id = id or uuid.uuid4().hex
+        self.trustee_user_id = trustee_user_id or uuid.uuid4().hex