openstack
/
nova
Code Issues Proposed changes

Merge "Remove MigrationPreCheckClientException"

This commit is contained in:
Zuul 2018-03-06 23:40:04 +00:00 committed by Gerrit Code Review
parent 52c705cd7b 13f4127c9d
commit 1f2e702ca6
4 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conductor/manager.py
View File

@ -253,7 +253,6 @@ class ComputeTaskManager(base.Base):
exception.HypervisorUnavailable,
exception.InstanceInvalidState,
exception.MigrationPreCheckError,
exception.MigrationPreCheckClientException,
exception.LiveMigrationWithOldNovaNotSupported,
exception.UnsupportedPolicyException)
@targets_cell
@ -431,7 +430,6 @@ class ComputeTaskManager(base.Base):
exception.HypervisorUnavailable,
exception.InstanceInvalidState,
exception.MigrationPreCheckError,
exception.MigrationPreCheckClientException,
exception.LiveMigrationWithOldNovaNotSupported,
exception.MigrationSchedulerRPCError) as ex:
with excutils.save_and_reraise_exception():

4
nova/exception.py
View File

@ -1329,10 +1329,6 @@ class MigrationPreCheckError(MigrationError):
msg_fmt = _("Migration pre-check error: %(reason)s")
class MigrationPreCheckClientException(MigrationError):
msg_fmt = _("Client exception during Migration Pre check: %(reason)s")
class MigrationSchedulerRPCError(MigrationError):
msg_fmt = _("Migration select destinations error: %(reason)s")

6
nova/tests/unit/api/openstack/compute/test_migrate_server.py
View File

@ -279,12 +279,6 @@ class MigrateServerTestsV21(admin_only_action_common.CommonTests):
self._test_migrate_live_failed_with_exception(
exception.MigrationPreCheckError(reason=''))
def test_migrate_live_migration_precheck_client_exception(self):
self._test_migrate_live_failed_with_exception(
exception.MigrationPreCheckClientException(reason=''),
expected_exc=webob.exc.HTTPInternalServerError,
check_response=False)
def test_migrate_live_migration_with_unexpected_error(self):
self._test_migrate_live_failed_with_exception(
exception.MigrationError(reason=''),

1
nova/tests/unit/conductor/test_conductor.py
View File

@ -2130,7 +2130,6 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
exc.HypervisorUnavailable(host='dummy'),
exc.LiveMigrationWithOldNovaNotSupported(),
exc.MigrationPreCheckError(reason='dummy'),
exc.MigrationPreCheckClientException(reason='dummy'),
exc.InvalidSharedStorage(path='dummy', reason='dummy'),
exc.NoValidHost(reason='dummy'),
exc.ComputeServiceUnavailable(host='dummy'),