On Wed, Jun 27, 2012 at 05:19:52PM +0900, Simon Horman wrote:
> Signed-off-by: Simon Horman <ho...@verge.net.au>
I pushed this one to master as follows:
--8<--------------------------cut here-------------------------->8--
From: Simon Horman <ho...@verge.net.au>
Date: Wed, 27 Jun 2012 17:19:52 +0900
Subject: [PATCH] openflow: Add Open Flow 1.2 to ofp_to_string__()
Signed-off-by: Simon Horman <ho...@verge.net.au>
[b...@nicira.com fixed testsuite failure.]
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
lib/ofp-print.c | 3 +++
tests/ofp-errors.at | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index cf9d93f..5103c3e 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -1617,6 +1617,9 @@ ofp_to_string__(const struct ofp_header *oh,
case OFP11_VERSION:
ds_put_cstr(string, " (OF1.1)");
break;
+ case OFP12_VERSION:
+ ds_put_cstr(string, " (OF1.2)");
+ break;
default:
ds_put_format(string, " (OF 0x%02"PRIx8")", oh->version);
break;
diff --git a/tests/ofp-errors.at b/tests/ofp-errors.at
index 5f76294..331a8f8 100644
--- a/tests/ofp-errors.at
+++ b/tests/ofp-errors.at
@@ -86,12 +86,12 @@ OFPT_ECHO_REQUEST (xid=0x11111111): 0 bytes of payload
])
AT_KEYWORDS([ofp-print ofp-errors])
AT_CHECK([ovs-ofctl ofp-print '0301001455555555 00030005 0102000811111111'],
[0], [dnl
-OFPT_ERROR (OF 0x03) (xid=0x55555555): OFPBIC_BAD_EXPERIMENTER
+OFPT_ERROR (OF1.2) (xid=0x55555555): OFPBIC_BAD_EXPERIMENTER
OFPT_ECHO_REQUEST (xid=0x11111111): 0 bytes of payload
])
AT_KEYWORDS([ofp-print ofp-errors])
AT_CHECK([ovs-ofctl ofp-print '0301001455555555 00030006 0102000811111111'],
[0], [dnl
-OFPT_ERROR (OF 0x03) (xid=0x55555555): OFPBIC_BAD_EXP_TYPE
+OFPT_ERROR (OF1.2) (xid=0x55555555): OFPBIC_BAD_EXP_TYPE
OFPT_ECHO_REQUEST (xid=0x11111111): 0 bytes of payload
])
AT_CLEANUP
--
1.7.2.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
