9b88e755d9
When the PCI alias was getting translated to a PCI request, all the white spaces were getting removed. So the pci_passthrough:alias specified in the flavor never matched the device in pci_alias. This patch fixes the bug by only stripping the white spaces at the beginning or the end of the elements Change-Id: I2888b03faf6c25bcb6011db40100d925972c2231 Closes-Bug: #1638200
244 lines
8.6 KiB
Python
244 lines
8.6 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.
|
|
|
|
"""Tests for PCI request."""
|
|
|
|
from nova import exception
|
|
from nova.pci import request
|
|
from nova import test
|
|
|
|
|
|
_fake_alias1 = """{
|
|
"name": "QuicAssist",
|
|
"capability_type": "pci",
|
|
"product_id": "4443",
|
|
"vendor_id": "8086",
|
|
"device_type": "type-PCI"
|
|
}"""
|
|
|
|
_fake_alias11 = """{
|
|
"name": "QuicAssist",
|
|
"capability_type": "pci",
|
|
"product_id": "4444",
|
|
"vendor_id": "8086",
|
|
"device_type": "type-PCI"
|
|
}"""
|
|
|
|
_fake_alias2 = """{
|
|
"name": "xxx",
|
|
"capability_type": "pci",
|
|
"product_id": "1111",
|
|
"vendor_id": "1111",
|
|
"device_type": "N"
|
|
}"""
|
|
|
|
_fake_alias3 = """{
|
|
"name": "IntelNIC",
|
|
"capability_type": "pci",
|
|
"product_id": "1111",
|
|
"vendor_id": "8086",
|
|
"device_type": "type-PF"
|
|
}"""
|
|
|
|
_fake_alias4 = """{
|
|
"name": " Cirrus Logic ",
|
|
"capability_type": "pci",
|
|
"product_id": "0ff2",
|
|
"vendor_id": "10de",
|
|
"device_type": "type-PCI"
|
|
}"""
|
|
|
|
|
|
class AliasTestCase(test.NoDBTestCase):
|
|
def test_good_alias(self):
|
|
self.flags(alias=[_fake_alias1], group='pci')
|
|
als = request._get_alias_from_config()
|
|
self.assertIsInstance(als['QuicAssist'], list)
|
|
expect_dict = {
|
|
"capability_type": "pci",
|
|
"product_id": "4443",
|
|
"vendor_id": "8086",
|
|
"dev_type": "type-PCI"
|
|
}
|
|
self.assertEqual(expect_dict, als['QuicAssist'][0])
|
|
|
|
def test_multispec_alias(self):
|
|
self.flags(alias=[_fake_alias1, _fake_alias11], group='pci')
|
|
als = request._get_alias_from_config()
|
|
self.assertIsInstance(als['QuicAssist'], list)
|
|
expect_dict1 = {
|
|
"capability_type": "pci",
|
|
"product_id": "4443",
|
|
"vendor_id": "8086",
|
|
"dev_type": "type-PCI"
|
|
}
|
|
expect_dict2 = {
|
|
"capability_type": "pci",
|
|
"product_id": "4444",
|
|
"vendor_id": "8086",
|
|
"dev_type": "type-PCI"
|
|
}
|
|
|
|
self.assertEqual(expect_dict1, als['QuicAssist'][0])
|
|
self.assertEqual(expect_dict2, als['QuicAssist'][1])
|
|
|
|
def test_wrong_type_aliase(self):
|
|
self.flags(alias=[_fake_alias2], group='pci')
|
|
self.assertRaises(exception.PciInvalidAlias,
|
|
request._get_alias_from_config)
|
|
|
|
def test_wrong_product_id_aliase(self):
|
|
self.flags(alias=[
|
|
"""{
|
|
"name": "xxx",
|
|
"capability_type": "pci",
|
|
"product_id": "g111",
|
|
"vendor_id": "1111",
|
|
"device_type": "NIC"
|
|
}"""],
|
|
group='pci')
|
|
self.assertRaises(exception.PciInvalidAlias,
|
|
request._get_alias_from_config)
|
|
|
|
def test_wrong_vendor_id_aliase(self):
|
|
self.flags(alias=[
|
|
"""{
|
|
"name": "xxx",
|
|
"capability_type": "pci",
|
|
"product_id": "1111",
|
|
"vendor_id": "0xg111",
|
|
"device_type": "NIC"
|
|
}"""],
|
|
group='pci')
|
|
self.assertRaises(exception.PciInvalidAlias,
|
|
request._get_alias_from_config)
|
|
|
|
def test_wrong_cap_type_aliase(self):
|
|
self.flags(alias=[
|
|
"""{
|
|
"name": "xxx",
|
|
"capability_type": "usb",
|
|
"product_id": "1111",
|
|
"vendor_id": "8086",
|
|
"device_type": "NIC"
|
|
}"""],
|
|
group='pci')
|
|
self.assertRaises(exception.PciInvalidAlias,
|
|
request._get_alias_from_config)
|
|
|
|
def test_dup_aliase(self):
|
|
self.flags(alias=[
|
|
"""{
|
|
"name": "xxx",
|
|
"capability_type": "pci",
|
|
"product_id": "1111",
|
|
"vendor_id": "8086",
|
|
"device_type": "NIC"
|
|
}""",
|
|
"""{
|
|
"name": "xxx",
|
|
"capability_type": "pci",
|
|
"product_id": "1111",
|
|
"vendor_id": "8086",
|
|
"device_type": "type-PCI"
|
|
}"""],
|
|
group='pci')
|
|
self.assertRaises(
|
|
exception.PciInvalidAlias,
|
|
request._get_alias_from_config)
|
|
|
|
def _verify_result(self, expected, real):
|
|
exp_real = zip(expected, real)
|
|
for exp, real in exp_real:
|
|
self.assertEqual(exp['count'], real.count)
|
|
self.assertEqual(exp['alias_name'], real.alias_name)
|
|
self.assertEqual(exp['spec'], real.spec)
|
|
|
|
def test_aliase_2_request(self):
|
|
self.flags(alias=[_fake_alias1, _fake_alias3], group='pci')
|
|
expect_request = [
|
|
{'count': 3,
|
|
'spec': [{'vendor_id': '8086', 'product_id': '4443',
|
|
'dev_type': 'type-PCI',
|
|
'capability_type': 'pci'}],
|
|
'alias_name': 'QuicAssist'},
|
|
|
|
{'count': 1,
|
|
'spec': [{'vendor_id': '8086', 'product_id': '1111',
|
|
'dev_type': "type-PF",
|
|
'capability_type': 'pci'}],
|
|
'alias_name': 'IntelNIC'}, ]
|
|
|
|
requests = request._translate_alias_to_requests(
|
|
"QuicAssist : 3, IntelNIC: 1")
|
|
self.assertEqual(set([p['count'] for p in requests]), set([1, 3]))
|
|
self._verify_result(expect_request, requests)
|
|
|
|
def test_aliase_2_request_invalid(self):
|
|
self.flags(alias=[_fake_alias1, _fake_alias3], group='pci')
|
|
self.assertRaises(exception.PciRequestAliasNotDefined,
|
|
request._translate_alias_to_requests,
|
|
"QuicAssistX : 3")
|
|
|
|
def test_get_pci_requests_from_flavor(self):
|
|
self.flags(alias=[_fake_alias1, _fake_alias3], group='pci')
|
|
expect_request = [
|
|
{'count': 3,
|
|
'spec': [{'vendor_id': '8086', 'product_id': '4443',
|
|
'dev_type': "type-PCI",
|
|
'capability_type': 'pci'}],
|
|
'alias_name': 'QuicAssist'},
|
|
|
|
{'count': 1,
|
|
'spec': [{'vendor_id': '8086', 'product_id': '1111',
|
|
'dev_type': "type-PF",
|
|
'capability_type': 'pci'}],
|
|
'alias_name': 'IntelNIC'}, ]
|
|
|
|
flavor = {'extra_specs': {"pci_passthrough:alias":
|
|
"QuicAssist:3, IntelNIC: 1"}}
|
|
requests = request.get_pci_requests_from_flavor(flavor)
|
|
self.assertEqual(set([1, 3]),
|
|
set([p.count for p in requests.requests]))
|
|
self._verify_result(expect_request, requests.requests)
|
|
|
|
def test_get_pci_requests_from_flavor_including_space(self):
|
|
self.flags(alias=[_fake_alias3, _fake_alias4], group='pci')
|
|
expect_request = [
|
|
{'count': 4,
|
|
'spec': [{'vendor_id': '10de', 'product_id': '0ff2',
|
|
'dev_type': "type-PCI",
|
|
'capability_type': 'pci'}],
|
|
'alias_name': 'Cirrus Logic'},
|
|
|
|
{'count': 3,
|
|
'spec': [{'vendor_id': '8086', 'product_id': '1111',
|
|
'dev_type': "type-PF",
|
|
'capability_type': 'pci'}],
|
|
'alias_name': 'IntelNIC'}, ]
|
|
|
|
flavor = {'extra_specs': {"pci_passthrough:alias":
|
|
" Cirrus Logic : 4, IntelNIC: 3"}}
|
|
requests = request.get_pci_requests_from_flavor(flavor)
|
|
self.assertEqual(set([3, 4]),
|
|
set([p.count for p in requests.requests]))
|
|
self._verify_result(expect_request, requests.requests)
|
|
|
|
def test_get_pci_requests_from_flavor_no_extra_spec(self):
|
|
self.flags(alias=[_fake_alias1, _fake_alias3], group='pci')
|
|
flavor = {}
|
|
requests = request.get_pci_requests_from_flavor(flavor)
|
|
self.assertEqual([], requests.requests)
|