SRIOV: Fix Wrong Product ID for Intel NIC example

Some Examples and default Values of the Product ID for Intel NIC contains
Wrong Product ID that belongs to the PF product,
it should be replaced with the product ID of the VF.

Change-Id: I87291ea0458fa1ef7df1c06e17b7f9071ffb39e0
Closes-Bug: 1387152

diff --git a/etc/neutron/plugins/ml2/ml2_conf_sriov.ini b/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
index 9566f54c0bc699a444d0c3a54f57a3f14b9cc6d5..e78ab1f15156b43fb78bcc628a06f0f2685ff37b 100644 (file)
--- a/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
+++ b/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
@@ -5,7 +5,7 @@
 # (ListOpt) Comma-separated list of
 # supported Vendor PCI Devices, in format vendor_id:product_id
 #
-# supported_pci_vendor_devs = 15b3:1004, 8086:10c9
+# supported_pci_vendor_devs = 15b3:1004, 8086:10ca
 # Example: supported_pci_vendor_devs = 15b3:1004
 #
 # (BoolOpt) Requires running SRIOV neutron agent for port binding

diff --git a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py
index 3db3b890fd026d1c4b409ae91e0b8080951c9e89..72a2874ee9d052d9138fc1559aad95a4f6d80eee 100644 (file)
--- a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py
@@ -27,7 +27,7 @@ LOG = log.getLogger(__name__)
 
 sriov_opts = [
     cfg.ListOpt('supported_pci_vendor_devs',
-               default=['15b3:1004', '8086:10c9'],
+               default=['15b3:1004', '8086:10ca'],
                help=_("Supported PCI vendor devices, defined by "
                       "vendor_id:product_id according to the PCI ID "
                       "Repository. Default enables support for Intel "

diff --git a/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py b/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py
index 0de8e67f4251bf18f112419a654b1e437258c478..9782733788a11585213d52bfcbeb3c7b9e2bf76f 100644 (file)
--- a/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py
+++ b/neutron/tests/unit/ml2/drivers/mech_sriov/test_mech_sriov_nic_switch.py
@@ -25,7 +25,7 @@ from neutron.plugins.ml2.drivers.mech_sriov import mech_driver
 from neutron.tests.unit.ml2 import _test_mech_agent as base
 
 MELLANOX_CONNECTX3_PCI_INFO = '15b3:1004'
-DEFAULT_PCI_INFO = ['15b3:1004', '8086:10c9']
+DEFAULT_PCI_INFO = ['15b3:1004', '8086:10ca']
 
 
 class TestFakePortContext(base.FakePortContext):