From eb28fa57510267b63d9a8647bb12e31d94539430 Mon Sep 17 00:00:00 2001
From: Samuel de Medeiros Queiroz <samueldmq@gmail.com>
Date: Wed, 6 Sep 2017 06:46:52 -0300
Subject: [PATCH] De-client-ify List Roles for User in v2.0

Change-Id: Ic652a38ba86594540ac4a4f5d944a8cd627d60f5
---
 shade/_tasks.py        |  5 -----
 shade/operatorcloud.py | 22 ++++++++++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/shade/_tasks.py b/shade/_tasks.py
index ec7e3b6e6..f85cf6de1 100644
--- a/shade/_tasks.py
+++ b/shade/_tasks.py
@@ -115,8 +115,3 @@ class EndpointList(task_manager.Task):
 class RoleAssignmentList(task_manager.Task):
     def main(self, client):
         return client.keystone_client.role_assignments.list(**self.args)
-
-
-class RolesForUser(task_manager.Task):
-    def main(self, client):
-        return client.keystone_client.roles.roles_for_user(**self.args)
diff --git a/shade/operatorcloud.py b/shade/operatorcloud.py
index 1bbd2ea87..1d363747e 100644
--- a/shade/operatorcloud.py
+++ b/shade/operatorcloud.py
@@ -13,6 +13,7 @@
 import datetime
 import iso8601
 import jsonpatch
+import munch
 
 from ironicclient import exceptions as ironic_exceptions
 
@@ -1426,10 +1427,13 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
 
     def _keystone_v2_role_assignments(self, user, project=None,
                                       role=None, **kwargs):
-        with _utils.shade_exceptions("Failed to list role assignments"):
-            roles = self.manager.submit_task(
-                _tasks.RolesForUser(user=user, tenant=project)
-            )
+        data = self._identity_client.get(
+            "/tenants/{tenant}/users/{user}/roles".format(
+                tenant=project, user=user),
+            error_message="Failed to list role assignments")
+
+        roles = self._get_and_munchify('roles', data)
+
         ret = []
         for tmprole in roles:
             if role is not None and role != tmprole.id:
@@ -1483,6 +1487,16 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
         if not filters:
             filters = {}
 
+        # NOTE(samueldmq): the docs above say filters are *IDs*, though if
+        # munch.Munch objects are passed, this still works for backwards
+        # compatibility as keystoneclient allows either IDs or objects to be
+        # passed in.
+        # TODO(samueldmq): fix the docs above to advertise munch.Munch objects
+        # can be provided as parameters too
+        for k, v in filters.items():
+            if isinstance(v, munch.Munch):
+                filters[k] = v['id']
+
         if self._is_client_version('identity', 2):
             if filters.get('project') is None or filters.get('user') is None:
                 raise OpenStackCloudException(