diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-04-05 21:26:10 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-04-06 15:07:43 +0000 |
| commit | 2fde2294d8fcf536acf640f5840c4e551b9dd433 (patch) | |
| tree | 98100d42a79a5799c711fb08cc7f20045e05d780 /nova/tests | |
| parent | 7a51a3f9626fe1135a85c77cb9d2a3a119783474 (diff) | |
Cleanup xenapi driver logging messages to include instance
Also, use the logging instance kwarg so it gets logged in a consistent
format.
Change-Id: I4429e9660ff72e1f79d889f89b5abbf1949720de
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_xenapi.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index b15daa7e6..9539c5cbe 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -895,11 +895,11 @@ 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()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) # test success (ACTIVE/RESIZE_VERIFY) instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) conn._vmops.compute_api.confirm_resize(fake_context, @@ -908,7 +908,7 @@ class XenAPIMigrateInstance(test.TestCase): # test instance that doesn't exist anymore sets migration to # error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndRaise(exception.InstanceNotFound) vmops.LOG.warn(mox.IgnoreArg()) @@ -916,32 +916,32 @@ class XenAPIMigrateInstance(test.TestCase): # test instance in ERROR/RESIZE_VERIFY sets migration to error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) - vmops.LOG.warn(mox.IgnoreArg()) + vmops.LOG.warn(mox.IgnoreArg(), instance=instance) db.migration_update(fake_context, 3, {'status': 'error'}) # test instance in ACTIVE/REBOOTING sets migration to error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) - vmops.LOG.warn(mox.IgnoreArg()) + vmops.LOG.warn(mox.IgnoreArg(), instance=instance) db.migration_update(fake_context, 4, {'status': 'error'}) # test confirm_resize raises and doesn't set migration to error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) conn._vmops.compute_api.confirm_resize(fake_context, instance).AndRaise(test.TestingException) - vmops.LOG.error(mox.IgnoreArg()) + vmops.LOG.error(mox.IgnoreArg(), instance=instance) # test succeeds again (ACTIVE/RESIZE_VERIFY) instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) conn._vmops.compute_api.confirm_resize(fake_context, |