From 0eebaa01f8eb0adc8a999126bc3deeb47614838c Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Tue, 2 Feb 2016 10:30:09 +0100 Subject: [PATCH] xrange() is renamed to range() in Python 3 Change-Id: I423dd4ce36759e3dc482e66fb743358f467069ef Partial-Bug: #1456955 --- nova/tests/unit/virt/libvirt/test_driver.py | 2 +- nova/virt/libvirt/driver.py | 2 +- plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index b52edbb3f991..1e888e665a5c 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -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) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 9239d35af6e4..f777ce884c3e 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -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) diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost index 0e95e33de39c..aea5a0d3d1b6 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost @@ -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