← Back to branch summary

~mdragon/nova/multi-tenant-accounting

« back to all changes in this revision

Viewing changes to nova/tests/test_scheduler.py

  • Committer: Monsyne Dragon
  • Date: 2011-03-11 19:49:32 UTC
  • mfrom: (752.2.34 nova)
  • Revision ID: mdragon@rackspace.com-20110311194932-iqst41u5jymlu66j
remerge trunk (again). fix issues caused by changes to deserialization calls on controllers. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_scheduler.py
155
155
    def _create_instance(self, **kwargs):
156
156
        """Create a test instance"""
157
157
        inst = {}
158
 
        inst['image_id'] = 'ami-test'
 
158
        inst['image_id'] = 1
159
159
        inst['reservation_id'] = 'r-fakeres'
160
160
        inst['user_id'] = self.user.id
161
161
        inst['project_id'] = self.project.id
169
169
    def _create_volume(self):
170
170
        """Create a test volume"""
171
171
        vol = {}
172
 
        vol['image_id'] = 'ami-test'
173
 
        vol['reservation_id'] = 'r-fakeres'
174
172
        vol['size'] = 1
175
173
        vol['availability_zone'] = 'test'
176
174
        return db.volume_create(self.context, vol)['id']