diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-12 23:15:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-12 23:15:13 +0000 |
| commit | 0b1eee6bb39243ef117f65b0eaf3d6f14b0aa3d7 (patch) | |
| tree | 41b1f7735040e59425cf6ed60828a66916c4e596 /nova/compute | |
| parent | 1d8af7541495f460d573dbb245aed8750c4bcbb2 (diff) | |
| parent | 843af52d49554f15c13e5617b9eb672c35c7fe51 (diff) | |
Merge "Check flavor id on resize."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index a9ab17a13..a85e01d46 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1580,11 +1580,8 @@ class API(base.Base): # NOTE(markwash): look up the image early to avoid auth problems later image = self.image_service.show(context, instance['image_ref']) - current_memory_mb = current_instance_type['memory_mb'] - new_memory_mb = new_instance_type['memory_mb'] - - if (current_memory_mb == new_memory_mb) and flavor_id: - raise exception.CannotResizeToSameSize() + if same_instance_type and flavor_id: + raise exception.CannotResizeToSameFlavor() # ensure there is sufficient headroom for upsizes deltas = self._upsize_quota_delta(context, new_instance_type, |