Merge "Add attaching state for Volumes"

1 files changed, 6 insertions, 0 deletions

diff --git a/nova/utils.py b/nova/utils.py
index dc8a660a62..ec62f87fc4 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -24,6 +24,7 @@ import datetime
 import functools
 import hashlib
 import inspect
+import itertools
 import json
 import lockfile
 import os
@@ -709,6 +710,11 @@ def to_primitive(value, convert_instances=False, level=0):
         if test(value):
             return unicode(value)
 
+    # value of itertools.count doesn't get caught by inspects
+    # above and results in infinite loop when list(value) is called.
+    if type(value) == itertools.count:
+        return unicode(value)
+
     # FIXME(vish): Workaround for LP bug 852095. Without this workaround,
     #              tests that raise an exception in a mocked method that
     #              has a @wrap_exception with a notifier will fail. If