openstack
/
neutron
Code Issues Proposed changes

Merge "Get rid of marshall_fdb_entries"

This commit is contained in:
Jenkins 2016-02-05 07:45:25 +00:00 committed by Gerrit Code Review
parent 0a4bc856a7 a19029d3d6
commit 004519c7e1
2 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
neutron/plugins/ml2/drivers/l2pop/rpc.py
View File

@ -14,7 +14,6 @@
# under the License.
import collections
import copy
from oslo_log import log as logging
import oslo_messaging
@ -46,9 +45,8 @@ class L2populationAgentNotifyAPI(object):
'method': method,
'fdb_entries': fdb_entries})
marshalled_fdb_entries = self._marshall_fdb_entries(fdb_entries)
cctxt = self.client.prepare(topic=self.topic_l2pop_update, fanout=True)
cctxt.cast(context, method, fdb_entries=marshalled_fdb_entries)
cctxt.cast(context, method, fdb_entries=fdb_entries)
def _notification_host(self, context, method, fdb_entries, host):
LOG.debug('Notify l2population agent %(host)s at %(topic)s the '
@ -58,9 +56,8 @@ class L2populationAgentNotifyAPI(object):
'method': method,
'fdb_entries': fdb_entries})
marshalled_fdb_entries = self._marshall_fdb_entries(fdb_entries)
cctxt = self.client.prepare(topic=self.topic_l2pop_update, server=host)
cctxt.cast(context, method, fdb_entries=marshalled_fdb_entries)
cctxt.cast(context, method, fdb_entries=fdb_entries)
def add_fdb_entries(self, context, fdb_entries, host=None):
if fdb_entries:
@ -88,28 +85,3 @@ class L2populationAgentNotifyAPI(object):
else:
self._notification_fanout(context, 'update_fdb_entries',
fdb_entries)
@staticmethod
def _marshall_fdb_entries(fdb_entries):
"""Prepares fdb_entries for serialization to JSON for RPC.
All methods in this class that send messages should call this to
marshall fdb_entries for the wire.
:param fdb_entries: Original fdb_entries data-structure. Looks like:
{
<uuid>: {
...,
'ports': {
<ip address>: [ PortInfo, ... ],
...
:returns: Deep copy with PortInfo converted to [mac, ip]
"""
marshalled = copy.deepcopy(fdb_entries)
for value in marshalled.values():
if 'ports' in value:
for address, port_infos in value['ports'].items():
value['ports'][address] = [[mac, ip]
for mac, ip in port_infos]
return marshalled

22
neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
View File

@ -14,6 +14,7 @@
# under the License.
import mock
from oslo_serialization import jsonutils
import testtools
from neutron.common import constants
@ -138,22 +139,11 @@ class TestL2PopulationRpcTestCase(test_plugin.Ml2PluginV2TestCase):
self.assertEqual(('00:00:00:00:00:00', '0.0.0.0'), port_info_list[0])
self.assertEqual(('fa:16:3e:ff:8c:0f', '10.0.0.6'), port_info_list[1])
def test__marshall_fdb_entries(self):
entries = {'foouuid': {
'segment_id': 1001,
'ports': {'192.168.0.10': [('00:00:00:00:00:00', '0.0.0.0'),
('fa:16:3e:ff:8c:0f', '10.0.0.6')]},
'network_type': 'vxlan'}}
entries = l2pop_rpc.L2populationAgentNotifyAPI._marshall_fdb_entries(
entries)
port_info_list = entries['foouuid']['ports']['192.168.0.10']
# Check that the PortInfo tuples have been converted to list
self.assertIsInstance(port_info_list[0], list)
self.assertIsInstance(port_info_list[1], list)
self.assertEqual(['00:00:00:00:00:00', '0.0.0.0'], port_info_list[0])
self.assertEqual(['fa:16:3e:ff:8c:0f', '10.0.0.6'], port_info_list[1])
def test_portinfo_marshalled_as_list(self):
entry = ['fa:16:3e:ff:8c:0f', '10.0.0.6']
payload = {'netuuid': {'ports': {'1': [l2pop_rpc.PortInfo(*entry)]}}}
result = jsonutils.loads(jsonutils.dumps(payload))
self.assertEqual(entry, result['netuuid']['ports']['1'][0])
def test_fdb_add_called(self):
self._register_ml2_agents()