openstack/nova
Code Issues Proposed changes

Merge "VmWare: Use of id shadows built-in function"

Browse Source
This commit is contained in:
Zuul
2022-02-21 23:11:47 +00:00
committed by Gerrit Code Review
parent b9b32676da 45e8fe01e4
commit 28cbcbb373
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nova/virt/vmwareapi/vm_util.py
View File

@@ -119,31 +119,31 @@ def vm_refs_cache_reset():
_VM_REFS_CACHE = {} _VM_REFS_CACHE = {}
def vm_ref_cache_delete(id): def vm_ref_cache_delete(id_):
_VM_REFS_CACHE.pop(id, None) _VM_REFS_CACHE.pop(id_, None)
def vm_ref_cache_update(id, vm_ref): def vm_ref_cache_update(id_, vm_ref):
_VM_REFS_CACHE[id] = vm_ref _VM_REFS_CACHE[id_] = vm_ref
def vm_ref_cache_get(id): def vm_ref_cache_get(id_):
return _VM_REFS_CACHE.get(id) return _VM_REFS_CACHE.get(id_)
def _vm_ref_cache(id, func, session, data): def _vm_ref_cache(id_, func, session, data):
vm_ref = vm_ref_cache_get(id) vm_ref = vm_ref_cache_get(id_)
if not vm_ref: if not vm_ref:
vm_ref = func(session, data) vm_ref = func(session, data)
vm_ref_cache_update(id, vm_ref) vm_ref_cache_update(id_, vm_ref)
return vm_ref return vm_ref
def vm_ref_cache_from_instance(func): def vm_ref_cache_from_instance(func):
@functools.wraps(func) @functools.wraps(func)
def wrapper(session, instance): def wrapper(session, instance):
id = instance.uuid id_ = instance.uuid
return _vm_ref_cache(id, func, session, instance) return _vm_ref_cache(id_, func, session, instance)
return wrapper return wrapper
@@ -1536,8 +1536,8 @@ def find_rescue_device(hardware_devices, instance):
raise exception.NotFound(msg) raise exception.NotFound(msg)
def get_ephemeral_name(id): def get_ephemeral_name(id_):
return 'ephemeral_%d.vmdk' % id return 'ephemeral_%d.vmdk' % id_
def _detach_and_delete_devices_config_spec(client_factory, devices): def _detach_and_delete_devices_config_spec(client_factory, devices):
@@ -1619,11 +1619,11 @@ def folder_ref_cache_get(path):
return _FOLDER_PATH_REF_MAPPING.get(path) return _FOLDER_PATH_REF_MAPPING.get(path)
def _get_vm_name(display_name, id): def _get_vm_name(display_name, id_):
if display_name: if display_name:
return '%s (%s)' % (display_name[:41], id[:36]) return '%s (%s)' % (display_name[:41], id_[:36])
else:
return id[:36] return id_[:36]
def rename_vm(session, vm_ref, instance): def rename_vm(session, vm_ref, instance):

4
nova/virt/vmwareapi/vmops.py
View File

@@ -263,11 +263,11 @@ class VMwareVMOps(object):
parent_folder = folder_ref parent_folder = folder_ref
return folder_ref return folder_ref
def _get_folder_name(self, name, id): def _get_folder_name(self, name, id_):
# Maximum folder length must be less than 80 characters. # Maximum folder length must be less than 80 characters.
# The 'id' length is 36. The maximum prefix for name is 40. # The 'id' length is 36. The maximum prefix for name is 40.
# We cannot truncate the 'id' as this is unique across OpenStack. # We cannot truncate the 'id' as this is unique across OpenStack.
return '%s (%s)' % (name[:40], id[:36]) return '%s (%s)' % (name[:40], id_[:36])
def build_virtual_machine(self, instance, image_info, def build_virtual_machine(self, instance, image_info,
dc_info, datastore, network_info, extra_specs, dc_info, datastore, network_info, extra_specs,