diff --git a/nova/compute/api.py b/nova/compute/api.py
index cfdeba3947..5333b35375 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -2433,7 +2433,12 @@ class API(base.Base):
                                        current_instance_type,
                                        new_instance_type)
 
-        self._record_action_start(context, instance, instance_actions.RESIZE)
+        if not flavor_id:
+            self._record_action_start(context, instance,
+                                      instance_actions.MIGRATE)
+        else:
+            self._record_action_start(context, instance,
+                                      instance_actions.RESIZE)
 
         scheduler_hint = {'filter_properties': filter_properties}
         self.compute_task_api.resize_instance(context, instance,
diff --git a/nova/compute/instance_actions.py b/nova/compute/instance_actions.py
index 92e4b369df..068a71718c 100644
--- a/nova/compute/instance_actions.py
+++ b/nova/compute/instance_actions.py
@@ -34,6 +34,7 @@ REBUILD = 'rebuild'
 REVERT_RESIZE = 'revertResize'
 CONFIRM_RESIZE = 'confirmResize'
 RESIZE = 'resize'
+MIGRATE = 'migrate'
 PAUSE = 'pause'
 UNPAUSE = 'unpause'
 SUSPEND = 'suspend'
diff --git a/nova/tests/compute/test_compute_api.py b/nova/tests/compute/test_compute_api.py
index 83cfcbb09e..b61c654b4b 100644
--- a/nova/tests/compute/test_compute_api.py
+++ b/nova/tests/compute/test_compute_api.py
@@ -1062,8 +1062,12 @@ class _ComputeAPIUnitTestMixIn(object):
                 self.context.elevated().AndReturn(self.context)
                 mig.create(self.context).WithSideEffects(_check_mig)
 
-            self.compute_api._record_action_start(self.context, fake_inst,
-                                                  'resize')
+            if flavor_id_passed:
+                self.compute_api._record_action_start(self.context, fake_inst,
+                                                      'resize')
+            else:
+                self.compute_api._record_action_start(self.context, fake_inst,
+                                                      'migrate')
 
             scheduler_hint = {'filter_properties': filter_properties}