88e21d8e5e
Read port info to extract the trusted tag from binding profile then set it in the request spec. The test_create_pci_requests_for_sriov_ports test is updated and re-written in mock. Implements blueprint sriov-trusted-vfs Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> Change-Id: Iaea17b7a02d53463d2b815bdc5f4e83e422188eb
222 lines
7.0 KiB
Python
222 lines
7.0 KiB
Python
# Copyright 2013 Intel Corporation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
""" Example of a PCI alias::
|
|
|
|
| [pci]
|
|
| alias = '{
|
|
| "name": "QuickAssist",
|
|
| "product_id": "0443",
|
|
| "vendor_id": "8086",
|
|
| "device_type": "type-PCI",
|
|
| "numa_policy": "legacy"
|
|
| }'
|
|
|
|
Aliases with the same name, device_type and numa_policy are ORed::
|
|
|
|
| [pci]
|
|
| alias = '{
|
|
| "name": "QuickAssist",
|
|
| "product_id": "0442",
|
|
| "vendor_id": "8086",
|
|
| "device_type": "type-PCI",
|
|
| }'
|
|
|
|
These two aliases define a device request meaning: vendor_id is "8086" and
|
|
product_id is "0442" or "0443".
|
|
"""
|
|
|
|
import jsonschema
|
|
from oslo_serialization import jsonutils
|
|
import six
|
|
|
|
import nova.conf
|
|
from nova import exception
|
|
from nova.i18n import _
|
|
from nova.network import model as network_model
|
|
from nova import objects
|
|
from nova.objects import fields as obj_fields
|
|
from nova.pci import utils
|
|
|
|
PCI_NET_TAG = 'physical_network'
|
|
PCI_TRUSTED_TAG = 'trusted'
|
|
PCI_DEVICE_TYPE_TAG = 'dev_type'
|
|
|
|
DEVICE_TYPE_FOR_VNIC_TYPE = {
|
|
network_model.VNIC_TYPE_DIRECT_PHYSICAL: obj_fields.PciDeviceType.SRIOV_PF
|
|
}
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
_ALIAS_CAP_TYPE = ['pci']
|
|
_ALIAS_SCHEMA = {
|
|
"type": "object",
|
|
"additionalProperties": False,
|
|
"properties": {
|
|
"name": {
|
|
"type": "string",
|
|
"minLength": 1,
|
|
"maxLength": 256,
|
|
},
|
|
# TODO(stephenfin): This isn't used anywhere outside of tests and
|
|
# should probably be removed.
|
|
"capability_type": {
|
|
"type": "string",
|
|
"enum": _ALIAS_CAP_TYPE,
|
|
},
|
|
"product_id": {
|
|
"type": "string",
|
|
"pattern": utils.PCI_VENDOR_PATTERN,
|
|
},
|
|
"vendor_id": {
|
|
"type": "string",
|
|
"pattern": utils.PCI_VENDOR_PATTERN,
|
|
},
|
|
"device_type": {
|
|
"type": "string",
|
|
"enum": list(obj_fields.PciDeviceType.ALL),
|
|
},
|
|
"numa_policy": {
|
|
"type": "string",
|
|
"enum": list(obj_fields.PCINUMAAffinityPolicy.ALL),
|
|
},
|
|
},
|
|
"required": ["name"],
|
|
}
|
|
|
|
|
|
def _get_alias_from_config():
|
|
"""Parse and validate PCI aliases from the nova config.
|
|
|
|
:returns: A dictionary where the keys are device names and the values are
|
|
tuples of form ``(specs, numa_policy)``. ``specs`` is a list of PCI
|
|
device specs, while ``numa_policy`` describes the required NUMA
|
|
affinity of the device(s).
|
|
:raises: exception.PciInvalidAlias if two aliases with the same name have
|
|
different device types or different NUMA policies.
|
|
"""
|
|
jaliases = CONF.pci.alias
|
|
aliases = {} # map alias name to alias spec list
|
|
try:
|
|
for jsonspecs in jaliases:
|
|
spec = jsonutils.loads(jsonspecs)
|
|
jsonschema.validate(spec, _ALIAS_SCHEMA)
|
|
|
|
name = spec.pop('name').strip()
|
|
numa_policy = spec.pop('numa_policy', None)
|
|
if not numa_policy:
|
|
numa_policy = obj_fields.PCINUMAAffinityPolicy.LEGACY
|
|
|
|
dev_type = spec.pop('device_type', None)
|
|
if dev_type:
|
|
spec['dev_type'] = dev_type
|
|
|
|
if name not in aliases:
|
|
aliases[name] = (numa_policy, [spec])
|
|
continue
|
|
|
|
if aliases[name][0] != numa_policy:
|
|
reason = _("NUMA policy mismatch for alias '%s'") % name
|
|
raise exception.PciInvalidAlias(reason=reason)
|
|
|
|
if aliases[name][1][0]['dev_type'] != spec['dev_type']:
|
|
reason = _("Device type mismatch for alias '%s'") % name
|
|
raise exception.PciInvalidAlias(reason=reason)
|
|
|
|
aliases[name][1].append(spec)
|
|
except exception.PciInvalidAlias:
|
|
raise
|
|
except jsonschema.exceptions.ValidationError as exc:
|
|
raise exception.PciInvalidAlias(reason=exc.message)
|
|
except Exception as exc:
|
|
raise exception.PciInvalidAlias(reason=six.text_type(exc))
|
|
|
|
return aliases
|
|
|
|
|
|
def _translate_alias_to_requests(alias_spec):
|
|
"""Generate complete pci requests from pci aliases in extra_spec."""
|
|
pci_aliases = _get_alias_from_config()
|
|
|
|
pci_requests = []
|
|
for name, count in [spec.split(':') for spec in alias_spec.split(',')]:
|
|
name = name.strip()
|
|
if name not in pci_aliases:
|
|
raise exception.PciRequestAliasNotDefined(alias=name)
|
|
|
|
count = int(count)
|
|
numa_policy, spec = pci_aliases[name]
|
|
|
|
pci_requests.append(objects.InstancePCIRequest(
|
|
count=count,
|
|
spec=spec,
|
|
alias_name=name,
|
|
numa_policy=numa_policy))
|
|
return pci_requests
|
|
|
|
|
|
def get_pci_requests_from_flavor(flavor):
|
|
"""Validate and return PCI requests.
|
|
|
|
The ``pci_passthrough:alias`` extra spec describes the flavor's PCI
|
|
requests. The extra spec's value is a comma-separated list of format
|
|
``alias_name_x:count, alias_name_y:count, ... ``, where ``alias_name`` is
|
|
defined in ``pci.alias`` configurations.
|
|
|
|
The flavor's requirement is translated into a PCI requests list. Each
|
|
entry in the list is an instance of nova.objects.InstancePCIRequests with
|
|
four keys/attributes.
|
|
|
|
- 'spec' states the PCI device properties requirement
|
|
- 'count' states the number of devices
|
|
- 'alias_name' (optional) is the corresponding alias definition name
|
|
- 'numa_policy' (optional) states the required NUMA affinity of the devices
|
|
|
|
For example, assume alias configuration is::
|
|
|
|
{
|
|
'vendor_id':'8086',
|
|
'device_id':'1502',
|
|
'name':'alias_1'
|
|
}
|
|
|
|
While flavor extra specs includes::
|
|
|
|
'pci_passthrough:alias': 'alias_1:2'
|
|
|
|
The returned ``pci_requests`` are::
|
|
|
|
[{
|
|
'count':2,
|
|
'specs': [{'vendor_id':'8086', 'device_id':'1502'}],
|
|
'alias_name': 'alias_1'
|
|
}]
|
|
|
|
:param flavor: The flavor to be checked
|
|
:returns: A list of PCI requests
|
|
:rtype: nova.objects.InstancePCIRequests
|
|
:raises: exception.PciRequestAliasNotDefined if an invalid PCI alias is
|
|
provided
|
|
:raises: exception.PciInvalidAlias if the configuration contains invalid
|
|
aliases.
|
|
"""
|
|
pci_requests = []
|
|
if ('extra_specs' in flavor and
|
|
'pci_passthrough:alias' in flavor['extra_specs']):
|
|
pci_requests = _translate_alias_to_requests(
|
|
flavor['extra_specs']['pci_passthrough:alias'])
|
|
|
|
return objects.InstancePCIRequests(requests=pci_requests)
|