From 76aab6d65fa35ae88f9b16acd4ee2968dfe049ce Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Wed, 20 Jul 2011 16:56:45 -0500
Subject: CHanges based on feedback

---
 nova/compute/manager.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index eb3996d29..01a7d195f 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -820,20 +820,24 @@ class ComputeManager(manager.SchedulerDependentManager):
                 migration_ref['instance_id'])
         # TODO(mdietz): apply the rest of the instance_type attributes going
         # after they're supported
-        instance_type = self.db.instance_type_get_by_flavor_id(context,
-                migration_ref['new_flavor_id'])
-        self.db.instance_update(context, instance_id,
-               dict(instance_type_id=instance_type['id'],
-                    memory_mb=instance_type['memory_mb'],
-                    vcpus=instance_type['vcpus'],
-                    local_gb=instance_type['local_gb']))
+        resize_instance = False
+        if migration_ref['old_flavor_id'] != migration_ref['new_flavor_id']:
+            instance_type = self.db.instance_type_get_by_flavor_id(context,
+                    migration_ref['new_flavor_id'])
+            self.db.instance_update(context, instance_id,
+                   dict(instance_type_id=instance_type['id'],
+                        memory_mb=instance_type['memory_mb'],
+                        vcpus=instance_type['vcpus'],
+                        local_gb=instance_type['local_gb']))
+            resize_instance = True
 
         # reload the updated instance ref
         # FIXME(mdietz): is there reload functionality?
         instance = self.db.instance_get(context, instance_id)
         network_info = self.network_api.get_instance_nw_info(context,
                                                              instance)
-        self.driver.finish_resize(instance, disk_info, network_info)
+        self.driver.finish_resize(instance, disk_info, network_info,
+                                  resize_instance)
 
         self.db.migration_update(context, migration_id,
                 {'status': 'finished', })
-- 
cgit 


From 806be42000cf54e5b2ff9fb03446e8e6924bd38b Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Thu, 21 Jul 2011 12:46:58 -0500
Subject: Renamed the virt driver resize methods to migration for marginally
 more understandable code

---
 nova/compute/manager.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 01a7d195f..78d7f6479 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -723,7 +723,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 local_gb=instance_type['local_gb'],
                 instance_type_id=instance_type['id']))
 
-        self.driver.revert_resize(instance_ref)
+        self.driver.revert_migration(instance_ref)
         self.db.migration_update(context, migration_id,
                 {'status': 'reverted'})
         usage_info = utils.usage_from_instance(instance_ref)
@@ -836,7 +836,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         instance = self.db.instance_get(context, instance_id)
         network_info = self.network_api.get_instance_nw_info(context,
                                                              instance)
-        self.driver.finish_resize(instance, disk_info, network_info,
+        self.driver.finish_migration(instance, disk_info, network_info,
                                   resize_instance)
 
         self.db.migration_update(context, migration_id,
-- 
cgit