From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 9 Sep 2015 18:16:31 +0000 (+0000)
Subject: Merge "sriov: update port state even if ip link fails"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d8cfee987d828732c38e4c1fa47485e6fb8bc24d;p=openstack-build%2Fneutron-build.git

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

d8cfee987d828732c38e4c1fa47485e6fb8bc24d
diff --cc neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py
index b636f71bd,4601eb693..6ece01e64
--- a/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