Merge "sriov: update port state even if ip link fails"

diff --cc neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_pci_lib.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py
index b636f71bd731859c14220266f12365a263578504,4601eb693dc646b17b07c2fffe761df46da6abe3..6ece01e644b6837bd5ad11b909cc7868605a6892
--- 1/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py
--- 2/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py
@@@ -16,9 -16,9 +16,10 @@@
  
  import mock
  from oslo_config import cfg
 +from oslo_utils import uuidutils
  
  from neutron.plugins.ml2.drivers.mech_sriov.agent.common import config  # noqa
+ from neutron.plugins.ml2.drivers.mech_sriov.agent.common import exceptions
  from neutron.plugins.ml2.drivers.mech_sriov.agent import sriov_nic_agent
  from neutron.tests import base