diff options
| author | Hans Lindgren <hanlind@kth.se> | 2013-04-17 16:05:06 +0200 |
|---|---|---|
| committer | Hans Lindgren <hanlind@kth.se> | 2013-04-18 12:47:26 +0200 |
| commit | 89dae76870ed1b01cbcfd901d3a8737d41e8c8fc (patch) | |
| tree | 29ca41c21bc469160aba3cb40be1f4eb61b7de9d /nova/tests | |
| parent | 36b10384724fec9657784980cd2bd38e72b445bc (diff) | |
Remove unnecessary full resource audits at the end of resizes
Both confirm_resize and revert_resize ends with full resource audits
which is unnecessary, given that correct calculations can be made
using existing claims.
Resolves bug 1169982.
Change-Id: If0f91651605a95e73fdbf88aa18c279bfaf73b04
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_claims.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_resource_tracker.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py index e00b4bb24..66c04ced8 100644 --- a/nova/tests/compute/test_claims.py +++ b/nova/tests/compute/test_claims.py @@ -30,7 +30,7 @@ class DummyTracker(object): def abort_instance_claim(self, *args, **kwargs): self.icalled = True - def abort_resize_claim(self, *args, **kwargs): + def drop_resize_claim(self, *args, **kwargs): self.rcalled = True diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index af9b7b8bb..6d26174c7 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -770,9 +770,7 @@ class ResizeClaimTestCase(BaseTrackerTestCase): def test_revert(self): self.tracker.resize_claim(self.context, self.instance, self.instance_type, self.limits) - migration, itype = self.tracker.tracked_migrations[ - self.instance['uuid']] - self.tracker.revert_resize(self.context, migration) + self.tracker.drop_resize_claim(self.instance) self.assertEqual(0, len(self.tracker.tracked_instances)) self.assertEqual(0, len(self.tracker.tracked_migrations)) |