Remove unnecessary references to resize_confirm_window flag

The value of the resize_confirm_window flag is passed into the
poll_unconfirmed_resizes() method so there is no need to reference
FLAGS.resize_confirm_window directly for logging.

Change-Id: Ia9729cda4bf4408c2f5fce19709e9bdb474ad721

3 files changed, 9 insertions, 12 deletions

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index e513ca0fb..56554c615 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -920,7 +920,7 @@ class XenAPIMigrateInstance(test.TestCase):
         db.migration_get_all_unconfirmed(fake_context,
                 resize_confirm_window).AndReturn(migrations)
         # Found unconfirmed migrations message
-        vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg())
+        vmops.LOG.info(mox.IgnoreArg())
 
         # test success (ACTIVE/RESIZE_VERIFY)
         instance = instances.pop(0)
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index ef95b12ce..f47651705 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -869,12 +869,11 @@ class LibvirtConnection(driver.ComputeDriver):
         migrations = db.migration_get_all_unconfirmed(ctxt,
             resize_confirm_window)
 
-        migrations_info = dict(migration_count=len(migrations),
-                confirm_window=FLAGS.resize_confirm_window)
-
-        if migrations_info["migration_count"] > 0:
+        if migrations:
             LOG.info(_("Found %(migration_count)d unconfirmed migrations "
-                    "older than %(confirm_window)d seconds") % migrations_info)
+                    "older than %(confirm_window)d seconds") %
+                     {'migration_count': len(migrations),
+                      'confirm_window': resize_confirm_window})
 
         for migration in migrations:
             LOG.info(_("Automatically confirming migration %d"), migration.id)
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index de9095c5f..2cbdeea0b 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1315,13 +1315,11 @@ class VMOps(object):
         migrations = db.migration_get_all_unconfirmed(ctxt,
             resize_confirm_window)
 
-        migrations_info = dict(migration_count=len(migrations),
-                confirm_window=resize_confirm_window)
-
-        if migrations_info["migration_count"] > 0:
+        if migrations:
             LOG.info(_("Found %(migration_count)d unconfirmed migrations "
-                       "older than %(confirm_window)d seconds"),
-                     migrations_info)
+                    "older than %(confirm_window)d seconds") %
+                     {'migration_count': len(migrations),
+                      'confirm_window': resize_confirm_window})
 
         def _set_migration_to_error(migration_id, reason, **kwargs):
             msg = _("Setting migration %(migration_id)s to error: "