3ea6f089bf
Patch https://review.openstack.org/#/c/307124/ stash the the old/new pci requests in the migration context same as we do for NUMA. This patch is a cleanup patch to deprecate the is_new field in pci request. The is_new was horrible hack to get the newer pci request on resize/migration and since the pci_requests are now stashed in the migration context we can deprecate it. Change-Id: Ie36a74fb2aad9a14a2dc0e0b53649ee770fb2f9d
145 lines
6.2 KiB
Python
145 lines
6.2 KiB
Python
# 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.
|
|
|
|
import mock
|
|
from oslo_serialization import jsonutils
|
|
|
|
from nova import objects
|
|
from nova.tests.unit.objects import test_objects
|
|
from nova.tests import uuidsentinel as uuids
|
|
|
|
|
|
FAKE_UUID = '79a53d6b-0893-4838-a971-15f4f382e7c2'
|
|
FAKE_REQUEST_UUID = '69b53d6b-0793-4839-c981-f5c4f382e7d2'
|
|
|
|
# NOTE(danms): Yes, these are the same right now, but going forward,
|
|
# we have changes to make which will be reflected in the format
|
|
# in instance_extra, but not in system_metadata.
|
|
fake_pci_requests = [
|
|
{'count': 2,
|
|
'spec': [{'vendor_id': '8086',
|
|
'device_id': '1502'}],
|
|
'alias_name': 'alias_1',
|
|
'is_new': False,
|
|
'request_id': FAKE_REQUEST_UUID},
|
|
{'count': 2,
|
|
'spec': [{'vendor_id': '6502',
|
|
'device_id': '07B5'}],
|
|
'alias_name': 'alias_2',
|
|
'is_new': True,
|
|
'request_id': FAKE_REQUEST_UUID},
|
|
]
|
|
|
|
fake_legacy_pci_requests = [
|
|
{'count': 2,
|
|
'spec': [{'vendor_id': '8086',
|
|
'device_id': '1502'}],
|
|
'alias_name': 'alias_1'},
|
|
{'count': 1,
|
|
'spec': [{'vendor_id': '6502',
|
|
'device_id': '07B5'}],
|
|
'alias_name': 'alias_2'},
|
|
]
|
|
|
|
|
|
class _TestInstancePCIRequests(object):
|
|
@mock.patch('nova.db.instance_extra_get_by_instance_uuid')
|
|
def test_get_by_instance_uuid(self, mock_get):
|
|
mock_get.return_value = {
|
|
'instance_uuid': FAKE_UUID,
|
|
'pci_requests': jsonutils.dumps(fake_pci_requests),
|
|
}
|
|
requests = objects.InstancePCIRequests.get_by_instance_uuid(
|
|
self.context, FAKE_UUID)
|
|
self.assertEqual(2, len(requests.requests))
|
|
for index, request in enumerate(requests.requests):
|
|
self.assertEqual(fake_pci_requests[index]['alias_name'],
|
|
request.alias_name)
|
|
self.assertEqual(fake_pci_requests[index]['count'],
|
|
request.count)
|
|
self.assertEqual(fake_pci_requests[index]['spec'],
|
|
[dict(x.items()) for x in request.spec])
|
|
|
|
@mock.patch('nova.objects.InstancePCIRequests.get_by_instance_uuid')
|
|
def test_get_by_instance_current(self, mock_get):
|
|
instance = objects.Instance(uuid=uuids.instance,
|
|
system_metadata={})
|
|
objects.InstancePCIRequests.get_by_instance(self.context,
|
|
instance)
|
|
mock_get.assert_called_once_with(self.context, uuids.instance)
|
|
|
|
def test_get_by_instance_legacy(self):
|
|
fakesysmeta = {
|
|
'pci_requests': jsonutils.dumps([fake_legacy_pci_requests[0]]),
|
|
'new_pci_requests': jsonutils.dumps([fake_legacy_pci_requests[1]]),
|
|
}
|
|
instance = objects.Instance(uuid=uuids.instance,
|
|
system_metadata=fakesysmeta)
|
|
requests = objects.InstancePCIRequests.get_by_instance(self.context,
|
|
instance)
|
|
self.assertEqual(2, len(requests.requests))
|
|
self.assertEqual('alias_1', requests.requests[0].alias_name)
|
|
self.assertFalse(requests.requests[0].is_new)
|
|
self.assertEqual('alias_2', requests.requests[1].alias_name)
|
|
self.assertTrue(requests.requests[1].is_new)
|
|
|
|
def test_backport_1_0(self):
|
|
requests = objects.InstancePCIRequests(
|
|
requests=[objects.InstancePCIRequest(count=1,
|
|
request_id=FAKE_UUID),
|
|
objects.InstancePCIRequest(count=2,
|
|
request_id=FAKE_UUID)])
|
|
primitive = requests.obj_to_primitive(target_version='1.0')
|
|
backported = objects.InstancePCIRequests.obj_from_primitive(
|
|
primitive)
|
|
self.assertEqual('1.0', backported.VERSION)
|
|
self.assertEqual(2, len(backported.requests))
|
|
self.assertFalse(backported.requests[0].obj_attr_is_set('request_id'))
|
|
self.assertFalse(backported.requests[1].obj_attr_is_set('request_id'))
|
|
|
|
def test_obj_from_db(self):
|
|
req = objects.InstancePCIRequests.obj_from_db(None, FAKE_UUID, None)
|
|
self.assertEqual(FAKE_UUID, req.instance_uuid)
|
|
self.assertEqual(0, len(req.requests))
|
|
db_req = jsonutils.dumps(fake_pci_requests)
|
|
req = objects.InstancePCIRequests.obj_from_db(None, FAKE_UUID, db_req)
|
|
self.assertEqual(FAKE_UUID, req.instance_uuid)
|
|
self.assertEqual(2, len(req.requests))
|
|
self.assertEqual('alias_1', req.requests[0].alias_name)
|
|
|
|
def test_from_request_spec_instance_props(self):
|
|
requests = objects.InstancePCIRequests(
|
|
requests=[objects.InstancePCIRequest(count=1,
|
|
request_id=FAKE_UUID,
|
|
spec=[{'vendor_id': '8086',
|
|
'device_id': '1502'}])
|
|
],
|
|
instance_uuid=FAKE_UUID)
|
|
result = jsonutils.to_primitive(requests)
|
|
result = objects.InstancePCIRequests.from_request_spec_instance_props(
|
|
result)
|
|
self.assertEqual(1, len(result.requests))
|
|
self.assertEqual(1, result.requests[0].count)
|
|
self.assertEqual(FAKE_UUID, result.requests[0].request_id)
|
|
self.assertEqual([{'vendor_id': '8086', 'device_id': '1502'}],
|
|
result.requests[0].spec)
|
|
|
|
|
|
class TestInstancePCIRequests(test_objects._LocalTest,
|
|
_TestInstancePCIRequests):
|
|
pass
|
|
|
|
|
|
class TestRemoteInstancePCIRequests(test_objects._RemoteTest,
|
|
_TestInstancePCIRequests):
|
|
pass
|