ofproto/ofproto_v1_0: typo, missing consts

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 61 insertions, 19 deletions

diff --git a/ryu/ofproto/ofproto_v1_0.py b/ryu/ofproto/ofproto_v1_0.py
index cdd8603d..03993ae9 100644
--- a/ryu/ofproto/ofproto_v1_0.py
+++ b/ryu/ofproto/ofproto_v1_0.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2011 Nippon Telegraph and Telephone Corporation.
-# Copyright (C) 2011 Isaku Yamahata <yamahata at valinux co jp>
+# Copyright (C) 2011, 2012 Isaku Yamahata <yamahata at valinux co jp>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -181,7 +181,6 @@ OFPAT_VENDOR = 0xffff
 OFP_ACTION_OUTPUT_PACK_STR = '!HHHH'
 OFP_ACTION_OUTPUT_SIZE = 8
 assert calcsize(OFP_ACTION_OUTPUT_PACK_STR) == OFP_ACTION_OUTPUT_SIZE
-OFP_ACTION_OUTPUT_LEN = 8
 
 # define constants
 OFP_VLAN_NONE = 0xffff
@@ -219,9 +218,9 @@ OFP_ACTION_HEADER_PACK_STR = '!HH4x'
 OFP_ACTION_HEADER_SIZE = 8
 assert calcsize(OFP_ACTION_HEADER_PACK_STR) == OFP_ACTION_HEADER_SIZE
 
-OFP_ACTION_QUEUE_PACK_STR = '!HHH6xI'
-OFP_ACTION_QUEUE_SIZE = 16
-assert calcsize(OFP_ACTION_QUEUE_PACK_STR) == OFP_ACTION_QUEUE_SIZE
+OFP_ACTION_ENQUEUE_PACK_STR = '!HHH6xI'
+OFP_ACTION_ENQUEUE_SIZE = 16
+assert calcsize(OFP_ACTION_ENQUEUE_PACK_STR) == OFP_ACTION_ENQUEUE_SIZE
 
 OFP_ACTION_PACK_STR = '!H'
 # because of union ofp_action
@@ -363,12 +362,12 @@ OFP_ERROR_MSG_SIZE = 12
 assert calcsize(OFP_ERROR_MSG_PACK_STR) + OFP_HEADER_SIZE == OFP_ERROR_MSG_SIZE
 
 # enum ofp_stats_types
-OFPST_DESC = 1
-OFPST_FLOW = 2
-OFPST_AGGREGATE = 3
-OFPST_TABLE = 4
-OFPST_PORT = 5
-OFPST_QUEUE = 6
+OFPST_DESC = 0
+OFPST_FLOW = 1
+OFPST_AGGREGATE = 2
+OFPST_TABLE = 3
+OFPST_PORT = 4
+OFPST_QUEUE = 5
 OFPST_VENDOR = 0xffff
 
 _OFP_STATS_MSG_PACK_STR = 'HH'
@@ -386,21 +385,33 @@ SERIAL_NUM_LEN = 32
 SERIAL_NUM_LEN_STR = str(SERIAL_NUM_LEN)
 
 OFP_DESC_STATS_PACK_STR = '!' + \
-                          DESC_STR_LEN_STR + 'c' + \
-                          DESC_STR_LEN_STR + 'c' + \
-                          DESC_STR_LEN_STR + 'c' + \
-                          SERIAL_NUM_LEN_STR + 'c' + \
-                          DESC_STR_LEN_STR + 'c'
+                          DESC_STR_LEN_STR + 's' + \
+                          DESC_STR_LEN_STR + 's' + \
+                          DESC_STR_LEN_STR + 's' + \
+                          SERIAL_NUM_LEN_STR + 's' + \
+                          DESC_STR_LEN_STR + 's'
 OFP_DESC_STATS_SIZE = 1068
 assert (calcsize(OFP_DESC_STATS_PACK_STR) + OFP_STATS_MSG_SIZE ==
         OFP_DESC_STATS_SIZE)
 
-OFP_FLOW_STATS_REQUEST_PACK_STR = '!' + _OFP_MATCH_PACK_STR + 'BxH'
+_OFP_FLOW_STATS_REQUEST_ID_PORT_STR = 'BxH'
+OFP_FLOW_STATS_REQUEST_ID_PORT_STR = '!' + _OFP_FLOW_STATS_REQUEST_ID_PORT_STR
+OFP_FLOW_STATS_REQUEST_PACK_STR = '!' + _OFP_MATCH_PACK_STR + \
+                                  _OFP_FLOW_STATS_REQUEST_ID_PORT_STR
 OFP_FLOW_STATS_REQUEST_SIZE = 56
 assert (calcsize(OFP_FLOW_STATS_REQUEST_PACK_STR) + OFP_STATS_MSG_SIZE ==
         OFP_FLOW_STATS_REQUEST_SIZE)
 
-OFP_FLOW_STATS_PACK_STR = '!HBx' + _OFP_MATCH_PACK_STR + 'IIHHH6xQQQ'
+_OFP_FLOW_STATS_0_PACK_STR = 'HBx'
+OFP_FLOW_STATS_0_PACK_STR = '!' + _OFP_FLOW_STATS_0_PACK_STR
+OFP_FLOW_STATS_0_SIZE = 4
+assert calcsize(OFP_FLOW_STATS_0_PACK_STR) == OFP_FLOW_STATS_0_SIZE
+_OFP_FLOW_STATS_1_PACK_STR = 'IIHHH6xQQQ'
+OFP_FLOW_STATS_1_PACK_STR = '!' + _OFP_FLOW_STATS_1_PACK_STR
+OFP_FLOW_STATS_1_SIZE = 44
+assert calcsize(OFP_FLOW_STATS_1_PACK_STR) == OFP_FLOW_STATS_1_SIZE
+OFP_FLOW_STATS_PACK_STR = '!' + _OFP_FLOW_STATS_0_PACK_STR +\
+                          _OFP_MATCH_PACK_STR + _OFP_FLOW_STATS_1_PACK_STR
 OFP_FLOW_STATS_SIZE = 88
 assert calcsize(OFP_FLOW_STATS_PACK_STR) == OFP_FLOW_STATS_SIZE
 
@@ -409,7 +420,7 @@ OFP_AGGREGATE_STATS_REPLY_SIZE = 36
 assert (calcsize(OFP_AGGREGATE_STATS_REPLY_PACK_STR) +
         OFP_STATS_MSG_SIZE == OFP_AGGREGATE_STATS_REPLY_SIZE)
 
-OFP_TABLE_STATS_PACK_STR = '!B3x' + OFP_MAX_TABLE_NAME_LEN_STR + 'cIIIQQ'
+OFP_TABLE_STATS_PACK_STR = '!B3x' + OFP_MAX_TABLE_NAME_LEN_STR + 'sIIIQQ'
 OFP_TABLE_STATS_SIZE = 64
 assert calcsize(OFP_TABLE_STATS_PACK_STR) == OFP_TABLE_STATS_SIZE
 
@@ -424,6 +435,11 @@ assert calcsize(OFP_PORT_STATS_PACK_STR) == OFP_PORT_STATS_SIZE
 
 OFPQ_ALL = 0xffffffff
 
+OFP_QUEUE_STATS_REQUEST_PACK_STR = '!HxxI'
+OFP_QUEUE_STATS_REQUEST_SIZE = 8
+assert (calcsize(OFP_QUEUE_STATS_REQUEST_PACK_STR) ==
+        OFP_QUEUE_STATS_REQUEST_SIZE)
+
 OFP_QUEUE_STATS_PACK_STR = '!H2xIQQQ'
 OFP_QUEUE_STATS_SIZE = 32
 assert calcsize(OFP_QUEUE_STATS_PACK_STR) == OFP_QUEUE_STATS_SIZE
@@ -437,3 +453,29 @@ OFP_VENDOR_HEADER_PACK_STR = '!I'
 OFP_VENDOR_HEADER_SIZE = 12
 assert (calcsize(OFP_VENDOR_HEADER_PACK_STR) + OFP_HEADER_SIZE ==
         OFP_VENDOR_HEADER_SIZE)
+
+OFP_QUEUE_GET_CONFIG_REQUEST_PACK_STR = '!H2x'
+OFP_QUEUE_GET_CONFIG_REQUEST_SIZE = 12
+assert (calcsize(OFP_QUEUE_GET_CONFIG_REQUEST_PACK_STR) + OFP_HEADER_SIZE ==
+        OFP_QUEUE_GET_CONFIG_REQUEST_SIZE)
+
+OFP_QUEUE_GET_CONFIG_REPLY_PACK_STR = '!H6x'
+OFP_QUEUE_GET_CONFIG_REPLY_SIZE = 16
+assert (calcsize(OFP_QUEUE_GET_CONFIG_REPLY_PACK_STR) + OFP_HEADER_SIZE ==
+        OFP_QUEUE_GET_CONFIG_REPLY_SIZE)
+
+OFP_PACKET_QUEUE_PQCK_STR = '!IH2x'
+OFP_PACKET_QUEUE_SIZE = 8
+assert calcsize(OFP_PACKET_QUEUE_PQCK_STR) == OFP_PACKET_QUEUE_SIZE
+
+OFPQT_NONE = 0
+OFPQT_MIN_RATE = 1
+
+OFP_QUEUE_PROP_HEADER_PACK_STR = '!HH4x'
+OFP_QUEUE_PROP_HEADER_SIZE = 8
+assert calcsize(OFP_QUEUE_PROP_HEADER_PACK_STR) == OFP_QUEUE_PROP_HEADER_SIZE
+
+OFP_QUEUE_PROP_MIN_RATE_PACK_STR = '!H6x'
+OFP_QUEUE_PROP_MIN_RATE_SIZE = 16
+assert (calcsize(OFP_QUEUE_PROP_MIN_RATE_PACK_STR) +
+        OFP_QUEUE_PROP_HEADER_SIZE == OFP_QUEUE_PROP_MIN_RATE_SIZE)