x
/
vmware-nsxlib
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2018-04-03 17:07:21 +00:00 committed by Gerrit Code Review
parent d1a543bca0 85197a92d3
commit bb17197016
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsxlib/v3/client_cert.py
View File

@ -15,10 +15,10 @@
import datetime
from time import time
import uuid
from OpenSSL import crypto
from oslo_log import log
from oslo_utils import uuidutils
from vmware_nsxlib._i18n import _
from vmware_nsxlib.v3 import exceptions as nsxlib_exceptions
@ -156,7 +156,7 @@ class ClientCertificateManager(object):
subject)
# register on backend
self._register_cert(cert, node_id or uuid.uuid4())
self._register_cert(cert, node_id or uuidutils.generate_uuid())
# save in storage
cert_pem = crypto.dump_certificate(crypto.FILETYPE_PEM, cert)
@ -224,7 +224,7 @@ class ClientCertificateManager(object):
cert = self._get_cert_from_file(filename)
# register on backend
self._register_cert(cert, node_id or uuid.uuid4())
self._register_cert(cert, node_id or uuidutils.generate_uuid())
cert_pem = crypto.dump_certificate(crypto.FILETYPE_PEM, cert)
self._storage_driver.store_cert(self._identity, cert_pem, None)

4
vmware_nsxlib/v3/policy_resources.py
View File

@ -15,9 +15,9 @@
#
import abc
import uuid
from oslo_log import log as logging
from oslo_utils import uuidutils
import six
from vmware_nsxlib._i18n import _
@ -62,7 +62,7 @@ class NsxPolicyResourceBase(object):
def _init_obj_uuid(obj_uuid):
if not obj_uuid:
# generate a random id
obj_uuid = str(uuid.uuid4())
obj_uuid = str(uuidutils.generate_uuid())
return obj_uuid
def _canonize_name(self, name):