openstack/nova
Code Issues Proposed changes

Merge "Changed NUMACell to InstanceNUMACell in test_stats.py"

Browse Source
This commit is contained in:
Jenkins 2017-01-04 17:43:54 +00:00 committed by Gerrit Code Review
commit 190d759274
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nova/tests/unit/pci/test_stats.py
View File

@ -169,37 +169,34 @@ class PciDeviceStatsTestCase(test.NoDBTestCase):
pci_requests_multiple)) pci_requests_multiple))
def test_support_requests_numa(self): def test_support_requests_numa(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0), cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0),
objects.NUMACell(id=1, cpuset=set(), memory=0)] objects.InstanceNUMACell(id=1, cpuset=set(), memory=0)]
self.assertTrue(self.pci_stats.support_requests( self.assertTrue(self.pci_stats.support_requests(pci_requests, cells))
pci_requests, cells))
def test_support_requests_numa_failed(self): def test_support_requests_numa_failed(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)] cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
self.assertFalse(self.pci_stats.support_requests( self.assertFalse(self.pci_stats.support_requests(pci_requests, cells))
pci_requests, cells))
def test_support_requests_no_numa_info(self): def test_support_requests_no_numa_info(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)] cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
pci_request = [objects.InstancePCIRequest(count=1, pci_request = [objects.InstancePCIRequest(count=1,
spec=[{'vendor_id': 'v3'}])] spec=[{'vendor_id': 'v3'}])]
self.assertTrue(self.pci_stats.support_requests( self.assertTrue(self.pci_stats.support_requests(pci_request, cells))
pci_request, cells))
def test_consume_requests_numa(self): def test_consume_requests_numa(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0), cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0),
objects.NUMACell(id=1, cpuset=set(), memory=0)] objects.InstanceNUMACell(id=1, cpuset=set(), memory=0)]
devs = self.pci_stats.consume_requests(pci_requests, cells) devs = self.pci_stats.consume_requests(pci_requests, cells)
self.assertEqual(2, len(devs)) self.assertEqual(2, len(devs))
self.assertEqual(set(['v1', 'v2']), self.assertEqual(set(['v1', 'v2']),
set([dev.vendor_id for dev in devs])) set([dev.vendor_id for dev in devs]))
def test_consume_requests_numa_failed(self): def test_consume_requests_numa_failed(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)] cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
self.assertIsNone(self.pci_stats.consume_requests(pci_requests, cells)) self.assertIsNone(self.pci_stats.consume_requests(pci_requests, cells))
def test_consume_requests_no_numa_info(self): def test_consume_requests_no_numa_info(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)] cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
pci_request = [objects.InstancePCIRequest(count=1, pci_request = [objects.InstancePCIRequest(count=1,
spec=[{'vendor_id': 'v3'}])] spec=[{'vendor_id': 'v3'}])]
devs = self.pci_stats.consume_requests(pci_request, cells) devs = self.pci_stats.consume_requests(pci_request, cells)