Finished instance context auth

This commit is contained in:
Devin Carlen
2010-09-29 20:29:55 -07:00
parent f8692f29af
commit be64b77c3c
2 changed files with 5 additions and 1 deletions

View File

@@ -96,6 +96,8 @@ class ComputeTestCase(test.TrialTestCase):
self.assertEqual(instance_ref['deleted_at'], None)
terminate = datetime.datetime.utcnow()
yield self.compute.terminate_instance(self.context, instance_id)
# TODO(devcamcar): Pass deleted in using system context.
# context.read_deleted ?
instance_ref = db.instance_get({'deleted': True}, instance_id)
self.assert_(instance_ref['launched_at'] < terminate)
self.assert_(instance_ref['deleted_at'] > terminate)

View File

@@ -56,7 +56,9 @@ class NetworkTestCase(test.TrialTestCase):
'netuser',
name))
# create the necessary network data for the project
self.network.set_network_host(self.context, self.projects[i].id)
user_context = context.APIRequestContext(project=self.projects[i],
user=self.user)
self.network.set_network_host(user_context, self.projects[i].id)
instance_ref = db.instance_create(None,
{'mac_address': utils.generate_mac()})
self.instance_id = instance_ref['id']