x/python-ganttclient
Code Issues Proposed changes

Merge "Add ability to see deleted and active records."

Browse Source
This commit is contained in:
Jenkins
2011-12-08 23:01:27 +00:00
committed by Gerrit Code Review
parent ad86c4f904 5cb9ef5303
commit c74b35cbfe
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-manage
View File

@@ -1379,7 +1379,7 @@ class VsaCommands(object):
raise raise
is_admin = self.manager.is_admin(user_id) is_admin = self.manager.is_admin(user_id)
ctxt = context.RequestContext(user_id, project_id, is_admin) ctxt = context.RequestContext(user_id, project_id, is_admin=is_admin)
if not is_admin and \ if not is_admin and \
not self.manager.is_project_member(user_id, project_id): not self.manager.is_project_member(user_id, project_id):
msg = _("%(user_id)s must be an admin or a " msg = _("%(user_id)s must be an admin or a "

2
nova/tests/test_adminapi.py
View File

@@ -52,7 +52,7 @@ class AdminApiTestCase(test.TestCase):
self.project_id = 'admin' self.project_id = 'admin'
self.context = context.RequestContext(self.user_id, self.context = context.RequestContext(self.user_id,
self.project_id, self.project_id,
True) is_admin=True)
def fake_show(meh, context, id): def fake_show(meh, context, id):
return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1, return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1,

9
nova/tests/test_compute.py
View File

@@ -222,7 +222,7 @@ class ComputeTestCase(BaseTestCase):
self.assertEqual(instance['deleted_at'], None) self.assertEqual(instance['deleted_at'], None)
terminate = utils.utcnow() terminate = utils.utcnow()
self.compute.terminate_instance(self.context, instance['uuid']) 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']) instance = db.instance_get_by_uuid(context, instance['uuid'])
self.assert_(instance['launched_at'] < terminate) self.assert_(instance['launched_at'] < terminate)
self.assert_(instance['deleted_at'] > terminate) self.assert_(instance['deleted_at'] > terminate)
@@ -674,7 +674,7 @@ class ComputeTestCase(BaseTestCase):
instance_uuid = instance['uuid'] instance_uuid = instance['uuid']
self.compute.run_instance(self.context, 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 # decorator should return False (fail) with locked nonadmin context
self.compute.lock_instance(self.context, instance_uuid) self.compute.lock_instance(self.context, instance_uuid)
@@ -1231,8 +1231,9 @@ class ComputeAPITestCase(BaseTestCase):
try: try:
db.security_group_destroy(self.context, group['id']) db.security_group_destroy(self.context, group['id'])
group = db.security_group_get(context.get_admin_context( admin_deleted_context = context.get_admin_context(
read_deleted=True), group['id']) read_deleted="only")
group = db.security_group_get(admin_deleted_context, group['id'])
self.assert_(len(group.instances) == 0) self.assert_(len(group.instances) == 0)
finally: finally:
db.instance_destroy(self.context, ref[0]['id']) db.instance_destroy(self.context, ref[0]['id'])

2
nova/tests/test_vmwareapi.py
View File

@@ -40,7 +40,7 @@ class VMWareAPIVMTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(VMWareAPIVMTestCase, self).setUp() 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', self.flags(vmwareapi_host_ip='test_url',
vmwareapi_host_username='test_username', vmwareapi_host_username='test_username',
vmwareapi_host_password='test_pass') vmwareapi_host_password='test_pass')