pci: Remove objects.InstancePCIRequests.save()

The save() method of nova.objects.InstancePCIRequests was never called
anywhere but some unit tests. Remove this method because it is
confusing, since all creation of instance PCI request objects is done in
nova.objects.Instance.create() and nova.objects.Instance.save().

Change-Id: I329d07f5bb5a5ce86544b3fe278e9e396fa03e1d
This commit is contained in:
Jay Pipes 2015-08-14 13:55:44 -04:00
parent ac2eb54cba
commit 3fdb7ac23e
3 changed files with 1 additions and 58 deletions

View File

@ -150,12 +150,6 @@ class InstancePCIRequests(base.NovaObject,
'request_id': x.request_id} for x in self.requests]
return jsonutils.dumps(blob)
@base.remotable
def save(self):
blob = self.to_json()
db.instance_extra_update_by_uuid(self._context, self.instance_uuid,
{'pci_requests': blob})
@classmethod
def from_request_spec_instance_props(cls, pci_requests):
objs = [InstancePCIRequest(**request)

View File

@ -111,57 +111,6 @@ class _TestInstancePCIRequests(object):
self.assertEqual('alias_2', requests.requests[1].alias_name)
self.assertTrue(requests.requests[1].is_new)
@mock.patch('nova.db.instance_extra_update_by_uuid')
def test_save(self, mock_update):
requests = objects.InstancePCIRequests(
context=self.context,
instance_uuid=FAKE_UUID,
requests=[objects.InstancePCIRequest(
count=1,
spec=[{'foo': 'bar'}, {'baz': 'bat'}],
alias_name='alias_1',
is_new=False,
request_id=FAKE_REQUEST_UUID)])
requests.save()
self.assertEqual(FAKE_UUID, mock_update.call_args_list[0][0][1])
self.assertEqual(
[{'count': 1, 'is_new': False,
'alias_name': 'alias_1',
'spec': [{'foo': 'bar'}, {'baz': 'bat'}],
'request_id': FAKE_REQUEST_UUID}],
jsonutils.loads(
mock_update.call_args_list[0][0][2]['pci_requests']))
@mock.patch('nova.db.instance_extra_update_by_uuid')
@mock.patch('nova.db.instance_extra_get_by_instance_uuid')
def test_save_and_reload(self, mock_get, mock_update):
database = {}
def _save(context, uuid, values):
database.setdefault(uuid, {'instance_uuid': uuid})
database[uuid].update(values)
def _get(context, uuid, columns):
return database.get(uuid, {})
mock_update.side_effect = _save
mock_get.side_effect = _get
requests = objects.InstancePCIRequests(
context=self.context,
instance_uuid=FAKE_UUID,
requests=[objects.InstancePCIRequest(
count=1, is_new=False, alias_name='alias_1',
spec=[{'foo': 'bar'}])])
requests.save()
_requests = objects.InstancePCIRequests.get_by_instance_uuid(
self.context, FAKE_UUID)
self.assertEqual(requests.instance_uuid, _requests.instance_uuid)
self.assertEqual(len(requests.requests), len(_requests.requests))
self.assertEqual(requests.requests[0].alias_name,
_requests.requests[0].alias_name)
def test_new_compatibility(self):
request = objects.InstancePCIRequest(is_new=False)
self.assertFalse(request.new)

View File

@ -1130,7 +1130,7 @@ object_data = {
'InstanceNUMACell': '1.2-535ef30e0de2d6a0d26a71bd58ecafc4',
'InstanceNUMATopology': '1.2-d944a7d6c21e1c773ffdf09c6d025954',
'InstancePCIRequest': '1.1-b1d75ebc716cb12906d9d513890092bf',
'InstancePCIRequests': '1.1-fc8d179960869c9af038205a80af2541',
'InstancePCIRequests': '1.1-65e38083177726d806684cb1cc0136d2',
'KeyPair': '1.3-bfaa2a8b148cdf11e0c72435d9dd097a',
'KeyPairList': '1.2-58b94f96e776bedaf1e192ddb2a24c4e',
'Migration': '1.2-8784125bedcea0a9227318511904e853',