openstack
/
nova
Code Issues Proposed changes

Merge "Stringify instance UUID" into stable/queens

This commit is contained in:
Zuul 2018-05-17 22:46:56 +00:00 committed by Gerrit Code Review
parent 365a1d2a13 2386e015ef
commit d8b336f473
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/virt/powervm/vm.py
View File

@ -111,7 +111,11 @@ def get_pvm_uuid(instance):
:param instance: nova.objects.instance.Instance.
:return: The PowerVM UUID for the LPAR corresponding to the instance.
"""
return pvm_uuid.convert_uuid_to_pvm(instance.uuid).upper()
# NOTE(esberglu): To work around bug ##1766692, we explicitly use str()
# rather than six.text_type here because of this pypowervm check for
# isinstance(..., str) at L50 of
# https://github.com/powervm/pypowervm/blob/1.1.10/pypowervm/utils/uuid.py
return pvm_uuid.convert_uuid_to_pvm(str(instance.uuid)).upper()
def get_instance_wrapper(adapter, instance):