commit 2e079da61e50b902bae8738070a1ee5acdc51ab1
author Rich Lane <rlane@bigswitch.com> Wed Oct 29 15:30:24 2014 -0700
committer Rich Lane <rlane@bigswitch.com> Wed Oct 29 15:31:13 2014 -0700
tree 7e90206e31b46e57e147386202afc3e1822c71d2
parent a8d47396b774ede4a61706624dbbbff0463c1b1b

update pyloxi to floodlight/loxigen-artifacts @ b44eb26cc919f8bd61d0da059163a1a7dce088de

Pulls in OF 1.4.

src/python/loxi/of13/const.py

diff --git a/src/python/loxi/of13/const.py b/src/python/loxi/of13/const.py
index 0d2e531..adbbd83 100644
--- a/src/python/loxi/of13/const.py
+++ b/src/python/loxi/of13/const.py
@@ -25,42 +25,42 @@
 OFPQ_MAX_RATE_UNCFG = 65535
 OFPQ_MIN_RATE_UNCFG = 65535
 
-# Identifiers from group of_bsn_lacp_convergence_status_t
+# Identifiers from group of_bsn_lacp_convergence_status
 LACP_SUCCESS = 0
 LACP_TIMEDOUT = 1
 LACP_OUT_OF_SYNC = 2
 
-of_bsn_lacp_convergence_status_t_map = {
+of_bsn_lacp_convergence_status_map = {
     0: 'LACP_SUCCESS',
     1: 'LACP_TIMEDOUT',
     2: 'LACP_OUT_OF_SYNC',
 }
 
-# Identifiers from group of_bsn_pdu_slot_num_t
+# Identifiers from group of_bsn_pdu_slot_num
 BSN_PDU_SLOT_NUM_ANY = 255
 
-of_bsn_pdu_slot_num_t_map = {
+of_bsn_pdu_slot_num_map = {
     255: 'BSN_PDU_SLOT_NUM_ANY',
 }
 
-# Identifiers from group of_bsn_vlan_counter_t
+# Identifiers from group of_bsn_vlan_counter
 OFP_BSN_VLAN_COUNTER_RX_BYTES = 0
 OFP_BSN_VLAN_COUNTER_RX_PACKETS = 1
 OFP_BSN_VLAN_COUNTER_TX_BYTES = 2
 OFP_BSN_VLAN_COUNTER_TX_PACKETS = 3
 
-of_bsn_vlan_counter_t_map = {
+of_bsn_vlan_counter_map = {
     0: 'OFP_BSN_VLAN_COUNTER_RX_BYTES',
     1: 'OFP_BSN_VLAN_COUNTER_RX_PACKETS',
     2: 'OFP_BSN_VLAN_COUNTER_TX_BYTES',
     3: 'OFP_BSN_VLAN_COUNTER_TX_PACKETS',
 }
 
-# Identifiers from group of_bsn_vrf_counter_t
+# Identifiers from group of_bsn_vrf_counter
 OFP_BSN_VRF_COUNTER_BYTES = 0
 OFP_BSN_VRF_COUNTER_PACKETS = 1
 
-of_bsn_vrf_counter_t_map = {
+of_bsn_vrf_counter_map = {
     0: 'OFP_BSN_VRF_COUNTER_BYTES',
     1: 'OFP_BSN_VRF_COUNTER_PACKETS',
 }
@@ -246,6 +246,27 @@
     2: 'OFP_BSN_CONTROLLER_ROLE_REASON_EXPERIMENTER',
 }
 
+# Identifiers from group ofp_bsn_lacp_state
+OFP_BSN_LACP_STATE_ACTIVITY = 1
+OFP_BSN_LACP_STATE_TIMEOUT = 2
+OFP_BSN_LACP_STATE_AGGREGATION = 4
+OFP_BSN_LACP_STATE_SYNCHRONIZATION = 8
+OFP_BSN_LACP_STATE_COLLECTING = 16
+OFP_BSN_LACP_STATE_DISTRIBUTING = 32
+OFP_BSN_LACP_STATE_DEFAULTED = 64
+OFP_BSN_LACP_STATE_EXPIRED = 128
+
+ofp_bsn_lacp_state_map = {
+    1: 'OFP_BSN_LACP_STATE_ACTIVITY',
+    2: 'OFP_BSN_LACP_STATE_TIMEOUT',
+    4: 'OFP_BSN_LACP_STATE_AGGREGATION',
+    8: 'OFP_BSN_LACP_STATE_SYNCHRONIZATION',
+    16: 'OFP_BSN_LACP_STATE_COLLECTING',
+    32: 'OFP_BSN_LACP_STATE_DISTRIBUTING',
+    64: 'OFP_BSN_LACP_STATE_DEFAULTED',
+    128: 'OFP_BSN_LACP_STATE_EXPIRED',
+}
+
 # Identifiers from group ofp_bsn_loglevel
 OFP_BSN_LOGLEVEL_MSG = 0
 OFP_BSN_LOGLEVEL_ERROR = 1