Merge "migrate server doesn't raise correct exception"

nova/api/openstack/compute/contrib/admin_actions.py

@@ -132,6 +132,8 @@ class AdminActionsController(wsgi.Controller):
         except exception.InstanceInvalidState as state_error:
             common.raise_http_conflict_for_instance_invalid_state(state_error,
                     'migrate')
+        except exception.InstanceNotFound as e:
+            raise exc.HTTPNotFound(explanation=e.format_message())
         except Exception as e:
             LOG.exception(_("Error in migrate %s"), e)
             raise exc.HTTPBadRequest()
@@ -301,6 +303,8 @@ class AdminActionsController(wsgi.Controller):
                 exception.UnableToMigrateToSelf,
                 exception.DestinationHypervisorTooOld) as ex:
             raise exc.HTTPBadRequest(explanation=ex.format_message())
+        except exception.InstanceNotFound as e:
+            raise exc.HTTPNotFound(explanation=e.format_message())
         except Exception:
             if host is None:
                 msg = _("Live migration of instance %s to another host "

nova/tests/api/openstack/compute/contrib/test_admin_actions.py

@@ -169,8 +169,12 @@ class AdminActionsTest(CommonMixin, test.NoDBTestCase):
     def test_actions_with_non_existed_instance(self):
         actions = ['pause', 'unpause', 'suspend', 'resume',
                    'resetNetwork', 'injectNetworkInfo', 'lock',
-                   'unlock', 'os-resetState']
-        body_map = {'os-resetState': {'state': 'active'}}
+                   'unlock', 'os-resetState', 'migrate']
+        body_map = {'os-resetState': {'state': 'active'},
+                    'os-migrateLive':
+                                  {'host': 'hostname',
+                                   'block_migration': False,
+                                   'disk_over_commit': False}}
         for action in actions:
             self._test_non_existing_instance(action,
                                              body_map=body_map)