openstack/neutron
Code Issues Proposed changes

Revert "Deprecate SR-IOV 'physical_device_mappings' config option"

Browse Source 
There are still valid use cases to keep using physical_device_mappings
config option. We still want to allow neutron user to restrict physnets,
for example, if API user does not enforce compatible segments chosen for
a SR-IOV port.

This reverts commit 03b84bc920.

Change-Id: Ic373a0ab62c610fae1cbdaf489ba27e9cf02ba5b
This commit is contained in:
Moshe Levi 2016-11-28 15:01:58 +02:00 committed by Ihar Hrachyshka
parent d41bed0ee6
commit b25e29ca24
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
View File

@ -70,10 +70,7 @@ sriov_nic_opts = [
"function to be used for VLAN networks. All physical " "function to be used for VLAN networks. All physical "
"networks listed in network_vlan_ranges on the server " "networks listed in network_vlan_ranges on the server "
"should have mappings to appropriate interfaces on " "should have mappings to appropriate interfaces on "
"each agent. " "each agent.")),
"DEPRECATED: This option is deprecated in the Ocata "
"release and will be removed in the Pike release."),
deprecated_for_removal=True),
cfg.ListOpt('exclude_devices', cfg.ListOpt('exclude_devices',
default=DEFAULT_EXCLUDE_DEVICES, default=DEFAULT_EXCLUDE_DEVICES,
help=_("Comma-separated list of " help=_("Comma-separated list of "

4
neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py
View File

@ -347,8 +347,6 @@ class ESwitchManager(object):
embedded_switch.set_device_spoofcheck(pci_slot, embedded_switch.set_device_spoofcheck(pci_slot,
enabled) enabled)
# Note(edan): discover_devices method will be removed
# with 'physical_device_mappings'
def discover_devices(self, device_mappings, exclude_devices): def discover_devices(self, device_mappings, exclude_devices):
"""Discover which Virtual functions to manage. """Discover which Virtual functions to manage.
@ -363,8 +361,6 @@ class ESwitchManager(object):
self._create_emb_switch(phys_net, dev_name, self._create_emb_switch(phys_net, dev_name,
exclude_devices.get(dev_name, set())) exclude_devices.get(dev_name, set()))
# Note(edan): phys_net param will be removed with
# 'physical_device_mappings' config option.
def _create_emb_switch(self, phys_net, dev_name, exclude_devices): def _create_emb_switch(self, phys_net, dev_name, exclude_devices):
embedded_switch = EmbSwitch(phys_net, dev_name, exclude_devices) embedded_switch = EmbSwitch(phys_net, dev_name, exclude_devices)
self.emb_switches_map.setdefault(phys_net, []).append(embedded_switch) self.emb_switches_map.setdefault(phys_net, []).append(embedded_switch)

2
neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py
View File

@ -191,8 +191,6 @@ class SriovNicSwitchAgent(object):
mgr.initialize(connection, 'sriov') mgr.initialize(connection, 'sriov')
return mgr return mgr
# Note(edan): setup_eswitch_mgr method will be removed
# with 'physical_device_mappings' config option
def setup_eswitch_mgr(self, device_mappings, exclude_devices=None): def setup_eswitch_mgr(self, device_mappings, exclude_devices=None):
exclude_devices = exclude_devices or {} exclude_devices = exclude_devices or {}
self.eswitch_mgr = esm.ESwitchManager() self.eswitch_mgr = esm.ESwitchManager()

7
releasenotes/notes/deprecate-SRIOV-physical_deivce_mappings-67dd3317181eb513.yaml
View File

@ -1,7 +0,0 @@
---
deprecations:
- The 'physical_device_mappings' option is deprecated
and will be removed in Pike. The PCI device validation
is made in Nova with the 'pci_whitelist' config option.
Therefore it is redundant to validate it in Neutron
with physical_device_mappings.