From: Samer Deeb <samerd@mellanox.com>
Date: Tue, 4 Nov 2014 11:58:19 +0000 (+0200)
Subject: SRIOV: Fix Wrong Product ID for Intel NIC example
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b2e14588068a22b0d16623248cdba4d2b9607fda;p=openstack-build%2Fneutron-build.git

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 9566f54c0..e78ab1f15 100644
--- 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 3db3b890f..72a2874ee 100644
--- 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 0de8e67f4..978273378 100644
--- 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):