From e0f61dbbbc0d64a4c4fbbeeb5a3221d1947447f4 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Mon, 16 May 2016 18:38:45 +0800 Subject: [PATCH] Fixes invalid uuid usages in functional tests oslo_versionedobjects.fields.UUIDField will validate UUID in next major release. So need fix invalid uuid usage before moving to new major release of oslo.versionedobjects. Releted-Bug: #1557378 Change-Id: I1dc56cbec42cc385a87886c63f4cf33b68397a29 --- nova/tests/functional/api_sample_tests/test_fixed_ips.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nova/tests/functional/api_sample_tests/test_fixed_ips.py b/nova/tests/functional/api_sample_tests/test_fixed_ips.py index 270c638323e6..add3dbc130f8 100644 --- a/nova/tests/functional/api_sample_tests/test_fixed_ips.py +++ b/nova/tests/functional/api_sample_tests/test_fixed_ips.py @@ -18,6 +18,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 = cfg.CONF CONF.import_opt('osapi_compute_extension', @@ -45,7 +46,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, @@ -60,7 +61,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,