openflow: Add Open Flow 1.2 to ofp_to_string__()

Signed-off-by: Simon Horman <horms@verge.net.au>
[blp@nicira.com fixed testsuite failure.]
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index cf9d93fa670b973fd41c98192cf81a05a29a7eee..5103c3e10e1f7521acc65c90397ff4ca5492fc1c 100644 (file)
--- 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 5f7629425ee773815c83d40f161476a8bc9d8fca..331a8f8a0014b251557d12119b77e149867daadf 100644 (file)
--- 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