openstack
/
nova
Code Issues Proposed changes

xrange() is renamed to range() in Python 3 

Change-Id: I423dd4ce36759e3dc482e66fb743358f467069ef
Partial-Bug: #1456955
This commit is contained in:
Alvaro Lopez Garcia 2016-02-02 10:30:09 +01:00
parent 42833670aa
commit 0eebaa01f8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -1915,7 +1915,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
self.assertFalse(hasattr(drvr, '_bad_libvirt_numa_version_warn'))
with mock.patch.object(drvr._host, 'has_version', return_value=True):
for i in xrange(2):
for i in range(2):
self.assertFalse(drvr._has_numa_support())
self.assertTrue(drvr._bad_libvirt_numa_version_warn)
self.assertEqual(1, mock_warn.call_count)

2
nova/virt/libvirt/driver.py
View File

@ -2316,7 +2316,7 @@ class LibvirtDriver(driver.ComputeDriver):
# call takes to return.
self._prepare_pci_devices_for_use(
pci_manager.get_instance_pci_devs(instance, 'all'))
for x in xrange(CONF.libvirt.wait_soft_reboot_seconds):
for x in range(CONF.libvirt.wait_soft_reboot_seconds):
guest = self._host.get_guest(instance)
state = guest.get_power_state(self._host)

2
plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
View File

@ -83,7 +83,7 @@ def _resume_compute(session, compute_ref, compute_uuid):
except XenAPI.Failure, e:
# if session is invalid, e.g. xapi has restarted, then the pool
# join has been successful, wait for xapi to become alive again
for c in xrange(0, DEFAULT_TRIES):
for c in range(0, DEFAULT_TRIES):
try:
_run_command(["xe", "vm-start", "uuid=%s" % compute_uuid])
return