Merge "Fix list resources when use limit and with-count"

1 files changed, 6 insertions, 0 deletions

diff --git a/cinderclient/base.py b/cinderclient/base.py
index f86a3a8..a99b29c 100644
--- a/cinderclient/base.py
+++ b/cinderclient/base.py
@@ -123,6 +123,12 @@ class Manager(common_base.HookableMixin):
                 # till there is no more items.
                 items = self._list(next, response_key, obj_class, None,
                                    limit, items)
+                # If we use '--with-count' to get the resource count,
+                # the _list function will return the tuple result with
+                # (resources, count).
+                # So here, we must check the items' type then to do return.
+                if isinstance(items, tuple):
+                    items = items[0]
         if "count" in body:
             return common_base.ListWithMeta(items, resp), body['count']
         else: