x/vmware-nsx
Code Issues Proposed changes

Merge "Don't set priority when calling mod_flow"

Browse Source
This commit is contained in:
Jenkins 2014-03-21 19:33:52 +00:00 committed by Gerrit Code Review
commit 0a3f3d31c5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@ -371,7 +371,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
lvm.tun_ofports.add(ofport) lvm.tun_ofports.add(ofport)
ofports = ','.join(lvm.tun_ofports) ofports = ','.join(lvm.tun_ofports)
self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN, self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan=lvm.vlan, dl_vlan=lvm.vlan,
actions="strip_vlan,set_tunnel:%s," actions="strip_vlan,set_tunnel:%s,"
"output:%s" % (lvm.segmentation_id, ofports)) "output:%s" % (lvm.segmentation_id, ofports))
@ -390,7 +389,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
if len(lvm.tun_ofports) > 0: if len(lvm.tun_ofports) > 0:
ofports = ','.join(lvm.tun_ofports) ofports = ','.join(lvm.tun_ofports)
self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN, self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan=lvm.vlan, dl_vlan=lvm.vlan,
actions="strip_vlan," actions="strip_vlan,"
"set_tunnel:%s,output:%s" % "set_tunnel:%s,output:%s" %
@ -452,7 +450,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
ofports = ','.join(self.tun_br_ofports[network_type].values()) ofports = ','.join(self.tun_br_ofports[network_type].values())
if ofports: if ofports:
self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN, self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan=lvid, dl_vlan=lvid,
actions="strip_vlan," actions="strip_vlan,"
"set_tunnel:%s,output:%s" % "set_tunnel:%s,output:%s" %
@ -927,7 +924,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
for network_id, vlan_mapping in self.local_vlan_map.iteritems(): for network_id, vlan_mapping in self.local_vlan_map.iteritems():
if vlan_mapping.network_type == tunnel_type: if vlan_mapping.network_type == tunnel_type:
self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN, self.tun_br.mod_flow(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan=vlan_mapping.vlan, dl_vlan=vlan_mapping.vlan,
actions="strip_vlan," actions="strip_vlan,"
"set_tunnel:%s,output:%s" % "set_tunnel:%s,output:%s" %

8
neutron/tests/unit/openvswitch/test_ovs_lib.py
View File

@ -359,6 +359,14 @@ class OVS_Lib_Test(base.BaseTestCase):
self.br.delete_flows, self.br.delete_flows,
**params) **params)
def test_mod_flow_with_priority_set(self):
params = {'in_port': '1',
'priority': '1'}
self.assertRaises(exceptions.InvalidInput,
self.br.mod_flow,
**params)
def test_mod_flow_no_actions_set(self): def test_mod_flow_no_actions_set(self):
params = {'in_port': '1'} params = {'in_port': '1'}

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

@ -602,7 +602,6 @@ class TestOvsNeutronAgent(base.BaseTestCase):
actions='strip_vlan,' actions='strip_vlan,'
'set_tunnel:seg1,output:2') 'set_tunnel:seg1,output:2')
mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN, mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan='vlan1', dl_vlan='vlan1',
actions='strip_vlan,' actions='strip_vlan,'
'set_tunnel:seg1,output:1,2') 'set_tunnel:seg1,output:1,2')
@ -625,7 +624,6 @@ class TestOvsNeutronAgent(base.BaseTestCase):
dl_vlan='vlan2', dl_vlan='vlan2',
dl_dst='mac') dl_dst='mac')
mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN, mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan='vlan2', dl_vlan='vlan2',
actions='strip_vlan,' actions='strip_vlan,'
'set_tunnel:seg2,output:1') 'set_tunnel:seg2,output:1')

1
neutron/tests/unit/openvswitch/test_ovs_tunnel.py
View File

@ -262,7 +262,6 @@ class TunnelTest(base.BaseTestCase):
ofports = ','.join(TUN_OFPORTS[p_const.TYPE_GRE].values()) ofports = ','.join(TUN_OFPORTS[p_const.TYPE_GRE].values())
self.mock_tun_bridge_expected += [ self.mock_tun_bridge_expected += [
mock.call.mod_flow(table=constants.FLOOD_TO_TUN, mock.call.mod_flow(table=constants.FLOOD_TO_TUN,
priority=1,
dl_vlan=LV_ID, dl_vlan=LV_ID,
actions="strip_vlan," actions="strip_vlan,"
"set_tunnel:%s,output:%s" % "set_tunnel:%s,output:%s" %