diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-05 21:16:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-05 21:16:40 +0000 |
| commit | e3ecd38debf3258660e703b065db0799cbbafcfb (patch) | |
| tree | c2a8bad8ebf39420f51bc738bb6a1150e6cc67c5 /nova/compute | |
| parent | b3c9a019dca8fc54116999939915298b30c3fbb9 (diff) | |
| parent | c25f7e7e832472ea2b5801d041cbf126333b1aaa (diff) | |
Merge "Implement resize down for XenAPI"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/manager.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index c7cf2a1e9..787817e31 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1275,8 +1275,6 @@ class API(base.Base): current_memory_mb = current_instance_type['memory_mb'] new_memory_mb = new_instance_type['memory_mb'] - if current_memory_mb > new_memory_mb: - raise exception.CannotResizeToSmallerSize() if (current_memory_mb == new_memory_mb) and flavor_id: raise exception.CannotResizeToSameSize() diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9bacae271..311d17c6a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1069,6 +1069,8 @@ class ComputeManager(manager.SchedulerDependentManager): migration_ref = self.db.migration_get(context, migration_id) instance_ref = self.db.instance_get_by_uuid(context, migration_ref.instance_uuid) + instance_type_ref = self.db.instance_type_get(context, + migration_ref.new_instance_type_id) self.db.migration_update(context, migration_id, @@ -1076,7 +1078,8 @@ class ComputeManager(manager.SchedulerDependentManager): try: disk_info = self.driver.migrate_disk_and_power_off( - context, instance_ref, migration_ref['dest_host']) + context, instance_ref, migration_ref['dest_host'], + instance_type_ref) except exception.MigrationError, error: LOG.error(_('%s. Setting instance vm_state to ERROR') % (error,)) self._instance_update(context, |