From a13110c6f970b19a5b816c7af25f5ff16754d8b0 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 11 Dec 2015 14:46:55 +0900 Subject: [PATCH] OVS: Reorder table-id constants In order to make it clear which IDs are for which bridge. Change-Id: I803ecf940fcd3ac7bcdd4567014d063a78f0a0c7 --- .../openvswitch/agent/common/constants.py | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py index ba256c1f8..bc6dafbb3 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py @@ -35,12 +35,23 @@ NONEXISTENT_PEER = 'nonexistent-peer' TUNNEL_NETWORK_TYPES = [p_const.TYPE_GRE, p_const.TYPE_VXLAN, p_const.TYPE_GENEVE] +### OpenFlow table IDs + +## Integration bridge (int_br) -# Various tables for DVR use of integration bridge flows LOCAL_SWITCHING = 0 + +# Various tables for DVR use of integration bridge flows DVR_TO_SRC_MAC = 1 DVR_TO_SRC_MAC_VLAN = 2 +CANARY_TABLE = 23 + +# Table for ARP poison/spoofing prevention rules +ARP_SPOOF_TABLE = 24 + +## Tunnel bridge (tun_br) + # Various tables for tunneling flows DVR_PROCESS = 1 PATCH_LV_TO_TUN = 2 @@ -54,17 +65,14 @@ UCAST_TO_TUN = 20 ARP_RESPONDER = 21 FLOOD_TO_TUN = 22 +## Physical Bridges (phys_brs) + # Various tables for DVR use of physical bridge flows DVR_PROCESS_VLAN = 1 LOCAL_VLAN_TRANSLATION = 2 DVR_NOT_LEARN_VLAN = 3 -# Tables for integration bridge -# Table 0 is used for forwarding. -CANARY_TABLE = 23 - -# Table for ARP poison/spoofing prevention rules -ARP_SPOOF_TABLE = 24 +### end of OpenFlow table IDs # type for ARP reply in ARP header ARP_REPLY = '0x2' -- 2.45.2