openstack
/
nova
Code Issues Proposed changes

Merge "Handle unicode characters in migration params" into stable/queens

This commit is contained in:
Zuul 2019-02-23 13:12:34 +00:00 committed by Gerrit Code Review
parent 09456e656a 4c127db2f3
commit 12c7aa3994
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/tests/unit/virt/libvirt/test_guest.py
View File

@ -677,11 +677,17 @@ class GuestTestCase(test.NoDBTestCase):
@testtools.skipIf(not six.PY2, 'libvirt python3 bindings accept unicode')
def test_migrate_v3_unicode(self):
self.guest.migrate('an-uri', domain_xml=u'</xml>',
params={'p1': u'v1', 'p2': 'v2', 'p3': 3},
dest_xml_template = "<domain type='qemu'><name>%s</name></domain>"
name = u'\u00CD\u00F1st\u00E1\u00F1c\u00E9'
dest_xml = dest_xml_template % name
expect_dest_xml = dest_xml_template % encodeutils.to_utf8(name)
self.guest.migrate('an-uri', domain_xml=dest_xml,
params={'p1': u'v1', 'p2': 'v2', 'p3': 3,
'destination_xml': dest_xml},
flags=1, bandwidth=2)
self.domain.migrateToURI3.assert_called_once_with(
'an-uri', flags=1, params={'p1': 'v1', 'p2': 'v2', 'p3': 3,
'destination_xml': expect_dest_xml,
'bandwidth': 2})
def test_abort_job(self):

4
nova/virt/libvirt/guest.py
View File

@ -664,8 +664,8 @@ class Guest(object):
# In the python2 libvirt bindings, strings passed to
# migrateToURI3 via params must not be unicode.
if six.PY2:
params = {key: str(value) if isinstance(value, unicode)
else value
params = {key: encodeutils.to_utf8(value)
if isinstance(value, six.text_type) else value
for key, value in params.items()}
self._domain.migrateToURI3(