diff options
author | Ben Pfaff <blp@nicira.com> | 2011-12-06 22:33:49 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-03-07 14:05:04 -0800 |
commit | 87ea5e5e26c97598cd66ef64c8386afac2b77fff (patch) | |
tree | 3e52212871b54a831c56d08c0e67abf855bdb907 /tests/test-vconn.c | |
parent | 539315543cc6123ae4efec162e291f7f90d0ccf0 (diff) | |
download | openvswitch-87ea5e5e26c97598cd66ef64c8386afac2b77fff.tar.gz |
Begin breaking openflow-1.0.h into common and version-specific definitions.
The intention is that, as each OpenFlow 1.1 and 1.2 feature is added to Open
vSwitch, the corresponding protocol definitions will be broken up this way:
- Definitions that are the same in OF1.0 and OF1.1 will retain the "OFP"
or "ofp" prefix and move to openflow-common.h.
- Definitions that are specific to OF1.0 will be renamed with an "OFP10"
or "ofp10" prefix and stay in openflow-1.0.h.
- Definitions that are specific to OF1.1 or to OF1.1 and OF1.2 will be
renamed with an "OFP11" or "ofp11" prefix and move to openflow-1.1.h.
- Definitions that are specific to OF1.2 will be renamed with an "OFP12"
or "ofp12" prefix and move to openflow-1.2.h.
This commit starts this process with some basic OpenFlow definitions.
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests/test-vconn.c')
-rw-r--r-- | tests/test-vconn.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 42940c302..8dfc1e437 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -147,7 +147,7 @@ test_refuse_connection(int argc OVS_UNUSED, char *argv[]) : EPROTO); fpv_create(type, &fpv); - CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0); + CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn), 0); fpv_close(&fpv); vconn_run(vconn); CHECK_ERRNO(vconn_connect(vconn), expected_error); @@ -171,7 +171,7 @@ test_accept_then_close(int argc OVS_UNUSED, char *argv[]) : EPROTO); fpv_create(type, &fpv); - CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0); + CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn), 0); vconn_run(vconn); stream_close(fpv_accept(&fpv)); fpv_close(&fpv); @@ -192,7 +192,7 @@ test_read_hello(int argc OVS_UNUSED, char *argv[]) struct stream *stream; fpv_create(type, &fpv); - CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0); + CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn), 0); vconn_run(vconn); stream = fpv_accept(&fpv); fpv_destroy(&fpv); @@ -202,7 +202,7 @@ test_read_hello(int argc OVS_UNUSED, char *argv[]) retval = stream_recv(stream, &hello, sizeof hello); if (retval == sizeof hello) { - CHECK(hello.version, OFP_VERSION); + CHECK(hello.version, OFP10_VERSION); CHECK(hello.type, OFPT_HELLO); CHECK(ntohs(hello.length), sizeof hello); break; @@ -238,7 +238,7 @@ test_send_hello(const char *type, const void *out, size_t out_size, size_t n_sent; fpv_create(type, &fpv); - CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0); + CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn), 0); vconn_run(vconn); stream = fpv_accept(&fpv); fpv_destroy(&fpv); @@ -268,7 +268,7 @@ test_send_hello(const char *type, const void *out, size_t out_size, struct ofp_header hello; int retval = stream_recv(stream, &hello, sizeof hello); if (retval == sizeof hello) { - CHECK(hello.version, OFP_VERSION); + CHECK(hello.version, OFP10_VERSION); CHECK(hello.type, OFPT_HELLO); CHECK(ntohs(hello.length), sizeof hello); read_hello = true; @@ -318,7 +318,7 @@ test_send_plain_hello(int argc OVS_UNUSED, char *argv[]) const char *type = argv[1]; struct ofp_header hello; - hello.version = OFP_VERSION; + hello.version = OFP10_VERSION; hello.type = OFPT_HELLO; hello.length = htons(sizeof hello); hello.xid = htonl(0x12345678); @@ -335,7 +335,7 @@ test_send_long_hello(int argc OVS_UNUSED, char *argv[]) struct ofp_header hello; char buffer[sizeof hello * 2]; - hello.version = OFP_VERSION; + hello.version = OFP10_VERSION; hello.type = OFPT_HELLO; hello.length = htons(sizeof buffer); hello.xid = htonl(0x12345678); @@ -352,7 +352,7 @@ test_send_echo_hello(int argc OVS_UNUSED, char *argv[]) const char *type = argv[1]; struct ofp_header echo; - echo.version = OFP_VERSION; + echo.version = OFP10_VERSION; echo.type = OFPT_ECHO_REQUEST; echo.length = htons(sizeof echo); echo.xid = htonl(0x89abcdef); @@ -379,7 +379,7 @@ test_send_invalid_version_hello(int argc OVS_UNUSED, char *argv[]) const char *type = argv[1]; struct ofp_header hello; - hello.version = OFP_VERSION - 1; + hello.version = OFP10_VERSION - 1; hello.type = OFPT_HELLO; hello.length = htons(sizeof hello); hello.xid = htonl(0x12345678); |