Merge "Fixes invalid uuid usages in functional tests"

This commit is contained in:
Jenkins 2016-05-19 13:47:46 +00:00 committed by Gerrit Code Review
commit f98fbbc4ae
1 changed files with 3 additions and 2 deletions

View File

@ -17,6 +17,7 @@ from nova import exception
from nova.tests.functional.api_sample_tests import test_servers
from nova.tests.unit.objects import test_network
from nova.tests.unit import utils as test_utils
from nova.tests import uuidsentinel as uuids
CONF = nova.conf.CONF
@ -42,7 +43,7 @@ class FixedIpTest(test_servers.ServersSampleBase):
'address': '192.168.1.1',
'network_id': 1,
'virtual_interface_id': 1,
'instance_uuid': '1',
'instance_uuid': uuids.instance_1,
'allocated': False,
'leased': False,
'reserved': False,
@ -57,7 +58,7 @@ class FixedIpTest(test_servers.ServersSampleBase):
'address': '192.168.1.2',
'network_id': 1,
'virtual_interface_id': 2,
'instance_uuid': '2',
'instance_uuid': uuids.instance_2,
'allocated': False,
'leased': False,
'reserved': False,