From 310397305bfa74ef56e9bbc80b4f736cb2a6ec9d Mon Sep 17 00:00:00 2001 From: Minoru TAKAHASHI Date: Mon, 3 Aug 2015 17:00:14 +0900 Subject: [PATCH] test_parser: Regen OFP15 group_desc request packet Re-generate the packet data by using packet_data_generator2. (This patch is to complete the TODO of https://github.com/osrg/ryu/commit/d0733220f391d861c110ea76541d98be8f625fc8 ) Signed-off-by: Minoru TAKAHASHI Signed-off-by: FUJITA Tomonori --- .../libofproto-OFP15-group_desc_request.packet | Bin 24 -> 24 bytes ryu/tests/packet_data_generator2/gen.c | 10 ++++++++++ ...ibofproto-OFP15-group_desc_request.packet.json | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet b/ryu/tests/packet_data/of15/libofproto-OFP15-group_desc_request.packet index 6310337edc28c69c2846fb43a0e5a23e04750a59..ee6ee7cee44f8203b41b1f949ff98de95adb03d2 100644 GIT binary patch literal 24 VcmZP*Vvt|}0d_D6B+jk|u>cIr0k8l7 literal 24 VcmZP*Vvt|}0d_D6BvzjVu>cIJ0k8l7 diff --git a/ryu/tests/packet_data_generator2/gen.c b/ryu/tests/packet_data_generator2/gen.c index 5691ae6f..cd7ec3d4 100644 --- a/ryu/tests/packet_data_generator2/gen.c +++ b/ryu/tests/packet_data_generator2/gen.c @@ -277,6 +277,14 @@ bundle_add(enum ofputil_protocol proto) return add; } +struct ofpbuf * +group_desc_request(enum ofputil_protocol proto) +{ + uint32_t group_id = 0xcdab; + + return ofputil_encode_group_desc_request(0x06, group_id); +} + struct protocol_version { const char *name; const char *dir_name; @@ -312,6 +320,8 @@ const struct message messages[] = { ((const struct protocol_version *[]){&p15, NULL})), M(bundle_add, ((const struct protocol_version *[]){&p15, NULL})), + M(group_desc_request, + ((const struct protocol_version *[]){&p15, NULL})), }; #if !defined(__arraycount) diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json index f0331a40..1589ed61 100644 --- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-group_desc_request.packet.json @@ -1,7 +1,7 @@ { "OFPGroupDescStatsRequest": { "flags": 0, - "group_id": 43981, + "group_id": 52651, "type": 7 } }