~danwent/nova/trunk

« back to all changes in this revision

Viewing changes to nova/tests/test_db_api.py

  • Committer: Tarmac
  • Author(s): John Tran
  • Date: 2011-08-18 21:57:52 UTC
  • mfrom: (1434.3.4 lp824008)
  • Revision ID: tarmac-20110818215752-3kvh19q8zey9r9j7
Fixed bug in which DescribeInstances was returning deleted instances.  Added tests for pertinent api methods.

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
        self.assertEqual(instance['id'], result['id'])
77
77
        self.assertEqual(result['fixed_ips'][0]['floating_ips'][0].address,
78
78
                         '1.2.1.2')
 
79
 
 
80
    def test_instance_get_all_by_filters(self):
 
81
        args = {'reservation_id': 'a', 'image_ref': 1, 'host': 'host1'}
 
82
        inst1 = db.instance_create(self.context, args)
 
83
        inst2 = db.instance_create(self.context, args)
 
84
        result = db.instance_get_all_by_filters(self.context, {})
 
85
        self.assertTrue(2, len(result))
 
86
 
 
87
    def test_instance_get_all_by_filters_deleted(self):
 
88
        args1 = {'reservation_id': 'a', 'image_ref': 1, 'host': 'host1'}
 
89
        inst1 = db.instance_create(self.context, args1)
 
90
        args2 = {'reservation_id': 'b', 'image_ref': 1, 'host': 'host1'}
 
91
        inst2 = db.instance_create(self.context, args2)
 
92
        db.instance_destroy(self.context, inst1.id)
 
93
        result = db.instance_get_all_by_filters(self.context.elevated(), {})
 
94
        self.assertEqual(1, len(result))
 
95
        self.assertEqual(result[0].id, inst2.id)