openstack
/
neutron
Code Issues Proposed changes

Fixed TypeError when creating MlnxException 

MlnxException expect a 'err_msg' keyword argument.

Change-Id: I4570219c0a6a466391b43cbdaa5372b85566c421
Closes-Bug: #1283990
Signe-off-by: Roey Chen <roeyc@mellanox.com>
This commit is contained in:
Roey Chen 2014-03-25 13:56:59 +02:00
parent 4599e80bd2
commit 3d9e183d59
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
View File

@ -57,7 +57,7 @@ class EswitchManager(object):
err_msg = _("Agent cache inconsistency - port id "
"is not stored for %s") % port_mac
LOG.error(err_msg)
raise exceptions.MlnxException(err_msg)
raise exceptions.MlnxException(err_msg=err_msg)
def get_vnics_mac(self):
return set(self.utils.get_attached_vnics().keys())

22
neutron/tests/unit/mlnx/test_mlnx_neutron_agent.py
View File

@ -19,12 +19,34 @@ import contextlib
import mock
from oslo.config import cfg
import testtools
from neutron.plugins.mlnx.agent import eswitch_neutron_agent
from neutron.plugins.mlnx.agent import utils
from neutron.plugins.mlnx.common import exceptions
from neutron.tests import base
class TestEswichManager(base.BaseTestCase):
def setUp(self):
super(TestEswichManager, self).setUp()
class MockEswitchUtils(object):
def __init__(self, endpoint, timeout):
pass
mock.patch('neutron.plugins.mlnx.agent.utils.EswitchManager',
new=MockEswitchUtils)
with mock.patch.object(utils, 'zmq'):
self.manager = eswitch_neutron_agent.EswitchManager({}, None, None)
def test_get_not_exist_port_id(self):
with testtools.ExpectedException(exceptions.MlnxException):
self.manager.get_port_id_by_mac('no-such-mac')
class TestEswitchAgent(base.BaseTestCase):
def setUp(self):