Add ability to see deleted and active records.

Fixes bug #900564

Changes `Context`.`read_deleted` from a bool to an enum string with values
"yes" (can read deleted records), "no" (cannot read deleted records), and
"only" (can only see deleted records, for backwards compatibility).

Change-Id: Ic81db3664c33f23f751b73973782efb06fce90d9

6 files changed, 14 insertions, 13 deletions

diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index caa6ff68d..78e7f96fe 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -106,7 +106,7 @@ class CloudTestCase(test.TestCase):
         self.project_id = 'fake'
         self.context = context.RequestContext(self.user_id,
                                               self.project_id,
-                                              True)
+                                              is_admin=True)
 
         def fake_show(meh, context, id):
             return {'id': id,
@@ -1564,12 +1564,12 @@ class CloudTestCase(test.TestCase):
 
         self.cloud.terminate_instances(self.context, [ec2_instance_id])
 
-        admin_ctxt = context.get_admin_context(read_deleted=False)
+        admin_ctxt = context.get_admin_context(read_deleted="no")
         vol = db.volume_get(admin_ctxt, vol1['id'])
         self.assertFalse(vol['deleted'])
         db.volume_destroy(self.context, vol1['id'])
 
-        admin_ctxt = context.get_admin_context(read_deleted=True)
+        admin_ctxt = context.get_admin_context(read_deleted="only")
         vol = db.volume_get(admin_ctxt, vol2['id'])
         self.assertTrue(vol['deleted'])
 
@@ -1689,13 +1689,13 @@ class CloudTestCase(test.TestCase):
 
         self.cloud.terminate_instances(self.context, [ec2_instance_id])
 
-        admin_ctxt = context.get_admin_context(read_deleted=False)
+        admin_ctxt = context.get_admin_context(read_deleted="no")
         vol = db.volume_get(admin_ctxt, vol1_id)
         self._assert_volume_detached(vol)
         self.assertFalse(vol['deleted'])
         db.volume_destroy(self.context, vol1_id)
 
-        admin_ctxt = context.get_admin_context(read_deleted=True)
+        admin_ctxt = context.get_admin_context(read_deleted="only")
         vol = db.volume_get(admin_ctxt, vol2_id)
         self.assertTrue(vol['deleted'])
 
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index 9938b5dd9..32ff67f1d 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -312,7 +312,7 @@ class SimpleDriverTestCase(test.TestCase):
                                    FLAGS.compute_manager)
         compute1.start()
         _create_instance()
-        ctxt = context.RequestContext('fake', 'fake', False)
+        ctxt = context.RequestContext('fake', 'fake', is_admin=False)
         global instance_uuids
         instance_uuids = []
         self.stubs.Set(SimpleScheduler,
diff --git a/nova/tests/test_adminapi.py b/nova/tests/test_adminapi.py
index 08c8f707a..41dbc3e92 100644
--- a/nova/tests/test_adminapi.py
+++ b/nova/tests/test_adminapi.py
@@ -52,7 +52,7 @@ class AdminApiTestCase(test.TestCase):
         self.project_id = 'admin'
         self.context = context.RequestContext(self.user_id,
                                               self.project_id,
-                                              True)
+                                              is_admin=True)
 
         def fake_show(meh, context, id):
             return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1,
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 6ad3565ef..1bf88b8e4 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -222,7 +222,7 @@ class ComputeTestCase(BaseTestCase):
         self.assertEqual(instance['deleted_at'], None)
         terminate = utils.utcnow()
         self.compute.terminate_instance(self.context, instance['uuid'])
-        context = self.context.elevated(True)
+        context = self.context.elevated(read_deleted="only")
         instance = db.instance_get_by_uuid(context, instance['uuid'])
         self.assert_(instance['launched_at'] < terminate)
         self.assert_(instance['deleted_at'] > terminate)
@@ -674,7 +674,7 @@ class ComputeTestCase(BaseTestCase):
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
 
-        non_admin_context = context.RequestContext(None, None, False, False)
+        non_admin_context = context.RequestContext(None, None, is_admin=False)
 
         # decorator should return False (fail) with locked nonadmin context
         self.compute.lock_instance(self.context, instance_uuid)
@@ -1230,8 +1230,9 @@ class ComputeAPITestCase(BaseTestCase):
 
         try:
             db.security_group_destroy(self.context, group['id'])
-            group = db.security_group_get(context.get_admin_context(
-                                          read_deleted=True), group['id'])
+            admin_deleted_context = context.get_admin_context(
+                    read_deleted="only")
+            group = db.security_group_get(admin_deleted_context, group['id'])
             self.assert_(len(group.instances) == 0)
         finally:
             db.instance_destroy(self.context, ref[0]['id'])
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 449f37572..83c9e36df 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -53,7 +53,7 @@ class QuotaTestCase(test.TestCase):
         self.project_id = 'admin'
         self.context = context.RequestContext(self.user_id,
                                               self.project_id,
-                                              True)
+                                              is_admin=True)
         orig_rpc_call = rpc.call
 
         def rpc_call_wrapper(context, topic, msg):
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index 9dacda4b3..b1b297107 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -40,7 +40,7 @@ class VMWareAPIVMTestCase(test.TestCase):
 
     def setUp(self):
         super(VMWareAPIVMTestCase, self).setUp()
-        self.context = context.RequestContext('fake', 'fake', False)
+        self.context = context.RequestContext('fake', 'fake', is_admin=False)
         self.flags(vmwareapi_host_ip='test_url',
                    vmwareapi_host_username='test_username',
                    vmwareapi_host_password='test_pass')