diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-26 22:29:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-26 22:29:25 +0000 |
| commit | ba7083030c22bb4fcdc323a2c12bcdf764fa375e (patch) | |
| tree | ed9cb0275c0c1ce6798be6555002814c49a24f5c | |
| parent | 02facfb9d482ea541eb6f180ca0e17160b9ecc6d (diff) | |
| parent | 2d0a78f413d8a6cddef86f348affd9e2a1580ad6 (diff) | |
| download | nova-ba7083030c22bb4fcdc323a2c12bcdf764fa375e.tar.gz nova-ba7083030c22bb4fcdc323a2c12bcdf764fa375e.tar.xz nova-ba7083030c22bb4fcdc323a2c12bcdf764fa375e.zip | |
Merge "Remove unnecessary check if migration_ref is not None"
| -rw-r--r-- | nova/compute/api.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 531aa4414..e08fb8fc0 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1439,9 +1439,6 @@ class API(base.Base): context = context.elevated() migration_ref = self.db.migration_get_by_instance_and_status(context, instance['uuid'], 'finished') - if not migration_ref: - raise exception.MigrationNotFoundByStatus( - instance_id=instance['uuid'], status='finished') # reverse quota reservation for increased resource usage deltas = self._reverse_upsize_quota_delta(context, migration_ref) @@ -1466,9 +1463,6 @@ class API(base.Base): context = context.elevated() migration_ref = self.db.migration_get_by_instance_and_status(context, instance['uuid'], 'finished') - if not migration_ref: - raise exception.MigrationNotFoundByStatus( - instance_id=instance['uuid'], status='finished') # reserve quota only for any decrease in resource usage deltas = self._downsize_quota_delta(context, migration_ref) |