openstack
/
nova
Code Issues Proposed changes

Update binding:profile for SR-IOV ports on resize-revert 

commit I7423907ef33648669decc561fc3461415b877ba6 updated
the Neutron port information of the allocated PCI device on
migration resize-confirm. This patch adds the logic for
migration resize-revert

Co-Authored-By: Ludovic Beliveau <ludovic.beliveau@windriver.com>

Partial-bug: #1512880

Change-Id: I376e482c2fb494ebd5a6b9e27c8cf2c78ce4874b
This commit is contained in:
Moshe Levi 2016-07-26 16:45:08 +03:00 committed by Ludovic Beliveau
parent 42a7840394
commit d31a57654f
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nova/network/neutronv2/api.py
View File

@ -1921,7 +1921,8 @@ class API(base_api.NetworkAPI):
def migrate_instance_finish(self, context, instance, migration):
"""Finish migrating the network of an instance."""
self._update_port_binding_for_instance(context, instance,
migration['dest_compute'])
migration['dest_compute'],
migration=migration)
def add_network_to_project(self, context, project_id, network_uuid=None):
"""Force add a network to the project."""
@ -2212,7 +2213,17 @@ class API(base_api.NetworkAPI):
"""Cleanup network for specified instance on host."""
pass
def _get_pci_mapping_for_migration(self, context, instance):
def _get_pci_devices_from_migration_context(self, migration_context,
migration):
if migration and migration.get('status') == 'reverted':
# In case of revert, swap old and new devices to
# update the ports back to the original devices.
return (migration_context.new_pci_devices,
migration_context.old_pci_devices)
return (migration_context.old_pci_devices,
migration_context.new_pci_devices)
def _get_pci_mapping_for_migration(self, context, instance, migration):
"""Get the mapping between the old PCI devices and the new PCI
devices that have been allocated during this migration. The
correlation is based on PCI request ID which is unique per PCI
@ -2220,14 +2231,16 @@ class API(base_api.NetworkAPI):
:param context: The request context.
:param instance: Get PCI mapping for this instance.
:param migration: The migration for this instance.
:Returns: dictionary of mapping {'<old pci address>': <New PciDevice>}
"""
migration_context = instance.migration_context
if not migration_context:
return {}
old_pci_devices = migration_context.old_pci_devices
new_pci_devices = migration_context.new_pci_devices
old_pci_devices, new_pci_devices = \
self._get_pci_devices_from_migration_context(migration_context,
migration)
if old_pci_devices and new_pci_devices:
LOG.debug("Determining PCI devices mapping using migration"
"context: old_pci_devices: %(old)s, "
@ -2240,7 +2253,8 @@ class API(base_api.NetworkAPI):
if old.request_id == new.request_id}
return {}
def _update_port_binding_for_instance(self, context, instance, host):
def _update_port_binding_for_instance(self, context, instance, host,
migration=None):
if not self._has_port_binding_extension(context, refresh_cache=True):
return
neutron = get_client(context, admin=True)
@ -2265,7 +2279,7 @@ class API(base_api.NetworkAPI):
if vnic_type in network_model.VNIC_TYPES_SRIOV:
if not pci_mapping:
pci_mapping = self._get_pci_mapping_for_migration(context,
instance)
instance, migration)
binding_profile = p.get('binding:profile', {})
pci_slot = binding_profile.get('pci_slot')

30
nova/tests/unit/network/test_neutronv2.py
View File

@ -3757,12 +3757,40 @@ class TestNeutronv2WithMock(test.TestCase):
instance.migration_context.old_pci_devices = old_pci_devices
instance.migration_context.new_pci_devices = new_pci_devices
instance.pci_devices = instance.migration_context.old_pci_devices
migration = {'status': 'confirmed'}
pci_mapping = self.api._get_pci_mapping_for_migration(
self.context, instance)
self.context, instance, migration)
self.assertEqual(
{old_pci_devices[0].address: new_pci_devices[0]}, pci_mapping)
def test_get_pci_mapping_for_migration_reverted(self):
instance = fake_instance.fake_instance_obj(self.context)
instance.migration_context = objects.MigrationContext()
old_pci_devices = objects.PciDeviceList(
objects=[objects.PciDevice(vendor_id='1377',
product_id='0047',
address='0000:0a:00.1',
compute_node_id=1,
request_id='1234567890')])
new_pci_devices = objects.PciDeviceList(
objects=[objects.PciDevice(vendor_id='1377',
product_id='0047',
address='0000:0b:00.1',
compute_node_id=2,
request_id='1234567890')])
instance.migration_context.old_pci_devices = old_pci_devices
instance.migration_context.new_pci_devices = new_pci_devices
instance.pci_devices = instance.migration_context.old_pci_devices
migration = {'status': 'reverted'}
pci_mapping = self.api._get_pci_mapping_for_migration(
self.context, instance, migration)
self.assertEqual(
{new_pci_devices[0].address: old_pci_devices[0]}, pci_mapping)
@mock.patch('nova.network.neutronv2.api.compute_utils')
def test_get_preexisting_port_ids(self, mocked_comp_utils):
mocked_comp_utils.get_nw_info_for_instance.return_value = [model.VIF(