From 01836132f56dbcbdec31e89dad6408ccb27cf025 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Tue, 17 Apr 2018 14:26:52 +0100 Subject: [PATCH] Remove redundant _do_check_can_live_migrate_destination This was added in change I8c2f1a67 with the note: === We'll want to add claims around the logic of this method, so it's better if there is a nested method that does the business logic to avoid deep nesting that makes the code less readable. === AFAICT this logic was never added, and the indirection has always been redundant. Change-Id: Ie01f2c056a85e08a46c2461f1952cfdbaac3a547 --- nova/compute/manager.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9c120563c34f..b8970e45d281 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -5864,13 +5864,6 @@ class ComputeManager(manager.Manager): if None, ignore disk usage checking :returns: a dict containing migration info """ - return self._do_check_can_live_migrate_destination(ctxt, instance, - block_migration, - disk_over_commit) - - def _do_check_can_live_migrate_destination(self, ctxt, instance, - block_migration, - disk_over_commit): src_compute_info = obj_base.obj_to_primitive( self._get_compute_info(ctxt, instance.host)) dst_compute_info = obj_base.obj_to_primitive(