Fix nova/pci direct use of object modules

This replaces all uses of nova.objects.<module>.<object> with
nova.objects.<object> within nova/pci and nova/tests/pci.

Change-Id: I72e763fb5032a5dc2cf649e5e29213ea71578c8d
Partial-Blueprint: object-subclassing

nova/pci/pci_manager.py

@@ -21,8 +21,7 @@ from nova.compute import vm_states
 from nova import context
 from nova import exception
 from nova.i18n import _
-from nova.objects import instance
-from nova.objects import pci_device as pci_device_obj
+from nova import objects
 from nova.openstack.common import log as logging
 from nova.pci import pci_device
 from nova.pci import pci_request
@@ -58,8 +57,7 @@ class PciDevTracker(object):
         self.stats = pci_stats.PciDeviceStats()
         if node_id:
             self.pci_devs = list(
-                pci_device_obj.PciDeviceList.get_by_compute_node(
-                    context, node_id))
+                objects.PciDeviceList.get_by_compute_node(context, node_id))
         else:
             self.pci_devs = []
         self._initial_instance_usage()
@@ -189,7 +187,7 @@ class PciDevTracker(object):
         for dev in [dev for dev in devices if
                     dev['address'] in new_addrs - exist_addrs]:
             dev['compute_node_id'] = self.node_id
-            dev_obj = pci_device_obj.PciDevice.create(dev)
+            dev_obj = objects.PciDevice.create(dev)
             self.pci_devs.append(dev_obj)
             self.stats.add_device(dev_obj)
 
@@ -314,9 +312,9 @@ class PciDevTracker(object):
 
 def get_instance_pci_devs(inst):
     """Get the devices assigned to the instances."""
-    if isinstance(inst, instance.Instance):
+    if isinstance(inst, objects.Instance):
         return inst.pci_devices
     else:
         ctxt = context.get_admin_context()
-        return pci_device_obj.PciDeviceList.get_by_instance_uuid(
+        return objects.PciDeviceList.get_by_instance_uuid(
             ctxt, inst['uuid'])

nova/tests/pci/test_pci_manager.py

@@ -21,7 +21,6 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import objects
-from nova.objects import pci_device as pci_device_obj
 from nova.pci import pci_device
 from nova.pci import pci_manager
 from nova.pci import pci_request
@@ -75,7 +74,7 @@ class PciDevTrackerTestCase(test.TestCase):
     def _create_fake_instance(self):
         self.inst = objects.Instance()
         self.inst.uuid = 'fake-inst-uuid'
-        self.inst.pci_devices = pci_device_obj.PciDeviceList()
+        self.inst.pci_devices = objects.PciDeviceList()
         self.inst.vm_state = vm_states.ACTIVE
         self.inst.task_state = None
 
@@ -334,7 +333,7 @@ class PciGetInstanceDevs(test.TestCase):
         def _fake_obj_load_attr(foo, attrname):
             if attrname == 'pci_devices':
                 self.load_attr_called = True
-                foo.pci_devices = pci_device_obj.PciDeviceList()
+                foo.pci_devices = objects.PciDeviceList()
 
         inst = fakes.stub_instance(id='1')
         ctxt = context.get_admin_context()

nova/tests/pci/test_pci_stats.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from nova import exception
-from nova.objects import pci_device
+from nova import objects
 from nova.openstack.common import jsonutils
 from nova.pci import pci_stats as pci
 from nova import test
@@ -51,9 +51,9 @@ pci_requests_multiple = [{'count': 1,
 
 class PciDeviceStatsTestCase(test.NoDBTestCase):
     def _create_fake_devs(self):
-        self.fake_dev_1 = pci_device.PciDevice.create(fake_pci_1)
-        self.fake_dev_2 = pci_device.PciDevice.create(fake_pci_2)
-        self.fake_dev_3 = pci_device.PciDevice.create(fake_pci_3)
+        self.fake_dev_1 = objects.PciDevice.create(fake_pci_1)
+        self.fake_dev_2 = objects.PciDevice.create(fake_pci_2)
+        self.fake_dev_3 = objects.PciDevice.create(fake_pci_3)
 
         map(self.pci_stats.add_device,
             [self.fake_dev_1, self.fake_dev_2, self.fake_dev_3])

nova/tests/pci/test_pci_whitelist.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from nova import exception
-from nova.objects import pci_device
+from nova import objects
 from nova.pci import pci_whitelist
 from nova import test
 
@@ -59,7 +59,7 @@ class PciHostDevicesWhiteListTestCase(test.NoDBTestCase):
                                         'product_id': '0001'}])
 
     def test_whitelist_empty(self):
-        dev = pci_device.PciDevice.create(dev_dict)
+        dev = objects.PciDevice.create(dev_dict)
         parsed = pci_whitelist.PciHostDevicesWhiteList()
         self.assertEqual(parsed.device_assignable(dev), False)
 
@@ -73,13 +73,13 @@ class PciHostDevicesWhiteListTestCase(test.NoDBTestCase):
                          {'vendor_id': '8087', 'product_id': '0002'}])
 
     def test_device_assignable(self):
-        dev = pci_device.PciDevice.create(dev_dict)
+        dev = objects.PciDevice.create(dev_dict)
         white_list = '[{"product_id":"0001", "vendor_id":"8086"}]'
         parsed = pci_whitelist.PciHostDevicesWhiteList([white_list])
         self.assertEqual(parsed.device_assignable(dev), True)
 
     def test_device_assignable_multiple(self):
-        dev = pci_device.PciDevice.create(dev_dict)
+        dev = objects.PciDevice.create(dev_dict)
         white_list_1 = '[{"product_id":"0001", "vendor_id":"8086"}]'
         white_list_2 = '[{"product_id":"0002", "vendor_id":"8087"}]'
         parsed = pci_whitelist.PciHostDevicesWhiteList(
@@ -93,5 +93,5 @@ class PciHostDevicesWhiteListTestCase(test.NoDBTestCase):
         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()
-        dev = pci_device.PciDevice.create(dev_dict)
+        dev = objects.PciDevice.create(dev_dict)
         self.assertEqual(pci_filter.device_assignable(dev), True)