Merge remote-tracking branch 'origin/master' into bsn_det_vport
Conflicts:
loxi_front_end/type_maps.py
openflow_input/bsn_l2_table
diff --git a/openflow_input/bsn_l2_table b/openflow_input/bsn_l2_table
index 3795ea2..e3938a8 100644
--- a/openflow_input/bsn_l2_table
+++ b/openflow_input/bsn_l2_table
@@ -28,48 +28,48 @@
#version 1
// BSN L2 table configuration messages
-struct ofp_bsn_set_l2_table_request {
+struct of_bsn_set_l2_table_request {
uint8_t version;
- uint8_t type;
+ uint8_t type == 4;
uint16_t length;
uint32_t xid;
- uint32_t experimenter; // OF_EXPERIMENTER_ID_BSN_REQUEST
- uint32_t subtype; // BSN_L2_TABLE_SET
+ uint32_t experimenter == 0x5c16c7;
+ uint32_t subtype == 12;
uint8_t l2_table_enable; // 1 == enabled, 0 == disabled
uint8_t pad;
uint16_t l2_table_priority; // priority of all flows in L2 table
uint8_t[4] pad;
};
-struct ofp_bsn_set_l2_table_reply {
+struct of_bsn_set_l2_table_reply {
uint8_t version;
- uint8_t type;
+ uint8_t type == 4;
uint16_t length;
uint32_t xid;
- uint32_t experimenter; // OF_EXPERIMENTER_ID_BSN
- uint32_t subtype; // BSN_L2_TABLE_SET_REPLY
+ uint32_t experimenter == 0x5c16c7;
+ uint32_t subtype == 24;
uint8_t l2_table_enable; // Resulting state: 1 == enabled, 0 == disabled
uint8_t pad;
uint16_t l2_table_priority; // priority used, must match request if ok
uint32_t status; // 0 means success
};
-struct ofp_bsn_get_l2_table_request {
+struct of_bsn_get_l2_table_request {
uint8_t version;
- uint8_t type;
+ uint8_t type == 4;
uint16_t length;
uint32_t xid;
- uint32_t experimenter; // OF_EXPERIMENTER_ID_BSN
- uint32_t subtype; // BSN_L2_TABLE_GET_REQUEST
+ uint32_t experimenter == 0x5c16c7;
+ uint32_t subtype == 13;
};
-struct ofp_bsn_get_l2_table_reply {
+struct of_bsn_get_l2_table_reply {
uint8_t version;
- uint8_t type;
+ uint8_t type == 4;
uint16_t length;
uint32_t xid;
- uint32_t experimenter; // OF_EXPERIMENTER_ID_BSN
- uint32_t subtype; // BSN_L2_TABLE_GET_REPLY
+ uint32_t experimenter == 0x5c16c7;
+ uint32_t subtype == 14;
uint8_t l2_table_enable; // 1 == enabled, 0 == disabled
uint8_t pad;
uint16_t l2_table_priority; // priority of all flows in L2 table