diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-13 10:38:40 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-13 10:38:40 -0600 |
| commit | 441a6d363116535147d32e778f08a3c2648360e7 (patch) | |
| tree | a9a22a9e814966a71688bde7d756cb298adbe073 /nova/api | |
| parent | 0002d9ea9690cc82f7fac05881c30bfd9581702b (diff) | |
| parent | a60a9fcab59e5486e166d51d47c84d6b4a9ede26 (diff) | |
| download | nova-441a6d363116535147d32e778f08a3c2648360e7.tar.gz nova-441a6d363116535147d32e778f08a3c2648360e7.tar.xz nova-441a6d363116535147d32e778f08a3c2648360e7.zip | |
Added unit tests for the Diffie-Hellman class. Merged recent trunk changes
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 832426b94..5c25aa076 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -590,7 +590,7 @@ class CloudController(object): # TODO(vish): Instance should be None at db layer instead of # trying to lazy load, but for now we turn it into # a dict to avoid an error. - return {'volumeSet': [self._format_volume(context, dict(volume_ref))]} + return {'volumeSet': [self._format_volume(context, dict(volume))]} def delete_volume(self, context, volume_id, **kwargs): self.volume_api.delete(context, volume_id) |