openstack/ironic
Code Issues Proposed changes

Merge "Replaces uuid.uuid4 with uuidutils.generate_uuid()"

Browse Source
This commit is contained in:
Jenkins 2016-11-08 09:51:09 +00:00 committed by Gerrit Code Review
commit cd517eac03
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/tests/unit/drivers/modules/test_pxe.py
View File

@ -19,13 +19,13 @@ import filecmp
import os
import shutil
import tempfile
import uuid
from ironic_lib import utils as ironic_utils
import mock
from oslo_config import cfg
from oslo_serialization import jsonutils as json
from oslo_utils import fileutils
from oslo_utils import uuidutils
from ironic.common import boot_devices
from ironic.common import dhcp_factory
@ -302,11 +302,11 @@ class PXEPrivateMethodsTestCase(db_base.DbTestCase):
deploy_kernel, deploy_ramdisk] = [
'swift_kernel', 'swift_ramdisk']
image_info = {
'deploy_kernel': (str(uuid.uuid4()),
'deploy_kernel': (uuidutils.generate_uuid(),
os.path.join(root_dir,
self.node.uuid,
'deploy_kernel')),
'deploy_ramdisk': (str(uuid.uuid4()),
'deploy_ramdisk': (uuidutils.generate_uuid(),
os.path.join(root_dir,
self.node.uuid,
'deploy_ramdisk'))

4
ironic/tests/unit/drivers/modules/test_seamicro.py
View File

@ -12,7 +12,6 @@
"""Test class for Ironic SeaMicro driver."""
import uuid
import mock
from oslo_utils import uuidutils
@ -68,7 +67,8 @@ class Fake_Server(object):
class Fake_Volume(object):
def __init__(self, id=None, *args, **kwargs):
if id is None:
self.id = "%s/%s/%s" % ("0", "ironic-p6-6", str(uuid.uuid4()))
self.id = "%s/%s/%s" % ("0", "ironic-p6-6",
uuidutils.generate_uuid())
else:
self.id = id