openstack
/
nova
Code Issues Proposed changes

tests: Don't reinvent __init__ 

The HostPciSRIOVDevicesInfo test object provided a 'create_pci_devices'
function that did what '__init__' usually does. Adopt the principle of
least suprise and just use '__init__' directly.

Change-Id: I7723cfb6a2d2699d809739a4b03c46a300222897
This commit is contained in:
Stephen Finucane 2016-11-24 15:35:05 +00:00
parent 35e4b149b6
commit 33fbf35b21
3 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/functional/libvirt/test_pci_sriov_servers.py
View File

@ -161,7 +161,6 @@ class SRIOVServersTest(ServersTestBase):
host_info = NumaHostInfo(cpu_nodes=2, cpu_sockets=1, cpu_cores=2,
cpu_threads=2, kB_mem=15740000)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices()
fake_connection = self._get_connection(host_info, pci_info)
# Create a flavor
@ -185,7 +184,6 @@ class SRIOVServersTest(ServersTestBase):
host_info = NumaHostInfo(cpu_nodes=2, cpu_sockets=1, cpu_cores=2,
cpu_threads=2, kB_mem=15740000)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices()
fake_connection = self._get_connection(host_info, pci_info)
# Create a flavor
@ -208,8 +206,7 @@ class SRIOVServersTest(ServersTestBase):
host_info = NumaHostInfo(cpu_nodes=2, cpu_sockets=1, cpu_cores=2,
cpu_threads=2, kB_mem=15740000)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices(num_pfs=1, num_vfs=4)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo(num_pfs=1, num_vfs=4)
fake_connection = self._get_connection(host_info, pci_info)
# Create a flavor
@ -239,8 +236,7 @@ class SRIOVServersTest(ServersTestBase):
host_info = NumaHostInfo(cpu_nodes=2, cpu_sockets=1, cpu_cores=2,
cpu_threads=2, kB_mem=15740000)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices(num_pfs=1, num_vfs=4)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo(num_pfs=1, num_vfs=4)
fake_connection = self._get_connection(host_info, pci_info)
# Create a flavor
@ -273,8 +269,7 @@ class SRIOVServersTest(ServersTestBase):
host_info = NumaHostInfo(cpu_nodes=2, cpu_sockets=1, cpu_cores=2,
cpu_threads=2, kB_mem=15740000)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices(num_pfs=1, numa_node=1)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo(num_pfs=1, numa_node=1)
fake_connection = self._get_connection(host_info, pci_info)
# Create a flavor
@ -303,8 +298,7 @@ class SRIOVServersTest(ServersTestBase):
host_info = NumaHostInfo(cpu_nodes=2, cpu_sockets=1, cpu_cores=2,
cpu_threads=2, kB_mem=15740000)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices(num_pfs=1, numa_node=0)
pci_info = fakelibvirt.HostPciSRIOVDevicesInfo(num_pfs=1, numa_node=0)
fake_connection = self._get_connection(host_info, pci_info)
# Create a flavor

42
nova/tests/unit/virt/libvirt/fakelibvirt.py
View File

@ -237,14 +237,11 @@ class FakePciDevice(object):
class HostPciSRIOVDevicesInfo(object):
"""Represent a pool of host SR-IOV devices."""
def __init__(self):
self.sriov_devices = {}
def create_pci_devices(self, vf_product_id=1515, pf_product_id=1528,
num_pfs=2, num_vfs=8, group=47, numa_node=None,
total_numa_nodes=2):
"""Populate pci devices
def __init__(self, vf_product_id=1515, pf_product_id=1528, num_pfs=2,
num_vfs=8, group=47, numa_node=None, total_numa_nodes=2):
"""Create a new HostPciSRIOVDevicesInfo object.
:param vf_product_id: (int) Product ID of the Virtual Functions
:param pf_product_id=1528: (int) Product ID of the Physical Functions
@ -258,38 +255,42 @@ class HostPciSRIOVDevicesInfo(object):
def _calc_numa_node(dev):
return dev % total_numa_nodes if numa_node is None else numa_node
vf_ratio = num_vfs // num_pfs
self.devices = {}
if num_vfs and not num_pfs:
raise ValueError('Cannot create VFs without PFs')
vf_ratio = num_vfs // num_pfs if num_pfs else 0
# Generate PFs
for dev in range(num_pfs):
dev_group = group + dev + 1
pci_dev_name = 'pci_0000_81_%(slot)s_%(dev)d' % {'slot': PF_SLOT,
'dev': dev}
self.sriov_devices[pci_dev_name] = FakePciDevice('PF', vf_ratio,
dev_group, dev,
pf_product_id,
_calc_numa_node(dev))
self.devices[pci_dev_name] = FakePciDevice('PF', vf_ratio,
dev_group, dev,
pf_product_id,
_calc_numa_node(dev))
# Generate VFs
for dev in range(num_vfs):
dev_group = group + dev + 1
pci_dev_name = 'pci_0000_81_%(slot)s_%(dev)d' % {'slot': VF_SLOT,
'dev': dev}
self.sriov_devices[pci_dev_name] = FakePciDevice('VF', vf_ratio,
dev_group, dev,
vf_product_id,
_calc_numa_node(dev))
self.devices[pci_dev_name] = FakePciDevice('VF', vf_ratio,
dev_group, dev,
vf_product_id,
_calc_numa_node(dev))
def get_all_devices(self):
return self.sriov_devices.keys()
return self.devices.keys()
def get_device_by_name(self, device_name):
pci_dev = self.sriov_devices.get(device_name)
pci_dev = self.devices.get(device_name)
return pci_dev
class HostInfo(object):
def __init__(self, arch=obj_fields.Architecture.X86_64, kB_mem=4096,
cpus=2, cpu_mhz=800, cpu_nodes=1,
cpu_sockets=1, cpu_cores=2,
@ -971,7 +972,8 @@ class Connection(object):
self.fakeLibVersion = version
self.fakeVersion = hv_version
self.host_info = host_info or HostInfo()
self.pci_info = pci_info or HostPciSRIOVDevicesInfo()
self.pci_info = pci_info or HostPciSRIOVDevicesInfo(num_pfs=0,
num_vfs=0)
def _add_filter(self, nwfilter):
self._nwfilters[nwfilter._name] = nwfilter

3
nova/tests/unit/virt/libvirt/test_fakelibvirt.py
View File

@ -467,8 +467,7 @@ class FakeLibvirtTests(test.NoDBTestCase):
</device>"""
# create fake pci devices
pci_info = libvirt.HostPciSRIOVDevicesInfo()
pci_info.create_pci_devices(num_pfs=1, num_vfs=1)
pci_info = libvirt.HostPciSRIOVDevicesInfo(num_pfs=1, num_vfs=1)
# generate xml for the created pci devices
gen_pf = pci_info.get_device_by_name('pci_0000_81_00_0')