x/vmware-nsx
Code Issues Proposed changes

Merge "Do not assume order of lvm.tun_ofports set elements"

Browse Source
This commit is contained in:
Jenkins 2014-10-14 03:17:47 +00:00 committed by Gerrit Code Review
commit c51e9c8aa2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
View File

@ -1049,6 +1049,20 @@ class TestOvsNeutronAgent(base.BaseTestCase):
{'2.2.2.2': {'2.2.2.2':
[[FAKE_MAC, FAKE_IP1], [[FAKE_MAC, FAKE_IP1],
n_const.FLOODING_ENTRY]}}} n_const.FLOODING_ENTRY]}}}
class ActionMatcher(object):
def __init__(self, action_str):
self.ordered = self.order_ports(action_str)
def order_ports(self, action_str):
halves = action_str.split('output:')
ports = sorted(halves.pop().split(','))
halves.append(','.join(ports))
return 'output:'.join(halves)
def __eq__(self, other):
return self.ordered == self.order_ports(other)
with contextlib.nested( with contextlib.nested(
mock.patch.object(self.agent.tun_br, 'deferred'), mock.patch.object(self.agent.tun_br, 'deferred'),
mock.patch.object(self.agent.tun_br, 'do_action_flows'), mock.patch.object(self.agent.tun_br, 'do_action_flows'),
@ -1076,8 +1090,8 @@ class TestOvsNeutronAgent(base.BaseTestCase):
'set_tunnel:seg1,output:2')]), 'set_tunnel:seg1,output:2')]),
mock.call('mod', [dict(table=constants.FLOOD_TO_TUN, mock.call('mod', [dict(table=constants.FLOOD_TO_TUN,
dl_vlan='vlan1', dl_vlan='vlan1',
actions='strip_vlan,' actions=ActionMatcher('strip_vlan,'
'set_tunnel:seg1,output:1,2')]), 'set_tunnel:seg1,output:1,2'))]),
] ]
do_action_flows_fn.assert_has_calls(expected_calls) do_action_flows_fn.assert_has_calls(expected_calls)