openstack
/
nova
Code Issues Proposed changes

Merge "xenapi_device_id integer, expected string"

This commit is contained in:
Jenkins 2015-11-16 21:50:27 +00:00 committed by Gerrit Code Review
parent d1e6318c70 b03ab6c298
commit e6100f5934
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/xenapi/test_vm_utils.py
View File

@ -2194,7 +2194,7 @@ class CreateVmRecordTestCase(VMUtilsTestBase):
vcpus=1,
vcpu_weight=2)
vm_utils.create_vm(session, instance, "name", "kernel", "ramdisk",
device_id="0002")
device_id=2)
is_viridian_str = str(is_viridian).lower()

2
nova/virt/xenapi/vm_utils.py
View File

@ -306,7 +306,7 @@ def create_vm(session, instance, name_label, kernel, ramdisk,
rec['HVM_boot_policy'] = 'BIOS order'
if device_id:
rec['platform']['device_id'] = device_id
rec['platform']['device_id'] = str(device_id).zfill(4)
vm_ref = session.VM.create(rec)
LOG.debug('Created VM', instance=instance)