Merge "trivial: Move __init__ function"

This commit is contained in:
Zuul 2018-02-16 16:28:42 +00:00 committed by Gerrit Code Review
commit f79d040028

View File

@ -25,15 +25,33 @@ CONF = nova.conf.CONF
class Whitelist(object):
"""White list class to represent assignable pci devices.
Not all devices on a compute node can be assigned to a guest. The
cloud administrator decides which devices can be assigned
based on vendor_id or product_id, etc. If no white list is specified,
no devices will be assignable.
Not all devices on a compute node can be assigned to a guest. The cloud
administrator decides which devices can be assigned based on ``vendor_id``
or ``product_id``, etc. If no white list is specified, no devices will be
assignable.
"""
def __init__(self, whitelist_spec=None):
"""White list constructor
For example, the following json string specifies that devices whose
vendor_id is '8086' and product_id is '1520' can be assigned
to guests. ::
'[{"product_id":"1520", "vendor_id":"8086"}]'
:param whitelist_spec: A JSON string for a dictionary or list thereof.
Each dictionary specifies the pci device properties requirement.
See the definition of ``passthrough_whitelist`` in
``nova.conf.pci`` for details and examples.
"""
if whitelist_spec:
self.specs = self._parse_white_list_from_config(whitelist_spec)
else:
self.specs = []
@staticmethod
def _parse_white_list_from_config(whitelists):
"""Parse and validate the pci whitelist from the nova config."""
@ -62,26 +80,6 @@ class Whitelist(object):
return specs
def __init__(self, whitelist_spec=None):
"""White list constructor
For example, the following json string specifies that devices whose
vendor_id is '8086' and product_id is '1520' can be assigned
to guests.
'[{"product_id":"1520", "vendor_id":"8086"}]'
:param whitelist_spec: A json string for a dictionary or list thereof.
Each dictionary specifies the pci device
properties requirement. See the definition of
passthrough_whitelist in nova.conf.pci for
details and examples.
"""
super(Whitelist, self).__init__()
if whitelist_spec:
self.specs = self._parse_white_list_from_config(whitelist_spec)
else:
self.specs = []
def device_assignable(self, dev):
"""Check if a device can be assigned to a guest.