Merge "Accept is_public=None when listing all flavors"

3 files changed, 13 insertions, 1 deletions

diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py
index 4da130e9b..c6303646a 100644
--- a/nova/api/openstack/compute/flavors.py
+++ b/nova/api/openstack/compute/flavors.py
@@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
 from nova.openstack.common import strutils
+from nova import utils
 
 
 def make_flavor(elem, detailed=False):
@@ -98,7 +99,7 @@ class Controller(wsgi.Controller):
         if is_public is None:
             # preserve default value of showing only public flavors
             return True
-        elif is_public == 'none':
+        elif utils.is_none_string(is_public):
             return None
         else:
             try:
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index 77e637044..3741fcd33 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -792,6 +792,7 @@ class ParseIsPublicTest(test.TestCase):
 
     def test_string_none(self):
         self.assertPublic(None, 'none')
+        self.assertPublic(None, 'None')
 
     def test_other(self):
         self.assertRaises(
diff --git a/nova/utils.py b/nova/utils.py
index 5e968bd35..9922804c0 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1050,3 +1050,13 @@ def spawn_n(func, *args, **kwargs):
     interfering with the service spawns.
     """
     eventlet.spawn_n(func, *args, **kwargs)
+
+
+def is_none_string(val):
+    """
+    Check if a string represents a None value.
+    """
+    if not isinstance(val, basestring):
+        return False
+
+    return val.lower() == 'none'