openstack/python-cinderclient
Code Issues Proposed changes

Replace uuid.uuid4().hex with uuidutils.generate_uuid()

Browse Source 
Openstack common has a wrapper for generating uuids. We should
use that function to generate uuids for consistency.

Change-Id: Ia64cceb8c17e8ee6cba83fceadf8510679c388d2
Closes-Bug: #1082248
This commit is contained in:
jeremy.zhang
2017-03-25 09:36:43 +08:00
parent 4558dab82f
commit c1c9057bae
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
cinderclient/tests/unit/fixture_data/keystone_client.py
View File

@@ -12,7 +12,8 @@
import copy import copy
import json import json
import uuid
from oslo_utils import uuidutils
# these are copied from python-keystoneclient tests # these are copied from python-keystoneclient tests
@@ -75,19 +76,27 @@ CINDER_ENDPOINT = 'http://www.cinder.com/v1'
def _get_normalized_token_data(**kwargs): def _get_normalized_token_data(**kwargs):
ref = copy.deepcopy(kwargs) ref = copy.deepcopy(kwargs)
# normalized token data # normalized token data
ref['user_id'] = ref.get('user_id', uuid.uuid4().hex) ref['user_id'] = ref.get('user_id', uuidutils.generate_uuid(dashed=False))
ref['username'] = ref.get('username', uuid.uuid4().hex) ref['username'] = ref.get('username',
uuidutils.generate_uuid(dashed=False))
ref['project_id'] = ref.get('project_id', ref['project_id'] = ref.get('project_id',
ref.get('tenant_id', uuid.uuid4().hex)) ref.get('tenant_id', uuidutils.generate_uuid(
dashed=False)))
ref['project_name'] = ref.get('project_name', ref['project_name'] = ref.get('project_name',
ref.get('tenant_name', uuid.uuid4().hex)) ref.get('tenant_name',
ref['user_domain_id'] = ref.get('user_domain_id', uuid.uuid4().hex) uuidutils.generate_uuid(
ref['user_domain_name'] = ref.get('user_domain_name', uuid.uuid4().hex) dashed=False)))
ref['project_domain_id'] = ref.get('project_domain_id', uuid.uuid4().hex) ref['user_domain_id'] = ref.get('user_domain_id',
uuidutils.generate_uuid(dashed=False))
ref['user_domain_name'] = ref.get('user_domain_name',
uuidutils.generate_uuid(dashed=False))
ref['project_domain_id'] = ref.get('project_domain_id',
uuidutils.generate_uuid(dashed=False))
ref['project_domain_name'] = ref.get('project_domain_name', ref['project_domain_name'] = ref.get('project_domain_name',
uuid.uuid4().hex) uuidutils.generate_uuid(dashed=False))
ref['roles'] = ref.get('roles', [{'name': uuid.uuid4().hex, ref['roles'] = ref.get('roles',
'id': uuid.uuid4().hex}]) [{'name': uuidutils.generate_uuid(dashed=False),
'id': uuidutils.generate_uuid(dashed=False)}])
ref['roles_link'] = ref.get('roles_link', []) ref['roles_link'] = ref.get('roles_link', [])
ref['cinder_url'] = ref.get('cinder_url', CINDER_ENDPOINT) ref['cinder_url'] = ref.get('cinder_url', CINDER_ENDPOINT)
@@ -97,7 +106,7 @@ def _get_normalized_token_data(**kwargs):
def generate_v2_project_scoped_token(**kwargs): def generate_v2_project_scoped_token(**kwargs):
"""Generate a Keystone V2 token based on auth request.""" """Generate a Keystone V2 token based on auth request."""
ref = _get_normalized_token_data(**kwargs) ref = _get_normalized_token_data(**kwargs)
token = uuid.uuid4().hex token = uuidutils.generate_uuid(dashed=False)
o = {'access': {'token': {'id': token, o = {'access': {'token': {'id': token,
'expires': '2099-05-22T00:02:43.941430Z', 'expires': '2099-05-22T00:02:43.941430Z',
@@ -108,7 +117,7 @@ def generate_v2_project_scoped_token(**kwargs):
} }
}, },
'user': {'id': ref.get('user_id'), 'user': {'id': ref.get('user_id'),
'name': uuid.uuid4().hex, 'name': uuidutils.generate_uuid(dashed=False),
'username': ref.get('username'), 'username': ref.get('username'),
'roles': ref.get('roles'), 'roles': ref.get('roles'),
'roles_links': ref.get('roles_links') 'roles_links': ref.get('roles_links')
@@ -123,7 +132,7 @@ def generate_v2_project_scoped_token(**kwargs):
'publicURL': ref.get('auth_url'), 'publicURL': ref.get('auth_url'),
'adminURL': ref.get('auth_url'), 'adminURL': ref.get('auth_url'),
'internalURL': ref.get('auth_url'), 'internalURL': ref.get('auth_url'),
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'region': 'RegionOne' 'region': 'RegionOne'
}], }],
'endpoint_links': [], 'endpoint_links': [],
@@ -138,7 +147,7 @@ def generate_v2_project_scoped_token(**kwargs):
'publicURL': 'public_' + ref.get('cinder_url'), 'publicURL': 'public_' + ref.get('cinder_url'),
'internalURL': 'internal_' + ref.get('cinder_url'), 'internalURL': 'internal_' + ref.get('cinder_url'),
'adminURL': 'admin_' + (ref.get('auth_url') or ""), 'adminURL': 'admin_' + (ref.get('auth_url') or ""),
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'region': 'RegionOne' 'region': 'RegionOne'
} }
], ],
@@ -189,44 +198,44 @@ def generate_v3_project_scoped_token(**kwargs):
o['token']['catalog'] = [ o['token']['catalog'] = [
{'endpoints': [ {'endpoints': [
{ {
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'interface': 'public', 'interface': 'public',
'region': 'RegionOne', 'region': 'RegionOne',
'url': 'public_' + ref.get('cinder_url') 'url': 'public_' + ref.get('cinder_url')
}, },
{ {
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'interface': 'internal', 'interface': 'internal',
'region': 'RegionOne', 'region': 'RegionOne',
'url': 'internal_' + ref.get('cinder_url') 'url': 'internal_' + ref.get('cinder_url')
}, },
{ {
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'interface': 'admin', 'interface': 'admin',
'region': 'RegionOne', 'region': 'RegionOne',
'url': 'admin_' + ref.get('cinder_url') 'url': 'admin_' + ref.get('cinder_url')
}], }],
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'type': 'network'}, 'type': 'network'},
{'endpoints': [ {'endpoints': [
{ {
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'interface': 'public', 'interface': 'public',
'region': 'RegionOne', 'region': 'RegionOne',
'url': ref.get('auth_url') 'url': ref.get('auth_url')
}, },
{ {
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'interface': 'admin', 'interface': 'admin',
'region': 'RegionOne', 'region': 'RegionOne',
'url': ref.get('auth_url') 'url': ref.get('auth_url')
}], }],
'id': uuid.uuid4().hex, 'id': uuidutils.generate_uuid(dashed=False),
'type': 'identity'}] 'type': 'identity'}]
# token ID is conveyed via the X-Subject-Token header so we are generating # token ID is conveyed via the X-Subject-Token header so we are generating
# one to stash there # one to stash there
token_id = uuid.uuid4().hex token_id = uuidutils.generate_uuid(dashed=False)
return token_id, o return token_id, o