From d9169614e411da94518a7b55d3c6b73fc2111570 Mon Sep 17 00:00:00 2001 From: Jay Pipes Date: Thu, 16 Oct 2014 00:04:42 -0400 Subject: [PATCH] Clean up the naming of PCI python modules Something that has been bothering me when looking at the PCI code is that the modules in /nova/pci/ unnecessarily were prefixed with pci_. For instance, nova/pci/pci_device.py, whereas all other module directory organizations for all other code in Nova uses the directory name to demarcate a submodule. This patch simply gets the nova/pci/ modules in-line with the standard set everywhere else in Nova and cuts off the pci_ prefix from the module names. Change-Id: Ia5ca13f674f15b41e22b8488efe44eb926e5e4eb --- nova/compute/api.py | 2 +- nova/compute/resource_tracker.py | 2 +- nova/network/neutronv2/api.py | 6 +- nova/pci/{pci_device.py => device.py} | 0 nova/pci/{pci_devspec.py => devspec.py} | 12 ++-- nova/pci/{pci_manager.py => manager.py} | 18 ++--- nova/pci/{pci_request.py => request.py} | 6 +- nova/pci/{pci_stats.py => stats.py} | 8 +-- nova/pci/{pci_utils.py => utils.py} | 0 nova/pci/{pci_whitelist.py => whitelist.py} | 4 +- nova/scheduler/host_manager.py | 2 +- .../openstack/compute/plugins/v3/test_pci.py | 6 +- nova/tests/compute/test_claims.py | 4 +- nova/tests/compute/test_resource_tracker.py | 2 +- nova/tests/fake_network.py | 2 +- nova/tests/network/test_neutronv2.py | 4 +- nova/tests/pci/{pci_fakes.py => fakes.py} | 4 +- .../{test_pci_device.py => test_device.py} | 47 +++++++------ .../{test_pci_devspec.py => test_devspec.py} | 66 +++++++++---------- .../{test_pci_manager.py => test_manager.py} | 16 ++--- .../{test_pci_request.py => test_request.py} | 24 +++---- .../pci/{test_pci_stats.py => test_stats.py} | 18 ++--- .../pci/{test_pci_utils.py => test_utils.py} | 16 ++--- ...est_pci_whitelist.py => test_whitelist.py} | 14 ++-- nova/tests/scheduler/test_host_filters.py | 2 +- nova/tests/virt/libvirt/test_driver.py | 4 +- nova/tests/virt/xenapi/test_vmops.py | 2 +- nova/virt/libvirt/config.py | 2 +- nova/virt/libvirt/designer.py | 2 +- nova/virt/libvirt/driver.py | 6 +- nova/virt/xenapi/host.py | 2 +- nova/virt/xenapi/vmops.py | 2 +- 32 files changed, 152 insertions(+), 153 deletions(-) rename nova/pci/{pci_device.py => device.py} (100%) rename nova/pci/{pci_devspec.py => devspec.py} (94%) mode change 100755 => 100644 rename nova/pci/{pci_manager.py => manager.py} (96%) rename nova/pci/{pci_request.py => request.py} (97%) rename nova/pci/{pci_stats.py => stats.py} (97%) rename nova/pci/{pci_utils.py => utils.py} (100%) rename nova/pci/{pci_whitelist.py => whitelist.py} (97%) rename nova/tests/pci/{pci_fakes.py => fakes.py} (90%) rename nova/tests/pci/{test_pci_device.py => test_device.py} (73%) rename nova/tests/pci/{test_pci_devspec.py => test_devspec.py} (77%) rename nova/tests/pci/{test_pci_manager.py => test_manager.py} (97%) rename nova/tests/pci/{test_pci_request.py => test_request.py} (91%) rename nova/tests/pci/{test_pci_stats.py => test_stats.py} (96%) rename nova/tests/pci/{test_pci_utils.py => test_utils.py} (81%) rename nova/tests/pci/{test_pci_whitelist.py => test_whitelist.py} (84%) diff --git a/nova/compute/api.py b/nova/compute/api.py index 749aedefc071..8aca5074584c 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -63,7 +63,7 @@ from nova.objects import quotas as quotas_obj from nova.objects import security_group as security_group_obj from nova.openstack.common import log as logging from nova.openstack.common import uuidutils -from nova.pci import pci_request +from nova.pci import request as pci_request import nova.policy from nova import quota from nova import rpc diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index e17d6a3c9f8b..57d79c670290 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -36,7 +36,7 @@ from nova.i18n import _ from nova import objects from nova.objects import base as obj_base from nova.openstack.common import log as logging -from nova.pci import pci_manager +from nova.pci import manager as pci_manager from nova import rpc from nova.scheduler import client as scheduler_client from nova import utils diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index f60d028334a4..27b030d763e0 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -35,9 +35,9 @@ from nova import objects from nova.openstack.common import lockutils from nova.openstack.common import log as logging from nova.openstack.common import uuidutils -from nova.pci import pci_manager -from nova.pci import pci_request -from nova.pci import pci_whitelist +from nova.pci import manager as pci_manager +from nova.pci import request as pci_request +from nova.pci import whitelist as pci_whitelist neutron_opts = [ cfg.StrOpt('url', diff --git a/nova/pci/pci_device.py b/nova/pci/device.py similarity index 100% rename from nova/pci/pci_device.py rename to nova/pci/device.py diff --git a/nova/pci/pci_devspec.py b/nova/pci/devspec.py old mode 100755 new mode 100644 similarity index 94% rename from nova/pci/pci_devspec.py rename to nova/pci/devspec.py index e78251bedd9e..51ec1a82d47a --- a/nova/pci/pci_devspec.py +++ b/nova/pci/devspec.py @@ -17,7 +17,7 @@ import re from oslo.serialization import jsonutils from nova import exception -from nova.pci import pci_utils +from nova.pci import utils MAX_VENDOR_ID = 0xFFFF MAX_PRODUCT_ID = 0xFFFF @@ -69,12 +69,12 @@ class PciAddress(object): def _check_physical_function(self): if ANY in (self.domain, self.bus, self.slot, self.func): return - self.is_physical_function = pci_utils.is_physical_function(self) + self.is_physical_function = utils.is_physical_function(self) def _init_address_fields(self, pci_addr): if self.is_physical_function: (self.domain, self.bus, self.slot, - self.func) = pci_utils.get_pci_address_fields(pci_addr) + self.func) = utils.get_pci_address_fields(pci_addr) return dbs, sep, func = pci_addr.partition('.') if func: @@ -112,12 +112,12 @@ class PciAddress(object): if not pci_phys_addr: return False domain, bus, slot, func = ( - pci_utils.get_pci_address_fields(pci_phys_addr)) + utils.get_pci_address_fields(pci_phys_addr)) return (self.domain == domain and self.bus == bus and self.slot == slot and self.func == func) else: domain, bus, slot, func = ( - pci_utils.get_pci_address_fields(pci_addr)) + utils.get_pci_address_fields(pci_addr)) conditions = [ self.domain in (ANY, domain), self.bus in (ANY, bus), @@ -149,7 +149,7 @@ class PciDeviceSpec(object): raise exception.PciDeviceInvalidDeviceName() if not self.address: if self.dev_name: - self.address, pf = pci_utils.get_function_by_ifname( + self.address, pf = utils.get_function_by_ifname( self.dev_name) if not self.address: raise exception.PciDeviceNotFoundById(id=self.dev_name) diff --git a/nova/pci/pci_manager.py b/nova/pci/manager.py similarity index 96% rename from nova/pci/pci_manager.py rename to nova/pci/manager.py index 90f1e4f9d951..5007baff7bb6 100644 --- a/nova/pci/pci_manager.py +++ b/nova/pci/manager.py @@ -23,8 +23,8 @@ from nova import exception from nova.i18n import _ from nova import objects from nova.openstack.common import log as logging -from nova.pci import pci_device -from nova.pci import pci_stats +from nova.pci import device +from nova.pci import stats LOG = logging.getLogger(__name__) @@ -52,7 +52,7 @@ class PciDevTracker(object): super(PciDevTracker, self).__init__() self.stale = {} self.node_id = node_id - self.stats = pci_stats.PciDeviceStats() + self.stats = stats.PciDeviceStats() if node_id: self.pci_devs = list( objects.PciDeviceList.get_by_compute_node(context, node_id)) @@ -107,7 +107,7 @@ class PciDevTracker(object): for existed in self.pci_devs: if existed['address'] in exist_addrs - new_addrs: try: - pci_device.remove(existed) + device.remove(existed) except exception.PciDeviceInvalidStatus as e: LOG.warn(_("Trying to remove device with %(status)s " "ownership %(instance_uuid)s because of " @@ -140,7 +140,7 @@ class PciDevTracker(object): # by force in future. self.stale[new_value['address']] = new_value else: - pci_device.update_device(existed, new_value) + device.update_device(existed, new_value) for dev in [dev for dev in devices if dev['address'] in new_addrs - exist_addrs]: @@ -158,18 +158,18 @@ class PciDevTracker(object): if not devs: raise exception.PciDeviceRequestFailed(pci_requests) for dev in devs: - pci_device.claim(dev, instance) + device.claim(dev, instance) return devs def _allocate_instance(self, instance, devs): for dev in devs: - pci_device.allocate(dev, instance) + device.allocate(dev, instance) def _free_device(self, dev, instance=None): - pci_device.free(dev, instance) + device.free(dev, instance) stale = self.stale.pop(dev['address'], None) if stale: - pci_device.update_device(dev, stale) + device.update_device(dev, stale) self.stats.add_device(dev) def _free_instance(self, instance): diff --git a/nova/pci/pci_request.py b/nova/pci/request.py similarity index 97% rename from nova/pci/pci_request.py rename to nova/pci/request.py index 3aae71073851..cb0ae049bcd7 100644 --- a/nova/pci/pci_request.py +++ b/nova/pci/request.py @@ -46,7 +46,7 @@ import six from nova import exception from nova import objects from nova.openstack.common import log as logging -from nova.pci import pci_utils +from nova.pci import utils pci_alias_opts = [ cfg.MultiStrOpt('pci_alias', @@ -91,11 +91,11 @@ _ALIAS_SCHEMA = { }, "product_id": { "type": "string", - "pattern": pci_utils.PCI_VENDOR_PATTERN, + "pattern": utils.PCI_VENDOR_PATTERN, }, "vendor_id": { "type": "string", - "pattern": pci_utils.PCI_VENDOR_PATTERN, + "pattern": utils.PCI_VENDOR_PATTERN, }, "device_type": { "type": "string", diff --git a/nova/pci/pci_stats.py b/nova/pci/stats.py similarity index 97% rename from nova/pci/pci_stats.py rename to nova/pci/stats.py index 7dd6c09c0f73..d49d723dc962 100644 --- a/nova/pci/pci_stats.py +++ b/nova/pci/stats.py @@ -21,8 +21,8 @@ from oslo.serialization import jsonutils from nova import exception from nova.i18n import _LE from nova.openstack.common import log as logging -from nova.pci import pci_utils -from nova.pci import pci_whitelist +from nova.pci import utils +from nova.pci import whitelist LOG = logging.getLogger(__name__) @@ -81,7 +81,7 @@ class PciDeviceStats(object): """ # Don't add a device that doesn't have a matching device spec. # This can happen during initial sync up with the controller - devspec = pci_whitelist.get_pci_device_devspec(dev) + devspec = whitelist.get_pci_device_devspec(dev) if not devspec: return tags = devspec.get_tags() @@ -174,7 +174,7 @@ class PciDeviceStats(object): @staticmethod def _filter_pools_for_spec(pools, request_specs): return [pool for pool in pools - if pci_utils.pci_device_prop_match(pool, request_specs)] + if utils.pci_device_prop_match(pool, request_specs)] def _apply_request(self, pools, request): count = request.count diff --git a/nova/pci/pci_utils.py b/nova/pci/utils.py similarity index 100% rename from nova/pci/pci_utils.py rename to nova/pci/utils.py diff --git a/nova/pci/pci_whitelist.py b/nova/pci/whitelist.py similarity index 97% rename from nova/pci/pci_whitelist.py rename to nova/pci/whitelist.py index 75e630de5289..5113bac0ca8c 100644 --- a/nova/pci/pci_whitelist.py +++ b/nova/pci/whitelist.py @@ -17,7 +17,7 @@ from oslo.config import cfg from nova.openstack.common import log as logging -from nova.pci import pci_devspec +from nova.pci import devspec pci_opts = [cfg.MultiStrOpt('pci_passthrough_whitelist', default=[], @@ -46,7 +46,7 @@ class PciHostDevicesWhiteList(object): """Parse and validate the pci whitelist from the nova config.""" specs = [] for jsonspec in whitelists: - spec = pci_devspec.PciDeviceSpec(jsonspec) + spec = devspec.PciDeviceSpec(jsonspec) specs.append(spec) return specs diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py index e6f2c2e98b68..13a6bcaab4c1 100644 --- a/nova/scheduler/host_manager.py +++ b/nova/scheduler/host_manager.py @@ -30,7 +30,7 @@ from nova import db from nova import exception from nova.i18n import _, _LW from nova.openstack.common import log as logging -from nova.pci import pci_stats +from nova.pci import stats as pci_stats from nova.scheduler import filters from nova.scheduler import weights from nova.virt import hardware diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py b/nova/tests/api/openstack/compute/plugins/v3/test_pci.py index a4d508c7460e..5bc2201c49e0 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_pci.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_pci.py @@ -22,7 +22,7 @@ from nova import context from nova import db from nova import exception from nova import objects -from nova.pci import pci_device +from nova.pci import device from nova import test from nova.tests.api.openstack import fakes from nova.tests.objects import test_pci_device @@ -60,8 +60,8 @@ class PciServerControllerTest(test.NoDBTestCase): }]} self._create_fake_instance() self._create_fake_pci_device() - pci_device.claim(self.pci_device, self.inst) - pci_device.allocate(self.pci_device, self.inst) + device.claim(self.pci_device, self.inst) + device.allocate(self.pci_device, self.inst) def _create_fake_instance(self): self.inst = objects.Instance() diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py index 1e29e16a8734..24590e818e5f 100644 --- a/nova/tests/compute/test_claims.py +++ b/nova/tests/compute/test_claims.py @@ -26,9 +26,9 @@ from nova.compute import claims from nova import db from nova import exception from nova import objects -from nova.pci import pci_manager +from nova.pci import manager as pci_manager from nova import test -from nova.tests.pci import pci_fakes +from nova.tests.pci import fakes as pci_fakes from nova.virt import hardware diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index 992f72b6ae56..564c028ee6ff 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -35,7 +35,7 @@ from nova import rpc from nova import test from nova.tests.compute.monitors import test_monitors from nova.tests.objects import test_migration -from nova.tests.pci import pci_fakes +from nova.tests.pci import fakes as pci_fakes from nova.virt import driver from nova.virt import hardware diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index de42d6d87760..d9f1db5797ba 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -29,7 +29,7 @@ from nova.network import rpcapi as network_rpcapi from nova import objects from nova.objects import base as obj_base from nova.objects import virtual_interface as vif_obj -from nova.pci import pci_device +from nova.pci import device as pci_device from nova.tests.objects import test_fixed_ip from nova.tests.objects import test_instance_info_cache from nova.tests.objects import test_pci_device diff --git a/nova/tests/network/test_neutronv2.py b/nova/tests/network/test_neutronv2.py index 074f2fc2eb5b..09fce28b7f89 100644 --- a/nova/tests/network/test_neutronv2.py +++ b/nova/tests/network/test_neutronv2.py @@ -36,8 +36,8 @@ from nova.network.neutronv2 import api as neutronapi from nova.network.neutronv2 import constants from nova import objects from nova.openstack.common import policy as common_policy -from nova.pci import pci_manager -from nova.pci import pci_whitelist +from nova.pci import manager as pci_manager +from nova.pci import whitelist as pci_whitelist from nova import policy from nova import test from nova.tests import fake_instance diff --git a/nova/tests/pci/pci_fakes.py b/nova/tests/pci/fakes.py similarity index 90% rename from nova/tests/pci/pci_fakes.py rename to nova/tests/pci/fakes.py index 591834ec9f33..b56dfc20a8ce 100644 --- a/nova/tests/pci/pci_fakes.py +++ b/nova/tests/pci/fakes.py @@ -17,13 +17,13 @@ import functools import mock -from nova.pci import pci_whitelist +from nova.pci import whitelist def fake_pci_whitelist(): devspec = mock.Mock() devspec.get_tags.return_value = None - patcher = mock.patch.object(pci_whitelist, 'get_pci_device_devspec', + patcher = mock.patch.object(whitelist, 'get_pci_device_devspec', return_value=devspec) patcher.start() return patcher diff --git a/nova/tests/pci/test_pci_device.py b/nova/tests/pci/test_device.py similarity index 73% rename from nova/tests/pci/test_pci_device.py rename to nova/tests/pci/test_device.py index d8291cb37a9e..2406ac254be0 100644 --- a/nova/tests/pci/test_pci_device.py +++ b/nova/tests/pci/test_device.py @@ -15,9 +15,8 @@ from nova import context from nova import exception -from nova.objects import instance -from nova.objects import pci_device as pci_device_obj -from nova.pci import pci_device +from nova import objects +from nova.pci import device from nova import test @@ -45,16 +44,16 @@ class PciDeviceTestCase(test.TestCase): def setUp(self): super(PciDeviceTestCase, self).setUp() self.ctxt = context.get_admin_context() - self.inst = instance.Instance() + self.inst = objects.Instance() self.inst.uuid = 'fake-inst-uuid' - self.inst.pci_devices = pci_device_obj.PciDeviceList() - self.devobj = pci_device_obj.PciDevice._from_db_object( + self.inst.pci_devices = objects.PciDeviceList() + self.devobj = objects.PciDevice._from_db_object( self.ctxt, - pci_device_obj.PciDevice(), + objects.PciDevice(), dev_dict) def test_claim_device(self): - pci_device.claim(self.devobj, self.inst) + device.claim(self.devobj, self.inst) self.assertEqual(self.devobj.status, 'claimed') self.assertEqual(self.devobj.instance_uuid, self.inst.uuid) @@ -63,11 +62,11 @@ class PciDeviceTestCase(test.TestCase): def test_claim_device_fail(self): self.devobj.status = 'allocated' self.assertRaises(exception.PciDeviceInvalidStatus, - pci_device.claim, self.devobj, self.inst) + device.claim, self.devobj, self.inst) def test_allocate_device(self): - pci_device.claim(self.devobj, self.inst) - pci_device.allocate(self.devobj, self.inst) + device.claim(self.devobj, self.inst) + device.allocate(self.devobj, self.inst) self.assertEqual(self.devobj.status, 'allocated') self.assertEqual(self.devobj.instance_uuid, 'fake-inst-uuid') self.assertEqual(len(self.inst.pci_devices), 1) @@ -77,29 +76,29 @@ class PciDeviceTestCase(test.TestCase): def test_allocacte_device_fail_status(self): self.devobj.status = 'removed' self.assertRaises(exception.PciDeviceInvalidStatus, - pci_device.allocate, + device.allocate, self.devobj, self.inst) def test_allocacte_device_fail_owner(self): - inst_2 = instance.Instance() + inst_2 = objects.Instance() inst_2.uuid = 'fake-inst-uuid-2' - pci_device.claim(self.devobj, self.inst) + device.claim(self.devobj, self.inst) self.assertRaises(exception.PciDeviceInvalidOwner, - pci_device.allocate, + device.allocate, self.devobj, inst_2) def test_free_claimed_device(self): - pci_device.claim(self.devobj, self.inst) - pci_device.free(self.devobj, self.inst) + device.claim(self.devobj, self.inst) + device.free(self.devobj, self.inst) self.assertEqual(self.devobj.status, 'available') self.assertIsNone(self.devobj.instance_uuid) def test_free_allocated_device(self): - pci_device.claim(self.devobj, self.inst) - pci_device.allocate(self.devobj, self.inst) + device.claim(self.devobj, self.inst) + device.allocate(self.devobj, self.inst) self.assertEqual(len(self.inst.pci_devices), 1) - pci_device.free(self.devobj, self.inst) + device.free(self.devobj, self.inst) self.assertEqual(len(self.inst.pci_devices), 0) self.assertEqual(self.devobj.status, 'available') self.assertIsNone(self.devobj.instance_uuid) @@ -107,14 +106,14 @@ class PciDeviceTestCase(test.TestCase): def test_free_device_fail(self): self.devobj.status = 'removed' self.assertRaises(exception.PciDeviceInvalidStatus, - pci_device.free, self.devobj) + device.free, self.devobj) def test_remove_device(self): - pci_device.remove(self.devobj) + device.remove(self.devobj) self.assertEqual(self.devobj.status, 'removed') self.assertIsNone(self.devobj.instance_uuid) def test_remove_device_fail(self): - pci_device.claim(self.devobj, self.inst) + device.claim(self.devobj, self.inst) self.assertRaises(exception.PciDeviceInvalidStatus, - pci_device.remove, self.devobj) + device.remove, self.devobj) diff --git a/nova/tests/pci/test_pci_devspec.py b/nova/tests/pci/test_devspec.py similarity index 77% rename from nova/tests/pci/test_pci_devspec.py rename to nova/tests/pci/test_devspec.py index 8ffd1f5a1934..0cf557777d4e 100644 --- a/nova/tests/pci/test_pci_devspec.py +++ b/nova/tests/pci/test_devspec.py @@ -15,8 +15,8 @@ import mock from nova import exception -from nova.objects import pci_device -from nova.pci import pci_devspec +from nova import objects +from nova.pci import devspec from nova import test dev = {"vendor_id": "8086", @@ -29,76 +29,76 @@ class PciAddressTestCase(test.NoDBTestCase): def test_wrong_address(self): pci_info = ('{"vendor_id": "8086", "address": "*: *: *.6",' + '"product_id": "5057", "physical_network": "hr_net"}') - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertFalse(pci.match(dev)) def test_address_too_big(self): pci_info = ('{"address": "0000:0a:0b:00.5", ' + '"physical_network": "hr_net"}') self.assertRaises(exception.PciDeviceWrongAddressFormat, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) def test_address_invalid_character(self): pci_info = '{"address": "0000:h4.12:6", "physical_network": "hr_net"}' self.assertRaises(exception.PciDeviceWrongAddressFormat, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) def test_max_func(self): pci_info = (('{"address": "0000:0a:00.%s", ' + '"physical_network": "hr_net"}') % - (pci_devspec.MAX_FUNC + 1)) + (devspec.MAX_FUNC + 1)) exc = self.assertRaises(exception.PciDeviceInvalidAddressField, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) msg = ('Invalid PCI Whitelist: ' 'The PCI address 0000:0a:00.%s has an invalid function.' - % (pci_devspec.MAX_FUNC + 1)) + % (devspec.MAX_FUNC + 1)) self.assertEqual(msg, unicode(exc)) def test_max_domain(self): pci_info = ('{"address": "%x:0a:00.5", "physical_network":"hr_net"}' - % (pci_devspec.MAX_DOMAIN + 1)) + % (devspec.MAX_DOMAIN + 1)) exc = self.assertRaises(exception.PciConfigInvalidWhitelist, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) msg = ('Invalid PCI devices Whitelist config invalid domain %x' - % (pci_devspec.MAX_DOMAIN + 1)) + % (devspec.MAX_DOMAIN + 1)) self.assertEqual(msg, unicode(exc)) def test_max_bus(self): pci_info = ('{"address": "0000:%x:00.5", "physical_network":"hr_net"}' - % (pci_devspec.MAX_BUS + 1)) + % (devspec.MAX_BUS + 1)) exc = self.assertRaises(exception.PciConfigInvalidWhitelist, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) msg = ('Invalid PCI devices Whitelist config invalid bus %x' - % (pci_devspec.MAX_BUS + 1)) + % (devspec.MAX_BUS + 1)) self.assertEqual(msg, unicode(exc)) def test_max_slot(self): pci_info = ('{"address": "0000:0a:%x.5", "physical_network":"hr_net"}' - % (pci_devspec.MAX_SLOT + 1)) + % (devspec.MAX_SLOT + 1)) exc = self.assertRaises(exception.PciConfigInvalidWhitelist, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) msg = ('Invalid PCI devices Whitelist config invalid slot %x' - % (pci_devspec.MAX_SLOT + 1)) + % (devspec.MAX_SLOT + 1)) self.assertEqual(msg, unicode(exc)) def test_address_is_undefined(self): pci_info = '{"vendor_id":"8086", "product_id":"5057"}' - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertTrue(pci.match(dev)) def test_partial_address(self): pci_info = '{"address":":0a:00.", "physical_network":"hr_net"}' - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) dev = {"vendor_id": "1137", "product_id": "0071", "address": "0000:0a:00.5", "phys_function": "0000:0a:00.0"} self.assertTrue(pci.match(dev)) - @mock.patch('nova.pci.pci_utils.is_physical_function', return_value = True) + @mock.patch('nova.pci.utils.is_physical_function', return_value = True) def test_address_is_pf(self, mock_is_physical_function): pci_info = '{"address":"0000:0a:00.0", "physical_network":"hr_net"}' - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertTrue(pci.match(dev)) @@ -106,34 +106,34 @@ class PciDevSpecTestCase(test.NoDBTestCase): def test_spec_match(self): pci_info = ('{"vendor_id": "8086","address": "*: *: *.5",' + '"product_id": "5057", "physical_network": "hr_net"}') - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertTrue(pci.match(dev)) def test_invalid_vendor_id(self): pci_info = ('{"vendor_id": "8087","address": "*: *: *.5", ' + '"product_id": "5057", "physical_network": "hr_net"}') - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertFalse(pci.match(dev)) def test_vendor_id_out_of_range(self): pci_info = ('{"vendor_id": "80860", "address": "*:*:*.5", ' + '"product_id": "5057", "physical_network": "hr_net"}') exc = self.assertRaises(exception.PciConfigInvalidWhitelist, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) self.assertEqual("Invalid PCI devices Whitelist config " "invalid vendor_id 80860", unicode(exc)) def test_invalid_product_id(self): pci_info = ('{"vendor_id": "8086","address": "*: *: *.5", ' + '"product_id": "5056", "physical_network": "hr_net"}') - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertFalse(pci.match(dev)) def test_product_id_out_of_range(self): pci_info = ('{"vendor_id": "8086","address": "*:*:*.5", ' + '"product_id": "50570", "physical_network": "hr_net"}') exc = self.assertRaises(exception.PciConfigInvalidWhitelist, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) self.assertEqual("Invalid PCI devices Whitelist config " "invalid product_id 50570", unicode(exc)) @@ -141,28 +141,28 @@ class PciDevSpecTestCase(test.NoDBTestCase): pci_info = ('{"devname": "eth0", "vendor_id":"8086", ' + '"address":"*:*:*.5", "physical_network": "hr_net"}') self.assertRaises(exception.PciDeviceInvalidDeviceName, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) - @mock.patch('nova.pci.pci_utils.get_function_by_ifname', + @mock.patch('nova.pci.utils.get_function_by_ifname', return_value = ("0000:0a:00.0", True)) def test_by_name(self, mock_get_function_by_ifname): pci_info = '{"devname": "eth0", "physical_network": "hr_net"}' - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) self.assertTrue(pci.match(dev)) - @mock.patch('nova.pci.pci_utils.get_function_by_ifname', + @mock.patch('nova.pci.utils.get_function_by_ifname', return_value = (None, False)) def test_invalid_name(self, mock_get_function_by_ifname): pci_info = '{"devname": "lo", "physical_network": "hr_net"}' exc = self.assertRaises(exception.PciDeviceNotFoundById, - pci_devspec.PciDeviceSpec, pci_info) + devspec.PciDeviceSpec, pci_info) self.assertEqual('PCI device lo not found', unicode(exc)) def test_pci_obj(self): pci_info = ('{"vendor_id": "8086","address": "*:*:*.5", ' + '"product_id": "5057", "physical_network": "hr_net"}') - pci = pci_devspec.PciDeviceSpec(pci_info) + pci = devspec.PciDeviceSpec(pci_info) pci_dev = { 'compute_node_id': 1, 'address': '0000:00:00.5', @@ -172,5 +172,5 @@ class PciDevSpecTestCase(test.NoDBTestCase): 'extra_k1': 'v1', } - pci_obj = pci_device.PciDevice.create(pci_dev) + pci_obj = objects.PciDevice.create(pci_dev) self.assertTrue(pci.match_pci_obj(pci_obj)) diff --git a/nova/tests/pci/test_pci_manager.py b/nova/tests/pci/test_manager.py similarity index 97% rename from nova/tests/pci/test_pci_manager.py rename to nova/tests/pci/test_manager.py index 3c8cd6030b39..e37fd5b067f0 100644 --- a/nova/tests/pci/test_pci_manager.py +++ b/nova/tests/pci/test_manager.py @@ -23,11 +23,11 @@ from nova import context from nova import db from nova import exception from nova import objects -from nova.pci import pci_device -from nova.pci import pci_manager +from nova.pci import device +from nova.pci import manager from nova import test from nova.tests.api.openstack import fakes -from nova.tests.pci import pci_fakes +from nova.tests.pci import fakes as pci_fakes fake_pci = { @@ -111,7 +111,7 @@ class PciDevTrackerTestCase(test.TestCase): patcher = pci_fakes.fake_pci_whitelist() self.addCleanup(patcher.stop) self._create_fake_instance() - self.tracker = pci_manager.PciDevTracker(1) + self.tracker = manager.PciDevTracker(1) def test_pcidev_tracker_create(self): self.assertEqual(len(self.tracker.pci_devs), 3) @@ -122,7 +122,7 @@ class PciDevTrackerTestCase(test.TestCase): self.assertEqual(self.tracker.node_id, 1) def test_pcidev_tracker_create_no_nodeid(self): - self.tracker = pci_manager.PciDevTracker() + self.tracker = manager.PciDevTracker() self.assertEqual(len(self.tracker.pci_devs), 0) def test_set_hvdev_new_dev(self): @@ -260,13 +260,13 @@ class PciDevTrackerTestCase(test.TestCase): self.assertEqual(len(self.tracker.pci_devs), 3) dev = self.tracker.pci_devs[0] self.update_called = 0 - pci_device.remove(dev) + device.remove(dev) self.tracker.save(ctxt) self.assertEqual(len(self.tracker.pci_devs), 2) self.assertEqual(self.destroy_called, 1) def test_set_compute_node_id(self): - self.tracker = pci_manager.PciDevTracker() + self.tracker = manager.PciDevTracker() fake_pci_devs = [copy.deepcopy(fake_pci), copy.deepcopy(fake_pci_1), copy.deepcopy(fake_pci_2)] self.tracker.set_hvdevs(fake_pci_devs) @@ -360,5 +360,5 @@ class PciGetInstanceDevs(test.TestCase): self.stubs.Set(objects.Instance, 'obj_load_attr', _fake_obj_load_attr) self.load_attr_called = False - pci_manager.get_instance_pci_devs(inst) + manager.get_instance_pci_devs(inst) self.assertEqual(self.load_attr_called, True) diff --git a/nova/tests/pci/test_pci_request.py b/nova/tests/pci/test_request.py similarity index 91% rename from nova/tests/pci/test_pci_request.py rename to nova/tests/pci/test_request.py index 82568f8455c8..32c768b0c0c0 100644 --- a/nova/tests/pci/test_pci_request.py +++ b/nova/tests/pci/test_request.py @@ -16,7 +16,7 @@ """Tests for PCI request.""" from nova import exception -from nova.pci import pci_request as pci_request +from nova.pci import request from nova import test @@ -56,7 +56,7 @@ _fake_alias3 = """{ class AliasTestCase(test.NoDBTestCase): def test_good_alias(self): self.flags(pci_alias=[_fake_alias1]) - als = pci_request._get_alias_from_config() + als = request._get_alias_from_config() self.assertIsInstance(als['QuicAssist'], list) expect_dict = { "capability_type": "pci", @@ -68,7 +68,7 @@ class AliasTestCase(test.NoDBTestCase): def test_multispec_alias(self): self.flags(pci_alias=[_fake_alias1, _fake_alias11]) - als = pci_request._get_alias_from_config() + als = request._get_alias_from_config() self.assertIsInstance(als['QuicAssist'], list) expect_dict1 = { "capability_type": "pci", @@ -89,7 +89,7 @@ class AliasTestCase(test.NoDBTestCase): def test_wrong_type_aliase(self): self.flags(pci_alias=[_fake_alias2]) self.assertRaises(exception.PciInvalidAlias, - pci_request._get_alias_from_config) + request._get_alias_from_config) def test_wrong_product_id_aliase(self): self.flags(pci_alias=[ @@ -101,7 +101,7 @@ class AliasTestCase(test.NoDBTestCase): "device_type": "NIC" }"""]) self.assertRaises(exception.PciInvalidAlias, - pci_request._get_alias_from_config) + request._get_alias_from_config) def test_wrong_vendor_id_aliase(self): self.flags(pci_alias=[ @@ -113,7 +113,7 @@ class AliasTestCase(test.NoDBTestCase): "device_type": "NIC" }"""]) self.assertRaises(exception.PciInvalidAlias, - pci_request._get_alias_from_config) + request._get_alias_from_config) def test_wrong_cap_type_aliase(self): self.flags(pci_alias=[ @@ -125,7 +125,7 @@ class AliasTestCase(test.NoDBTestCase): "device_type": "NIC" }"""]) self.assertRaises(exception.PciInvalidAlias, - pci_request._get_alias_from_config) + request._get_alias_from_config) def test_dup_aliase(self): self.flags(pci_alias=[ @@ -145,7 +145,7 @@ class AliasTestCase(test.NoDBTestCase): }"""]) self.assertRaises( exception.PciInvalidAlias, - pci_request._get_alias_from_config) + request._get_alias_from_config) def _verify_result(self, expected, real): exp_real = zip(expected, real) @@ -169,7 +169,7 @@ class AliasTestCase(test.NoDBTestCase): 'capability_type': 'pci'}], 'alias_name': 'IntelNIC'}, ] - requests = pci_request._translate_alias_to_requests( + requests = request._translate_alias_to_requests( "QuicAssist : 3, IntelNIC: 1") self.assertEqual(set([p['count'] for p in requests]), set([1, 3])) self._verify_result(expect_request, requests) @@ -177,7 +177,7 @@ class AliasTestCase(test.NoDBTestCase): def test_aliase_2_request_invalid(self): self.flags(pci_alias=[_fake_alias1, _fake_alias3]) self.assertRaises(exception.PciRequestAliasNotDefined, - pci_request._translate_alias_to_requests, + request._translate_alias_to_requests, "QuicAssistX : 3") def test_get_pci_requests_from_flavor(self): @@ -197,7 +197,7 @@ class AliasTestCase(test.NoDBTestCase): flavor = {'extra_specs': {"pci_passthrough:alias": "QuicAssist:3, IntelNIC: 1"}} - requests = pci_request.get_pci_requests_from_flavor(flavor) + requests = request.get_pci_requests_from_flavor(flavor) self.assertEqual(set([1, 3]), set([p.count for p in requests.requests])) self._verify_result(expect_request, requests.requests) @@ -205,5 +205,5 @@ class AliasTestCase(test.NoDBTestCase): def test_get_pci_requests_from_flavor_no_extra_spec(self): self.flags(pci_alias=[_fake_alias1, _fake_alias3]) flavor = {} - requests = pci_request.get_pci_requests_from_flavor(flavor) + requests = request.get_pci_requests_from_flavor(flavor) self.assertEqual([], requests.requests) diff --git a/nova/tests/pci/test_pci_stats.py b/nova/tests/pci/test_stats.py similarity index 96% rename from nova/tests/pci/test_pci_stats.py rename to nova/tests/pci/test_stats.py index 2f830c6cfa18..9a4d1afd1d52 100644 --- a/nova/tests/pci/test_pci_stats.py +++ b/nova/tests/pci/test_stats.py @@ -18,10 +18,10 @@ from oslo.serialization import jsonutils from nova import exception from nova import objects -from nova.pci import pci_stats as pci -from nova.pci import pci_whitelist +from nova.pci import stats +from nova.pci import whitelist from nova import test -from nova.tests.pci import pci_fakes +from nova.tests.pci import fakes fake_pci_1 = { 'compute_node_id': 1, @@ -65,9 +65,9 @@ class PciDeviceStatsTestCase(test.NoDBTestCase): def setUp(self): super(PciDeviceStatsTestCase, self).setUp() - self.pci_stats = pci.PciDeviceStats() + self.pci_stats = stats.PciDeviceStats() # The following two calls need to be made before adding the devices. - patcher = pci_fakes.fake_pci_whitelist() + patcher = fakes.fake_pci_whitelist() self.addCleanup(patcher.stop) self._create_fake_devs() @@ -92,7 +92,7 @@ class PciDeviceStatsTestCase(test.NoDBTestCase): def test_json_creat(self): m = jsonutils.dumps(self.pci_stats) - new_stats = pci.PciDeviceStats(m) + new_stats = stats.PciDeviceStats(m) self.assertEqual(len(new_stats.pools), 2) self.assertEqual(set([d['count'] for d in new_stats]), @@ -141,19 +141,19 @@ class PciDeviceStatsTestCase(test.NoDBTestCase): pci_requests_multiple) -@mock.patch.object(pci_whitelist, 'get_pci_devices_filter') +@mock.patch.object(whitelist, 'get_pci_devices_filter') class PciDeviceStatsWithTagsTestCase(test.NoDBTestCase): def setUp(self): super(PciDeviceStatsWithTagsTestCase, self).setUp() - self.pci_stats = pci.PciDeviceStats() + self.pci_stats = stats.PciDeviceStats() self._create_whitelist() def _create_whitelist(self): white_list = ['{"vendor_id":"1137","product_id":"0071",' '"address":"*:0a:00.*","physical_network":"physnet1"}', '{"vendor_id":"1137","product_id":"0072"}'] - self.pci_wlist = pci_whitelist.PciHostDevicesWhiteList(white_list) + self.pci_wlist = whitelist.PciHostDevicesWhiteList(white_list) def _create_pci_devices(self): self.pci_tagged_devices = [] diff --git a/nova/tests/pci/test_pci_utils.py b/nova/tests/pci/test_utils.py similarity index 81% rename from nova/tests/pci/test_pci_utils.py rename to nova/tests/pci/test_utils.py index d904dc925406..77a0ce24f5e0 100644 --- a/nova/tests/pci/test_pci_utils.py +++ b/nova/tests/pci/test_utils.py @@ -15,7 +15,7 @@ # under the License. from nova import exception -from nova.pci import pci_utils +from nova.pci import utils from nova import test @@ -26,36 +26,36 @@ class PciDeviceMatchTestCase(test.NoDBTestCase): 'device_id': 'd1'} def test_single_spec_match(self): - self.assertTrue(pci_utils.pci_device_prop_match( + self.assertTrue(utils.pci_device_prop_match( self.fake_pci_1, [{'vendor_id': 'v1', 'device_id': 'd1'}])) def test_multiple_spec_match(self): - self.assertTrue(pci_utils.pci_device_prop_match( + self.assertTrue(utils.pci_device_prop_match( self.fake_pci_1, [{'vendor_id': 'v1', 'device_id': 'd1'}, {'vendor_id': 'v3', 'device_id': 'd3'}])) def test_spec_dismatch(self): - self.assertFalse(pci_utils.pci_device_prop_match( + self.assertFalse(utils.pci_device_prop_match( self.fake_pci_1, [{'vendor_id': 'v4', 'device_id': 'd4'}, {'vendor_id': 'v3', 'device_id': 'd3'}])) def test_spec_extra_key(self): - self.assertFalse(pci_utils.pci_device_prop_match( + self.assertFalse(utils.pci_device_prop_match( self.fake_pci_1, [{'vendor_id': 'v1', 'device_id': 'd1', 'wrong_key': 'k1'}])) class PciDeviceAddressParserTestCase(test.NoDBTestCase): def test_parse_address(self): - self.parse_result = pci_utils.parse_address("0000:04:12.6") + self.parse_result = utils.parse_address("0000:04:12.6") self.assertEqual(self.parse_result, ('0000', '04', '12', '6')) def test_parse_address_wrong(self): self.assertRaises(exception.PciDeviceWrongAddressFormat, - pci_utils.parse_address, "0000:04.12:6") + utils.parse_address, "0000:04.12:6") def test_parse_address_invalid_character(self): self.assertRaises(exception.PciDeviceWrongAddressFormat, - pci_utils.parse_address, "0000:h4.12:6") + utils.parse_address, "0000:h4.12:6") diff --git a/nova/tests/pci/test_pci_whitelist.py b/nova/tests/pci/test_whitelist.py similarity index 84% rename from nova/tests/pci/test_pci_whitelist.py rename to nova/tests/pci/test_whitelist.py index 01b753d74532..cb5891dffb24 100644 --- a/nova/tests/pci/test_pci_whitelist.py +++ b/nova/tests/pci/test_whitelist.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.pci import pci_whitelist +from nova.pci import whitelist from nova import test @@ -30,28 +30,28 @@ dev_dict = { class PciHostDevicesWhiteListTestCase(test.NoDBTestCase): def test_whitelist(self): white_list = '{"product_id":"0001", "vendor_id":"8086"}' - parsed = pci_whitelist.PciHostDevicesWhiteList([white_list]) + parsed = whitelist.PciHostDevicesWhiteList([white_list]) self.assertEqual(1, len(parsed.specs)) def test_whitelist_empty(self): - parsed = pci_whitelist.PciHostDevicesWhiteList() + parsed = whitelist.PciHostDevicesWhiteList() self.assertFalse(parsed.device_assignable(dev_dict)) def test_whitelist_multiple(self): wl1 = '{"product_id":"0001", "vendor_id":"8086"}' wl2 = '{"product_id":"0002", "vendor_id":"8087"}' - parsed = pci_whitelist.PciHostDevicesWhiteList([wl1, wl2]) + parsed = whitelist.PciHostDevicesWhiteList([wl1, wl2]) self.assertEqual(2, len(parsed.specs)) def test_device_assignable(self): white_list = '{"product_id":"0001", "vendor_id":"8086"}' - parsed = pci_whitelist.PciHostDevicesWhiteList([white_list]) + parsed = whitelist.PciHostDevicesWhiteList([white_list]) self.assertIsNotNone(parsed.device_assignable(dev_dict)) def test_device_assignable_multiple(self): white_list_1 = '{"product_id":"0001", "vendor_id":"8086"}' white_list_2 = '{"product_id":"0002", "vendor_id":"8087"}' - parsed = pci_whitelist.PciHostDevicesWhiteList( + parsed = whitelist.PciHostDevicesWhiteList( [white_list_1, white_list_2]) self.assertIsNotNone(parsed.device_assignable(dev_dict)) dev_dict1 = dev_dict.copy() @@ -62,5 +62,5 @@ class PciHostDevicesWhiteListTestCase(test.NoDBTestCase): def test_get_pci_devices_filter(self): white_list_1 = '{"product_id":"0001", "vendor_id":"8086"}' self.flags(pci_passthrough_whitelist=[white_list_1]) - pci_filter = pci_whitelist.get_pci_devices_filter() + pci_filter = whitelist.get_pci_devices_filter() self.assertIsNotNone(pci_filter.device_assignable(dev_dict)) diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 5bd4d2c1f479..608431631843 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -30,7 +30,7 @@ from nova import context from nova import db from nova import objects from nova.objects import base as obj_base -from nova.pci import pci_stats +from nova.pci import stats as pci_stats from nova.scheduler import filters from nova.scheduler.filters import extra_specs_ops from nova.scheduler.filters import ram_filter diff --git a/nova/tests/virt/libvirt/test_driver.py b/nova/tests/virt/libvirt/test_driver.py index 5d2c6e0df36c..c3cc440a0838 100644 --- a/nova/tests/virt/libvirt/test_driver.py +++ b/nova/tests/virt/libvirt/test_driver.py @@ -57,7 +57,7 @@ from nova.openstack.common import lockutils from nova.openstack.common import loopingcall from nova.openstack.common import processutils from nova.openstack.common import uuidutils -from nova.pci import pci_manager +from nova.pci import manager as pci_manager from nova import test from nova.tests import fake_block_device from nova.tests import fake_instance @@ -7560,7 +7560,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): block_device_info) @mock.patch('nova.openstack.common.loopingcall.FixedIntervalLoopingCall') - @mock.patch('nova.pci.pci_manager.get_instance_pci_devs') + @mock.patch('nova.pci.manager.get_instance_pci_devs') @mock.patch('nova.virt.libvirt.LibvirtDriver._prepare_pci_devices_for_use') @mock.patch('nova.virt.libvirt.LibvirtDriver._create_domain_and_network') @mock.patch('nova.virt.libvirt.LibvirtDriver._create_images_and_backing') diff --git a/nova/tests/virt/xenapi/test_vmops.py b/nova/tests/virt/xenapi/test_vmops.py index b77e05e28bad..4614c0dfe3bb 100644 --- a/nova/tests/virt/xenapi/test_vmops.py +++ b/nova/tests/virt/xenapi/test_vmops.py @@ -21,7 +21,7 @@ from nova.compute import task_states from nova import context from nova import exception from nova import objects -from nova.pci import pci_manager +from nova.pci import manager as pci_manager from nova import test from nova.tests import fake_instance from nova.tests.virt.xenapi import stubs diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py index 994f49feb49e..c0a2329e5a77 100644 --- a/nova/virt/libvirt/config.py +++ b/nova/virt/libvirt/config.py @@ -30,7 +30,7 @@ from oslo.utils import units from nova import exception from nova.openstack.common import log as logging -from nova.pci import pci_utils +from nova.pci import utils as pci_utils from nova.virt import hardware diff --git a/nova/virt/libvirt/designer.py b/nova/virt/libvirt/designer.py index 8ed55a256494..879db744c789 100644 --- a/nova/virt/libvirt/designer.py +++ b/nova/virt/libvirt/designer.py @@ -19,7 +19,7 @@ This module provides helper APIs for populating the config.py classes based on common operational needs / policies """ -from nova.pci import pci_utils +from nova.pci import utils as pci_utils def set_vif_guest_frontend_config(conf, mac, model, driver): diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index ca1cb7036ded..f901c6470e15 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -81,9 +81,9 @@ from nova.openstack.common import fileutils from nova.openstack.common import log as logging from nova.openstack.common import loopingcall from nova.openstack.common import processutils -from nova.pci import pci_manager -from nova.pci import pci_utils -from nova.pci import pci_whitelist +from nova.pci import manager as pci_manager +from nova.pci import utils as pci_utils +from nova.pci import whitelist as pci_whitelist from nova import rpc from nova import utils from nova import version diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index a61debbf34f7..264c452d338c 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -32,7 +32,7 @@ from nova import exception from nova.i18n import _ from nova import objects from nova.openstack.common import log as logging -from nova.pci import pci_whitelist +from nova.pci import whitelist as pci_whitelist from nova.virt.xenapi import pool_states from nova.virt.xenapi import vm_utils diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index ca6271ebaa70..13a599e53c86 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -45,7 +45,7 @@ from nova import exception from nova.i18n import _ from nova import objects from nova.openstack.common import log as logging -from nova.pci import pci_manager +from nova.pci import manager as pci_manager from nova import utils from nova.virt import configdrive from nova.virt import driver as virt_driver