openstack/nova
Code Issues Proposed changes

Merge "Fixes invalid uuid usages in functional tests"

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/tests/functional/api_sample_tests/test_fixed_ips.py
View File

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