x/vmware-nsx
Code Issues Proposed changes

Fix to not send fdb updates when no port changes

Browse Source 
Fixes bug: 1241874
Change-Id: Ibba11db0d7972dfba819347f7cb1397e1d34f218
This commit is contained in:
Sylvain Afchain 2013-10-19 01:12:58 +02:00
parent 85858ce798
commit c9f19165f0
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/ml2/drivers/l2pop/mech_driver.py
View File

@ -94,8 +94,7 @@ class L2populationMechanismDriver(api.MechanismDriver,
if port['status'] == orig['status']: if port['status'] == orig['status']:
self._fixed_ips_changed(context, orig, port) self._fixed_ips_changed(context, orig, port)
elif port['status'] == const.PORT_STATUS_ACTIVE:
if port['status'] == const.PORT_STATUS_ACTIVE:
self._update_port_up(context) self._update_port_up(context)
elif port['status'] == const.PORT_STATUS_DOWN: elif port['status'] == const.PORT_STATUS_DOWN:
fdb_entries = self._update_port_down(context) fdb_entries = self._update_port_down(context)

37
neutron/tests/unit/ml2/drivers/test_l2population.py
View File

@ -26,6 +26,7 @@ from neutron.db import agents_db
from neutron.db import api as db_api from neutron.db import api as db_api
from neutron.extensions import portbindings from neutron.extensions import portbindings
from neutron.extensions import providernet as pnet from neutron.extensions import providernet as pnet
from neutron import manager
from neutron.openstack.common import timeutils from neutron.openstack.common import timeutils
from neutron.plugins.ml2 import config as config from neutron.plugins.ml2 import config as config
from neutron.plugins.ml2.drivers.l2pop import constants as l2_consts from neutron.plugins.ml2.drivers.l2pop import constants as l2_consts
@ -83,7 +84,6 @@ class TestL2PopulationRpcTestCase(test_plugin.NeutronDbPluginV2TestCase):
'ml2') 'ml2')
super(TestL2PopulationRpcTestCase, self).setUp(PLUGIN_NAME) super(TestL2PopulationRpcTestCase, self).setUp(PLUGIN_NAME)
self.addCleanup(config.cfg.CONF.reset) self.addCleanup(config.cfg.CONF.reset)
self.port_create_status = 'DOWN'
self.adminContext = context.get_admin_context() self.adminContext = context.get_admin_context()
@ -449,6 +449,12 @@ class TestL2PopulationRpcTestCase(test_plugin.NeutronDbPluginV2TestCase):
**host_arg) as port1: **host_arg) as port1:
p1 = port1['port'] p1 = port1['port']
device = 'tap' + p1['id']
self.callbacks.update_device_up(self.adminContext,
agent_id=HOST,
device=device)
self.mock_fanout.reset_mock() self.mock_fanout.reset_mock()
data = {'port': {'fixed_ips': [{'ip_address': '10.0.0.2'}, data = {'port': {'fixed_ips': [{'ip_address': '10.0.0.2'},
@ -515,3 +521,32 @@ class TestL2PopulationRpcTestCase(test_plugin.NeutronDbPluginV2TestCase):
self.mock_fanout.assert_any_call( self.mock_fanout.assert_any_call(
mock.ANY, del_expected, topic=self.fanout_topic) mock.ANY, del_expected, topic=self.fanout_topic)
def test_no_fdb_updates_without_port_updates(self):
self._register_ml2_agents()
with self.subnet(network=self._network) as subnet:
host_arg = {portbindings.HOST_ID: HOST}
with self.port(subnet=subnet, cidr='10.0.0.0/24',
arg_list=(portbindings.HOST_ID,),
**host_arg) as port1:
p1 = port1['port']
device = 'tap' + p1['id']
self.callbacks.update_device_up(self.adminContext,
agent_id=HOST,
device=device)
p1['status'] = 'ACTIVE'
self.mock_fanout.reset_mock()
fanout = ('neutron.plugins.ml2.drivers.l2pop.rpc.'
'L2populationAgentNotifyAPI._notification_fanout')
fanout_patch = mock.patch(fanout)
mock_fanout = fanout_patch.start()
plugin = manager.NeutronManager.get_plugin()
plugin.update_port(self.adminContext, p1['id'], port1)
self.assertFalse(mock_fanout.called)
fanout_patch.stop()