OVS: Reorder table-id constants

In order to make it clear which IDs are for which bridge.

Change-Id: I803ecf940fcd3ac7bcdd4567014d063a78f0a0c7

diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py
index ba256c1f826b7c8bb0d9f5af8e1ca45678e375c8..bc6dafbb35f7f18828ca3b445967001e323d7065 100644 (file)
--- 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'