Signed-off-by: IWASE Yusuke <iwase.yusu...@gmail.com> --- ryu/ofproto/ofproto_v1_3.py | 9 +++++++-- ryu/ofproto/ofproto_v1_4.py | 11 ++++++----- ryu/ofproto/ofproto_v1_5.py | 11 ++++++----- 3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ryu/ofproto/ofproto_v1_3.py b/ryu/ofproto/ofproto_v1_3.py index 3e7a17e..366eaff 100644 --- a/ryu/ofproto/ofproto_v1_3.py +++ b/ryu/ofproto/ofproto_v1_3.py @@ -653,9 +653,14 @@ OFP_BUCKET_COUNTER_PACK_STR = '!QQ' OFP_BUCKET_COUNTER_SIZE = 16 assert calcsize(OFP_BUCKET_COUNTER_PACK_STR) == OFP_BUCKET_COUNTER_SIZE +# struct ofp_group_desc +OFP_GROUP_DESC_PACK_STR = '!HBxI' +OFP_GROUP_DESC_SIZE = 8 +assert calcsize(OFP_GROUP_DESC_PACK_STR) == OFP_GROUP_DESC_SIZE + # struct ofp_group_desc_stats -OFP_GROUP_DESC_STATS_PACK_STR = '!HBxI' -OFP_GROUP_DESC_STATS_SIZE = 8 +OFP_GROUP_DESC_STATS_PACK_STR = OFP_GROUP_DESC_PACK_STR +OFP_GROUP_DESC_STATS_SIZE = OFP_GROUP_DESC_SIZE assert calcsize(OFP_GROUP_DESC_STATS_PACK_STR) == OFP_GROUP_DESC_STATS_SIZE # struct ofp_group_features diff --git a/ryu/ofproto/ofproto_v1_4.py b/ryu/ofproto/ofproto_v1_4.py index 534c6b2..47c2f1a 100644 --- a/ryu/ofproto/ofproto_v1_4.py +++ b/ryu/ofproto/ofproto_v1_4.py @@ -1154,11 +1154,6 @@ OFP_BUCKET_COUNTER_PACK_STR = '!QQ' OFP_BUCKET_COUNTER_SIZE = 16 assert calcsize(OFP_BUCKET_COUNTER_PACK_STR) == OFP_BUCKET_COUNTER_SIZE -# struct ofp_group_desc_stats -OFP_GROUP_DESC_STATS_PACK_STR = '!HBxI' -OFP_GROUP_DESC_STATS_SIZE = 8 -assert calcsize(OFP_GROUP_DESC_STATS_PACK_STR) == OFP_GROUP_DESC_STATS_SIZE - # struct ofp_group_stats OFP_GROUP_STATS_PACK_STR = '!H2xII4xQQII' OFP_GROUP_STATS_SIZE = 40 @@ -1169,6 +1164,12 @@ OFP_GROUP_DESC_PACK_STR = '!HBxI' OFP_GROUP_DESC_SIZE = 8 assert calcsize(OFP_GROUP_DESC_PACK_STR) == OFP_GROUP_DESC_SIZE +# struct ofp_group_desc_stats +# Backward compatibility with 1.3.1 - avoid breaking the API. +OFP_GROUP_DESC_STATS_PACK_STR = OFP_GROUP_DESC_PACK_STR +OFP_GROUP_DESC_STATS_SIZE = OFP_GROUP_DESC_SIZE +assert calcsize(OFP_GROUP_DESC_STATS_PACK_STR) == OFP_GROUP_DESC_STATS_SIZE + # enum ofp_group_capabilities OFPGFC_SELECT_WEIGHT = 1 << 0 # Support weight for select groups. OFPGFC_SELECT_LIVENESS = 1 << 1 # Support liveness for select groups. diff --git a/ryu/ofproto/ofproto_v1_5.py b/ryu/ofproto/ofproto_v1_5.py index 0740884..2cc4ebf 100644 --- a/ryu/ofproto/ofproto_v1_5.py +++ b/ryu/ofproto/ofproto_v1_5.py @@ -1375,11 +1375,6 @@ OFP_BUCKET_COUNTER_PACK_STR = '!QQ' OFP_BUCKET_COUNTER_SIZE = 16 assert calcsize(OFP_BUCKET_COUNTER_PACK_STR) == OFP_BUCKET_COUNTER_SIZE -# struct ofp_group_desc_stats -OFP_GROUP_DESC_STATS_PACK_STR = '!HBxI' -OFP_GROUP_DESC_STATS_SIZE = 8 -assert calcsize(OFP_GROUP_DESC_STATS_PACK_STR) == OFP_GROUP_DESC_STATS_SIZE - # struct ofp_group_stats OFP_GROUP_STATS_PACK_STR = '!H2xII4xQQII' OFP_GROUP_STATS_SIZE = 40 @@ -1390,6 +1385,12 @@ OFP_GROUP_DESC_PACK_STR = '!HBxIH6x' OFP_GROUP_DESC_SIZE = 16 assert calcsize(OFP_GROUP_DESC_PACK_STR) == OFP_GROUP_DESC_SIZE +# struct ofp_group_desc_stats +# Backward compatibility with 1.3.1 - avoid breaking the API. +OFP_GROUP_DESC_STATS_PACK_STR = OFP_GROUP_DESC_PACK_STR +OFP_GROUP_DESC_STATS_SIZE = OFP_GROUP_DESC_SIZE +assert calcsize(OFP_GROUP_DESC_STATS_PACK_STR) == OFP_GROUP_DESC_STATS_SIZE + # enum ofp_group_capabilities OFPGFC_SELECT_WEIGHT = 1 << 0 # Support weight for select groups. OFPGFC_SELECT_LIVENESS = 1 << 1 # Support liveness for select groups. -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list Ryu-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ryu-devel
