From b25e29ca241c93cd2ab22cd8068faff3879a323d Mon Sep 17 00:00:00 2001
From: Moshe Levi <moshele@mellanox.com>
Date: Mon, 28 Nov 2016 15:01:58 +0200
Subject: [PATCH] Revert "Deprecate SR-IOV 'physical_device_mappings' config
 option"

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 03b84bc920b5499e1fef23c646268fffa1d859d7.

Change-Id: Ic373a0ab62c610fae1cbdaf489ba27e9cf02ba5b
---
 .../plugins/ml2/drivers/mech_sriov/agent/common/config.py  | 5 +----
 .../ml2/drivers/mech_sriov/agent/eswitch_manager.py        | 4 ----
 .../ml2/drivers/mech_sriov/agent/sriov_nic_agent.py        | 2 --
 ...te-SRIOV-physical_deivce_mappings-67dd3317181eb513.yaml | 7 -------
 4 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 releasenotes/notes/deprecate-SRIOV-physical_deivce_mappings-67dd3317181eb513.yaml

diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
index edfeb29d09e..1173d8a9aa2 100644
--- a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
@@ -70,10 +70,7 @@ sriov_nic_opts = [
                        "function to be used for VLAN networks. All physical "
                        "networks listed in network_vlan_ranges on the server "
                        "should have mappings to appropriate interfaces on "
-                       "each agent. "
-                       "DEPRECATED: This option is deprecated in the Ocata "
-                       "release and will be removed in the Pike release."),
-                deprecated_for_removal=True),
+                       "each agent.")),
     cfg.ListOpt('exclude_devices',
                 default=DEFAULT_EXCLUDE_DEVICES,
                 help=_("Comma-separated list of "
diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py
index 430ef2aa8ee..764d5db5421 100644
--- a/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py
@@ -347,8 +347,6 @@ class ESwitchManager(object):
             embedded_switch.set_device_spoofcheck(pci_slot,
                                                   enabled)
 
-    # Note(edan): discover_devices method will be removed
-    # with 'physical_device_mappings'
     def discover_devices(self, device_mappings, exclude_devices):
         """Discover which Virtual functions to manage.
 
@@ -363,8 +361,6 @@ class ESwitchManager(object):
                 self._create_emb_switch(phys_net, dev_name,
                                         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):
         embedded_switch = EmbSwitch(phys_net, dev_name, exclude_devices)
         self.emb_switches_map.setdefault(phys_net, []).append(embedded_switch)
diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py
index 17a805ae42f..7e02f755b90 100644
--- a/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py
@@ -191,8 +191,6 @@ class SriovNicSwitchAgent(object):
         mgr.initialize(connection, 'sriov')
         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):
         exclude_devices = exclude_devices or {}
         self.eswitch_mgr = esm.ESwitchManager()
diff --git a/releasenotes/notes/deprecate-SRIOV-physical_deivce_mappings-67dd3317181eb513.yaml b/releasenotes/notes/deprecate-SRIOV-physical_deivce_mappings-67dd3317181eb513.yaml
deleted file mode 100644
index 7d4ad6f1c0a..00000000000
--- a/releasenotes/notes/deprecate-SRIOV-physical_deivce_mappings-67dd3317181eb513.yaml
+++ /dev/null
@@ -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.