Unit tests fail with "KeyError: 'uuid'"

[Gary Kotton]

Traceback (most recent call last):
  File "/home/skort/nova/nova/tests/network/test_manager.py", line 1070, in test_add_fixed_ip_instance_without_vpn_requested_networks
    networks[0]['id'])
  File "/home/skort/nova/nova/network/manager.py", line 763, in add_fixed_ip_to_instance
    self._allocate_fixed_ips(context, instance_id, host, [network])
  File "/home/skort/nova/nova/network/manager.py", line 220, in _allocate_fixed_ips
    vpn=vpn, address=address)
  File "/home/skort/nova/nova/network/manager.py", line 1730, in allocate_fixed_ip
    if self._validate_instance_zone_for_dns_domain(context, instance):
  File "/home/skort/nova/nova/network/manager.py", line 799, in _validate_instance_zone_for_dns_domain
    instance_domain, instance=instance)
  File "/usr/lib/python2.7/logging/__init__.py", line 1427, in warning
    msg, kwargs = self.process(msg, kwargs)
  File "/home/skort/nova/nova/openstack/common/log.py", line 266, in process
    instance_extra = CONF.instance_format % instance
KeyError: 'uuid'

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/38592

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/38592
Committed: http://github.com/openstack/nova/commit/c4ee4203555a793c95c6f9f36e488c8e30b81d31
Submitter: Jenkins
Branch: master

commit c4ee4203555a793c95c6f9f36e488c8e30b81d31
Author: Gary Kotton <email address hidden>
Date: Wed Jul 24 23:57:12 2013 -0700

    Ensure that uuid is returned with mocked instance

    Fixes bug 1204798

    Change-Id: Icf8f1f63be4b7492ef3f788836db2c0d23477567