openstack/dragonflow
Code Issues Proposed changes

Merge "Remove the duplicated flows in table L3_PROACTIVE_LOOKUP_TABLE"

Browse Source
This commit is contained in:
Jenkins 2017-02-05 09:12:01 +00:00 committed by Gerrit Code Review
commit b5b16081be
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dragonflow/controller/l3_proactive_app.py
View File

@ -174,11 +174,6 @@ class L3ProactiveApp(df_base_app.DFlowApp):
priority=const.PRIORITY_HIGH,
match=match)
# Add router ip match go to output table
self._install_flow_send_to_output_table(local_network_id,
tunnel_key,
dst_ip)
#add dst_mac=gw_mac l2 goto l3 flow
match = parser.OFPMatch()
match.set_metadata(local_network_id)
@ -405,31 +400,6 @@ class L3ProactiveApp(df_base_app.DFlowApp):
self._del_from_route_cache(ROUTE_ADDED, router.get_id(), route)
self._del_from_route_cache(ROUTE_TO_ADD, router.get_id(), route)
def _install_flow_send_to_output_table(self, network_id,
tunnel_key, dst_ip):
parser = self.parser
ofproto = self.ofproto
if netaddr.IPAddress(dst_ip).version == 4:
match = parser.OFPMatch(eth_type=ether.ETH_TYPE_IP,
metadata=network_id,
ipv4_dst=dst_ip)
else:
match = parser.OFPMatch(eth_type=ether.ETH_TYPE_IPV6,
metadata=network_id,
ipv6_dst=dst_ip)
actions = []
actions.append(parser.OFPActionSetField(reg7=tunnel_key))
action_inst = parser.OFPInstructionActions(
ofproto.OFPIT_APPLY_ACTIONS, actions)
goto_inst = parser.OFPInstructionGotoTable(const.EGRESS_TABLE)
inst = [action_inst, goto_inst]
self.mod_flow(
inst=inst,
table_id=const.L3_PROACTIVE_LOOKUP_TABLE,
priority=const.PRIORITY_HIGH,
match=match)
def _add_subnet_send_to_proactive_routing(self, network_id, dst_network,
dst_netmask,
dst_router_tunnel_key,
@ -556,21 +526,6 @@ class L3ProactiveApp(df_base_app.DFlowApp):
priority=const.PRIORITY_MEDIUM,
match=match)
# Remove router port ip proactive flow
if netaddr.IPAddress(router_port.get_ip()).version == 4:
match = parser.OFPMatch(eth_type=ether.ETH_TYPE_IP,
metadata=local_network_id,
ipv4_dst=router_port.get_ip())
else:
match = parser.OFPMatch(eth_type=ether.ETH_TYPE_IPV6,
metadata=local_network_id,
ipv6_dst=router_port.get_ip())
self.mod_flow(
table_id=const.L3_PROACTIVE_LOOKUP_TABLE,
command=ofproto.OFPFC_DELETE,
priority=const.PRIORITY_HIGH,
match=match)
def add_local_port(self, lport):
LOG.debug('add local port: %s', lport)
self._add_port(lport)

4
dragonflow/tests/unit/test_l3_proactive_app.py
View File

@ -46,12 +46,12 @@ class TestL3ProactiveApp(test_app_base.DFAppTestBase):
# delete router
self.controller.delete_lrouter(self.router.get_id())
self.assertEqual(5, self.mock_mod_flow.call_count)
self.assertEqual(4, self.mock_mod_flow.call_count)
# add router
self.mock_mod_flow.reset_mock()
self.controller.update_lrouter(self.router)
self.assertEqual(4, self.mock_mod_flow.call_count)
self.assertEqual(3, self.mock_mod_flow.call_count)
args, kwargs = self.mock_mod_flow.call_args
self.assertEqual(const.L2_LOOKUP_TABLE, kwargs['table_id'])
self.app._add_subnet_send_to_snat.assert_called_once_with(