openstack/nova
Code Issues Proposed changes

Merge "Ensure that uuid is returned with mocked instance"

Browse Source
This commit is contained in:
Jenkins 2013-07-26 16:08:52 +00:00 committed by Gerrit Code Review
commit 1b62c4386d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/network/test_manager.py
View File

@ -331,7 +331,8 @@ class FlatNetworkTestCase(test.TestCase):
fixed_ips=mox.IgnoreArg()).AndReturn(None)
db.instance_get_by_uuid(self.context,
mox.IgnoreArg()).AndReturn({'display_name': HOST})
mox.IgnoreArg()).AndReturn({'display_name': HOST,
'uuid': FAKEUUID})
db.network_get(mox.IgnoreArg(),
mox.IgnoreArg(),
@ -374,7 +375,8 @@ class FlatNetworkTestCase(test.TestCase):
fixed_ips=mox.IgnoreArg()).AndReturn(None)
db.instance_get_by_uuid(self.context,
mox.IgnoreArg()).AndReturn({'display_name': HOST})
mox.IgnoreArg()).AndReturn({'display_name': HOST,
'uuid': FAKEUUID})
db.network_get_by_uuid(mox.IgnoreArg(),
mox.IgnoreArg()).AndReturn(networks[0])
@ -461,7 +463,8 @@ class FlatNetworkTestCase(test.TestCase):
fixed_ips=mox.IgnoreArg()).AndReturn(None)
db.instance_get_by_uuid(self.context,
mox.IgnoreArg()).AndReturn({'display_name': HOST})
mox.IgnoreArg()).AndReturn({'display_name': HOST,
'uuid': FAKEUUID})
db.network_get_by_uuid(mox.IgnoreArg(),
mox.IgnoreArg()).AndReturn(networks[0])