diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-06 18:59:18 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-06 18:59:18 +0000 |
| commit | 9eca4d51f55b078942c9886fd5b785d6f045c6d2 (patch) | |
| tree | 632c64a71096e37287ee4aee1c5eed5da2188206 /nova/api | |
| parent | 275d06792fd5de40b82ef461e3d565c3d0ed3700 (diff) | |
| parent | 6c01a842493079fdff9d5887562aec1a6fe8033b (diff) | |
Fixes format_instances error by passing reservation_id as a kwarg instead of an arg. Also removes extraneous yields in test_cloud that were causing tests to pass with broken code.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 0c0027287..6619b5452 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -592,7 +592,7 @@ class CloudController(object): return {'reservationSet': self._format_instances(context)} def _format_run_instances(self, context, reservation_id): - i = self._format_instances(context, reservation_id) + i = self._format_instances(context, reservation_id=reservation_id) assert len(i) == 1 return i[0] |