Merge "Replaces uuid.uuid4 with uuidutils.generate_uuid()"
This commit is contained in:
commit
c1c64f8511
@ -33,6 +33,7 @@ import zipfile
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import encodeutils
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
import prettytable
|
||||
import requests
|
||||
@ -770,13 +771,14 @@ def traverse_and_replace(obj,
|
||||
"""Helper function that traverses object model and substitutes ids.
|
||||
|
||||
Recursively checks values of objects found in `obj` against `pattern`,
|
||||
and replaces strings that match pattern with uuid.uuid4(). Keeps track of
|
||||
any replacements already made, i.e. ===id1=== would always be the same,
|
||||
across `obj`. Uses 1st group, found in the `pattern` regexp as unique
|
||||
identifier of a replacement
|
||||
and replaces strings that match pattern with uuidutils.generate_uuid().
|
||||
Keeps track of any replacements already made, i.e. ===id1=== would
|
||||
always be the same, across `obj`. Uses 1st group, found in the `pattern`
|
||||
regexp as unique identifier of a replacement
|
||||
"""
|
||||
if replacements is None:
|
||||
replacements = collections.defaultdict(lambda: uuid.uuid4().hex)
|
||||
replacements = collections.defaultdict(
|
||||
lambda: uuidutils.generate_uuid(dashed=False))
|
||||
|
||||
def _maybe_replace(obj, key, value):
|
||||
"""Check and replace value against pattern"""
|
||||
@ -784,7 +786,8 @@ def traverse_and_replace(obj,
|
||||
m = pattern.search(value)
|
||||
if m:
|
||||
if m.group(1) not in replacements:
|
||||
replacements[m.group(1)] = uuid.uuid4().hex
|
||||
replacements[m.group(1)] = uuidutils.generate_uuid(
|
||||
dashed=False)
|
||||
obj[key] = replacements[m.group(1)]
|
||||
|
||||
if isinstance(obj, list):
|
||||
|
@ -15,13 +15,13 @@
|
||||
import json
|
||||
import six
|
||||
import sys
|
||||
import uuid
|
||||
|
||||
import jsonpatch
|
||||
from osc_lib.command import command
|
||||
from osc_lib import utils
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
from muranoclient.apiclient import exceptions
|
||||
from muranoclient.common import utils as murano_utils
|
||||
@ -209,7 +209,7 @@ class EnvironmentCreate(command.Lister):
|
||||
'defaultNetworks': {
|
||||
'environment': {
|
||||
'?': {
|
||||
'id': uuid.uuid4().hex,
|
||||
'id': uuidutils.generate_uuid(dashed=False),
|
||||
'type':
|
||||
'io.murano.resources.ExistingNeutronNetwork'
|
||||
},
|
||||
|
@ -19,8 +19,8 @@ import shutil
|
||||
import SocketServer
|
||||
import tempfile
|
||||
import time
|
||||
import uuid
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
from six.moves import SimpleHTTPServer
|
||||
from tempest.lib.cli import output_parser
|
||||
from tempest.lib import exceptions
|
||||
@ -95,7 +95,7 @@ class CLIUtilsTestBase(muranoclient.ClientTestBase):
|
||||
@staticmethod
|
||||
def generate_uuid():
|
||||
"""Generate uuid for objects."""
|
||||
return uuid.uuid4().hex
|
||||
return uuidutils.generate_uuid(dashed=False)
|
||||
|
||||
@staticmethod
|
||||
def generate_name(prefix):
|
||||
|
@ -20,11 +20,11 @@ import os
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
import uuid
|
||||
import zipfile
|
||||
|
||||
import jsonpatch
|
||||
from oslo_utils import strutils
|
||||
from oslo_utils import uuidutils
|
||||
import six
|
||||
import six.moves
|
||||
|
||||
@ -65,7 +65,7 @@ def _generate_join_existing_net(net, subnet):
|
||||
'defaultNetworks': {
|
||||
'environment': {
|
||||
'?': {
|
||||
'id': uuid.uuid4().hex,
|
||||
'id': uuidutils.generate_uuid(dashed=False),
|
||||
'type': 'io.murano.resources.ExistingNeutronNetwork'
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user