Merge "Make NovaObject support the 'in' operator"

2 files changed, 14 insertions, 0 deletions

diff --git a/nova/objects/base.py b/nova/objects/base.py
index 6f2b6c81f..147d55c23 100644
--- a/nova/objects/base.py
+++ b/nova/objects/base.py
@@ -353,6 +353,13 @@ class NovaObject(object):
         """
         setattr(self, name, value)
 
+    def __contains__(self, name):
+        """For backwards-compatibility with dict-based objects.
+
+        NOTE(danms): May be removed in the future.
+        """
+        return hasattr(self, get_attrname(name))
+
     def get(self, key, value=None):
         """For backwards-compatibility with dict-based objects.
 
diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py
index 00aaf1781..40ad8bb81 100644
--- a/nova/tests/objects/test_objects.py
+++ b/nova/tests/objects/test_objects.py
@@ -441,6 +441,13 @@ class _TestObject(object):
                     }
         self.assertEqual(obj.obj_to_primitive(), expected)
 
+    def test_contains(self):
+        obj = MyObj()
+        self.assertFalse('foo' in obj)
+        obj.foo = 1
+        self.assertTrue('foo' in obj)
+        self.assertFalse('does_not_exist' in obj)
+
 
 class TestObject(_LocalTest, _TestObject):
     pass