Signed-off-by: Ben Pfaff <b...@nicira.com> --- FAQ.md | 33 +++++++++------ build-aux/extract-ofp-errors | 3 +- build-aux/extract-ofp-msgs | 3 +- include/openflow/openflow-common.h | 5 ++- lib/ofp-actions.c | 1 + lib/ofp-errors.c | 4 +- lib/ofp-msgs.c | 5 +++ lib/ofp-print.c | 4 ++ lib/ofp-util.c | 82 ++++++++++++++++++++++++++++++++------ lib/ofp-util.h | 9 +++-- tests/ofp-errors.at | 2 + tests/ofproto-macros.at | 2 +- tests/ofproto.at | 42 +++++++++---------- tests/ovs-ofctl.at | 18 ++++----- utilities/ovs-ofctl.c | 1 + vswitchd/vswitch.ovsschema | 7 ++-- vswitchd/vswitch.xml | 7 ++-- 17 files changed, 157 insertions(+), 71 deletions(-)
diff --git a/FAQ.md b/FAQ.md index 5ce42b9..228f71d 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1387,25 +1387,32 @@ Using OpenFlow (Manually or Via Controller) A: The following table lists the versions of OpenFlow supported by each version of Open vSwitch: - Open vSwitch OF1.0 OF1.1 OF1.2 OF1.3 OF1.4 OF1.5 - ###============ ===== ===== ===== ===== ===== ===== - 1.9 and earlier yes --- --- --- --- --- - 1.10 yes --- [*] [*] --- --- - 1.11 yes --- [*] [*] --- --- - 2.0 yes [*] [*] [*] --- --- - 2.1 yes [*] [*] [*] --- --- - 2.2 yes [*] [*] [*] [%] [*] - 2.3 yes yes yes yes [*] [*] + Open vSwitch OF1.0 OF1.1 OF1.2 OF1.3 OF1.4 OF1.5 OF1.6 + ###============ ===== ===== ===== ===== ===== ===== ===== + 1.9 and earlier yes --- --- --- --- --- --- + 1.10 yes --- [*] [*] --- --- --- + 1.11 yes --- [*] [*] --- --- --- + 2.0 yes [*] [*] [*] --- --- --- + 2.1 yes [*] [*] [*] --- --- --- + 2.2 yes [*] [*] [*] [%] [*] --- + 2.3 yes yes yes yes [*] [*] --- + 2.4 yes yes yes yes [*] [*] --- + 2.5 yes yes yes yes [*] [*] [*] [*] Supported, with one or more missing features. [%] Experimental, unsafe implementation. Open vSwitch 2.3 enables OpenFlow 1.0, 1.1, 1.2, and 1.3 by default in ovs-vswitchd. In Open vSwitch 1.10 through 2.2, OpenFlow 1.1, - 1.2, and 1.3 must be enabled manually in ovs-vswitchd. OpenFlow - 1.4 and 1.5 are also supported, with missing features, in Open - vSwitch 2.3 and later, but not enabled by default. In any case, - the user may override the default: + 1.2, and 1.3 must be enabled manually in ovs-vswitchd. + + Some versions of OpenFlow are supported with missing features and + therefore not enabled by default: OpenFlow 1.4 and 1.5, in Open + vSwitch 2.3 and later, as well as OpenFlow 1.6 in Open vSwitch 2.5 + and later. Also, the OpenFlow 1.6 specification is still under + development and thus subject to change. + + In any case, the user may override the default: - To enable OpenFlow 1.0, 1.1, 1.2, and 1.3 on bridge br0: diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors index 16bfbc7..4eb54ca 100755 --- a/build-aux/extract-ofp-errors +++ b/build-aux/extract-ofp-errors @@ -12,7 +12,8 @@ version_map = {"1.0": 0x01, "1.2": 0x03, "1.3": 0x04, "1.4": 0x05, - "1.5": 0x06} + "1.5": 0x06, + "1.6": 0x07} version_reverse_map = dict((v, k) for (k, v) in version_map.iteritems()) token = None diff --git a/build-aux/extract-ofp-msgs b/build-aux/extract-ofp-msgs index b00039d..53f6bb3 100755 --- a/build-aux/extract-ofp-msgs +++ b/build-aux/extract-ofp-msgs @@ -12,7 +12,8 @@ VERSION = {"1.0": 0x01, "1.2": 0x03, "1.3": 0x04, "1.4": 0x05, - "1.5": 0x06} + "1.5": 0x06, + "1.6": 0x07} NX_VENDOR_ID = 0x00002320 ONF_VENDOR_ID = 0x4f4e4600 diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h index d32213f..7e7773e 100644 --- a/include/openflow/openflow-common.h +++ b/include/openflow/openflow-common.h @@ -32,7 +32,7 @@ */ /* - * Copyright (c) 2008-2014 Nicira, Inc. + * Copyright (c) 2008-2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,7 +77,8 @@ enum ofp_version { OFP12_VERSION = 0x03, OFP13_VERSION = 0x04, OFP14_VERSION = 0x05, - OFP15_VERSION = 0x06 + OFP15_VERSION = 0x06, + OFP16_VERSION = 0x07 }; /* Vendor (aka experimenter) IDs. diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index ad88c6e..383f181 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -6009,6 +6009,7 @@ get_ofpact_map(enum ofp_version version) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: default: return of12; } diff --git a/lib/ofp-errors.c b/lib/ofp-errors.c index 6159105..fda5055 100644 --- a/lib/ofp-errors.c +++ b/lib/ofp-errors.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2014 Nicira, Inc. + * Copyright (c) 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,6 +54,8 @@ ofperr_domain_from_version(enum ofp_version version) return &ofperr_of14; case OFP15_VERSION: return &ofperr_of15; + case OFP16_VERSION: + return &ofperr_of16; default: return NULL; } diff --git a/lib/ofp-msgs.c b/lib/ofp-msgs.c index 3a120e2..2a2e142 100644 --- a/lib/ofp-msgs.c +++ b/lib/ofp-msgs.c @@ -268,6 +268,7 @@ ofp_is_stat_request(enum ofp_version version, uint8_t type) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return type == OFPT11_STATS_REQUEST; } @@ -285,6 +286,7 @@ ofp_is_stat_reply(enum ofp_version version, uint8_t type) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return type == OFPT11_STATS_REPLY; } @@ -326,6 +328,7 @@ ofphdrs_len(const struct ofphdrs *hdrs) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: if (hdrs->type == OFPT11_STATS_REQUEST || hdrs->type == OFPT11_STATS_REPLY) { return (hdrs->stat == OFPST_VENDOR @@ -760,6 +763,7 @@ ofpraw_stats_request_to_reply(enum ofpraw raw, uint8_t version) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: ovs_assert(hdrs.type == OFPT11_STATS_REQUEST); hdrs.type = OFPT11_STATS_REPLY; break; @@ -980,6 +984,7 @@ ofpmp_flags__(const struct ofp_header *oh) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return &((struct ofp11_stats_msg *) oh)->flags; default: OVS_NOT_REACHED(); diff --git a/lib/ofp-print.c b/lib/ofp-print.c index b8088f3..5f65994 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -487,6 +487,7 @@ ofp_print_switch_features(struct ds *string, const struct ofp_header *oh) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return; /* no ports in ofp13_switch_features */ default: OVS_NOT_REACHED(); @@ -2288,6 +2289,9 @@ ofp_print_version(const struct ofp_header *oh, case OFP15_VERSION: ds_put_cstr(string, " (OF1.5)"); break; + case OFP16_VERSION: + ds_put_cstr(string, " (OF1.6)"); + break; default: ds_put_format(string, " (OF 0x%02"PRIx8")", oh->version); break; diff --git a/lib/ofp-util.c b/lib/ofp-util.c index eb22fb7..8ac6ea6 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -690,6 +690,7 @@ ofputil_match_typical_len(enum ofputil_protocol protocol) case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: return NXM_TYPICAL_LEN; default: @@ -732,6 +733,7 @@ ofputil_put_ofp11_match(struct ofpbuf *b, const struct match *match, case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: return oxm_put_match(b, match, ofputil_protocol_to_ofp_version(protocol)); } @@ -779,6 +781,7 @@ static const struct proto_abbrev proto_abbrevs[] = { #define N_PROTO_ABBREVS ARRAY_SIZE(proto_abbrevs) enum ofputil_protocol ofputil_flow_dump_protocols[] = { + OFPUTIL_P_OF16_OXM, OFPUTIL_P_OF15_OXM, OFPUTIL_P_OF14_OXM, OFPUTIL_P_OF13_OXM, @@ -809,6 +812,8 @@ ofputil_protocols_from_ofp_version(enum ofp_version version) return OFPUTIL_P_OF14_OXM; case OFP15_VERSION: return OFPUTIL_P_OF15_OXM; + case OFP16_VERSION: + return OFPUTIL_P_OF16_OXM; default: return 0; } @@ -846,6 +851,8 @@ ofputil_protocol_to_ofp_version(enum ofputil_protocol protocol) return OFP14_VERSION; case OFPUTIL_P_OF15_OXM: return OFP15_VERSION; + case OFPUTIL_P_OF16_OXM: + return OFP16_VERSION; } OVS_NOT_REACHED(); @@ -928,6 +935,9 @@ ofputil_protocol_set_tid(enum ofputil_protocol protocol, bool enable) case OFPUTIL_P_OF15_OXM: return OFPUTIL_P_OF15_OXM; + case OFPUTIL_P_OF16_OXM: + return OFPUTIL_P_OF16_OXM; + default: OVS_NOT_REACHED(); } @@ -974,6 +984,9 @@ ofputil_protocol_set_base(enum ofputil_protocol cur, case OFPUTIL_P_OF15_OXM: return ofputil_protocol_set_tid(OFPUTIL_P_OF15_OXM, tid); + case OFPUTIL_P_OF16_OXM: + return ofputil_protocol_set_tid(OFPUTIL_P_OF16_OXM, tid); + default: OVS_NOT_REACHED(); } @@ -1016,6 +1029,9 @@ ofputil_protocol_to_string(enum ofputil_protocol protocol) case OFPUTIL_P_OF15_OXM: return "OXM-OpenFlow15"; + + case OFPUTIL_P_OF16_OXM: + return "OXM-OpenFlow16"; } /* Check abbreviations. */ @@ -1157,6 +1173,9 @@ ofputil_version_from_string(const char *s) if (!strcasecmp(s, "OpenFlow15")) { return OFP15_VERSION; } + if (!strcasecmp(s, "OpenFlow16")) { + return OFP16_VERSION; + } return 0; } @@ -1231,6 +1250,8 @@ ofputil_version_to_string(enum ofp_version ofp_version) return "OpenFlow14"; case OFP15_VERSION: return "OpenFlow15"; + case OFP16_VERSION: + return "OpenFlow16"; default: OVS_NOT_REACHED(); } @@ -1466,6 +1487,7 @@ ofputil_encode_set_protocol(enum ofputil_protocol current, case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: /* There is only one variant of each OpenFlow 1.1+ protocol, and we * verified above that we're not trying to change versions. */ OVS_NOT_REACHED(); @@ -2244,7 +2266,8 @@ ofputil_encode_flow_mod(const struct ofputil_flow_mod *fm, case OFPUTIL_P_OF12_OXM: case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: - case OFPUTIL_P_OF15_OXM: { + case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: { struct ofp11_flow_mod *ofm; int tailroom; @@ -2735,7 +2758,8 @@ ofputil_encode_flow_stats_request(const struct ofputil_flow_stats_request *fsr, case OFPUTIL_P_OF12_OXM: case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: - case OFPUTIL_P_OF15_OXM: { + case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: { struct ofp11_flow_stats_request *ofsr; raw = (fsr->aggregate @@ -3235,7 +3259,8 @@ ofputil_encode_flow_removed(const struct ofputil_flow_removed *fr, case OFPUTIL_P_OF12_OXM: case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: - case OFPUTIL_P_OF15_OXM: { + case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: { struct ofp12_flow_removed *ofr; msg = ofpraw_alloc_xid(OFPRAW_OFPT11_FLOW_REMOVED, @@ -3549,6 +3574,7 @@ ofputil_encode_packet_in(const struct ofputil_packet_in *pin, case OFPUTIL_P_OF13_OXM: case OFPUTIL_P_OF14_OXM: case OFPUTIL_P_OF15_OXM: + case OFPUTIL_P_OF16_OXM: packet = ofputil_encode_ofp12_packet_in(pin, protocol); break; @@ -3959,6 +3985,7 @@ ofputil_put_phy_port(enum ofp_version ofp_version, case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: ofputil_put_ofp14_port(pp, b); break; @@ -4004,7 +4031,8 @@ ofputil_encode_port_desc_stats_request(enum ofp_version ofp_version, request = ofpraw_alloc(OFPRAW_OFPST10_PORT_DESC_REQUEST, ofp_version, 0); break; - case OFP15_VERSION:{ + case OFP15_VERSION: + case OFP16_VERSION:{ struct ofp15_port_desc_request *req; request = ofpraw_alloc(OFPRAW_OFPST15_PORT_DESC_REQUEST, ofp_version, 0); @@ -4053,6 +4081,7 @@ ofputil_capabilities_mask(enum ofp_version ofp_version) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return OFPC_COMMON | OFPC12_PORT_BLOCKED; default: /* Caller needs to check osf->header.version itself */ @@ -4172,6 +4201,7 @@ ofputil_encode_switch_features(const struct ofputil_switch_features *features, case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: raw = OFPRAW_OFPT13_FEATURES_REPLY; break; default: @@ -4197,6 +4227,7 @@ ofputil_encode_switch_features(const struct ofputil_switch_features *features, case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: osf->auxiliary_id = features->auxiliary_id; /* fall through */ case OFP11_VERSION: @@ -4287,6 +4318,7 @@ ofputil_encode_port_status(const struct ofputil_port_status *ps, case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: raw = OFPRAW_OFPT14_PORT_STATUS; break; @@ -4444,7 +4476,8 @@ ofputil_encode_port_mod(const struct ofputil_port_mod *pm, break; } case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp14_port_mod_prop_ethernet *eth; struct ofp14_port_mod *opm; @@ -4773,6 +4806,7 @@ ofputil_encode_table_features_request(enum ofp_version ofp_version) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: request = ofpraw_alloc(OFPRAW_OFPST13_TABLE_FEATURES_REQUEST, ofp_version, 0); break; @@ -5087,6 +5121,7 @@ ofputil_encode_table_config(enum ofputil_table_miss miss, case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: /* OpenFlow 1.4 introduced OFPTC14_EVICTION and OFPTC14_VACANCY_EVENTS * and we don't support the latter yet. */ return htonl(eviction == OFPUTIL_TABLE_EVICTION_ON @@ -5215,7 +5250,8 @@ ofputil_encode_table_mod(const struct ofputil_table_mod *tm, break; } case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp14_table_mod *otm; struct ofp14_table_mod_prop_eviction *ote; @@ -5629,6 +5665,7 @@ ofputil_append_table_stats_reply(struct ofpbuf *reply, case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: ofputil_put_ofp13_table_stats(stats, reply); break; @@ -5799,6 +5836,7 @@ ofputil_decode_table_stats_reply(struct ofpbuf *msg, case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return ofputil_decode_ofp13_table_stats(msg, stats, features); default: @@ -6102,7 +6140,8 @@ ofputil_encode_packet_out(const struct ofputil_packet_out *po, case OFP12_VERSION: case OFP13_VERSION: case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp11_packet_out *opo; size_t len; @@ -6160,6 +6199,7 @@ ofputil_encode_barrier_request(enum ofp_version ofp_version) enum ofpraw type; switch (ofp_version) { + case OFP16_VERSION: case OFP15_VERSION: case OFP14_VERSION: case OFP13_VERSION: @@ -6451,6 +6491,7 @@ ofputil_pull_phy_port(enum ofp_version ofp_version, struct ofpbuf *b, } case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: return b->size ? ofputil_pull_ofp14_port(pp, b) : EOF; default: OVS_NOT_REACHED(); @@ -6680,7 +6721,8 @@ ofputil_encode_dump_ports_request(enum ofp_version ofp_version, ofp_port_t port) case OFP12_VERSION: case OFP13_VERSION: case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp11_port_stats_request *req; request = ofpraw_alloc(OFPRAW_OFPST11_PORT_REQUEST, ofp_version, 0); req = ofpbuf_put_zeros(request, sizeof *req); @@ -6804,6 +6846,7 @@ ofputil_append_port_stat(struct ovs_list *replies, case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: ofputil_append_ofp14_port_stats(ops, replies); break; @@ -7051,6 +7094,7 @@ ofputil_decode_port_stats_request(const struct ofp_header *request, ofp_port_t *ofp10_port) { switch ((enum ofp_version)request->version) { + case OFP16_VERSION: case OFP15_VERSION: case OFP14_VERSION: case OFP13_VERSION: @@ -7203,7 +7247,8 @@ ofputil_encode_group_stats_request(enum ofp_version ofp_version, case OFP12_VERSION: case OFP13_VERSION: case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp11_group_stats_request *req; request = ofpraw_alloc(OFPRAW_OFPST11_GROUP_REQUEST, ofp_version, 0); req = ofpbuf_put_zeros(request, sizeof *req); @@ -7269,7 +7314,8 @@ ofputil_encode_group_desc_request(enum ofp_version ofp_version, request = ofpraw_alloc(OFPRAW_OFPST11_GROUP_DESC_REQUEST, ofp_version, 0); break; - case OFP15_VERSION:{ + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp15_group_desc_request *req; request = ofpraw_alloc(OFPRAW_OFPST15_GROUP_DESC_REQUEST, ofp_version, 0); @@ -7348,7 +7394,8 @@ ofputil_append_group_stats(struct ovs_list *replies, case OFP13_VERSION: case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp13_group_stats *gs13; length = sizeof *gs13 + bucket_counter_size; @@ -7379,6 +7426,7 @@ ofputil_encode_group_features_request(enum ofp_version ofp_version) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: request = ofpraw_alloc(OFPRAW_OFPST12_GROUP_FEATURES_REQUEST, ofp_version, 0); break; @@ -7713,6 +7761,7 @@ ofputil_append_group_desc_reply(const struct ofputil_group_desc *gds, break; case OFP15_VERSION: + case OFP16_VERSION: ofputil_append_ofp15_group_desc_reply(gds, buckets, replies, version); break; @@ -8261,6 +8310,7 @@ ofputil_decode_group_desc_reply(struct ofputil_group_desc *gd, return ofputil_decode_ofp11_group_desc_reply(gd, msg, version); case OFP15_VERSION: + case OFP16_VERSION: return ofputil_decode_ofp15_group_desc_reply(gd, msg, version); case OFP10_VERSION: @@ -8436,6 +8486,7 @@ ofputil_encode_group_mod(enum ofp_version ofp_version, return ofputil_encode_ofp11_group_mod(ofp_version, gm); case OFP15_VERSION: + case OFP16_VERSION: return ofputil_encode_ofp15_group_mod(ofp_version, gm); default: @@ -8551,6 +8602,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh, break; case OFP15_VERSION: + case OFP16_VERSION: err = ofputil_pull_ofp15_group_mod(&msg, ofp_version, gm); break; @@ -8626,6 +8678,7 @@ ofputil_decode_queue_stats_request(const struct ofp_header *request, struct ofputil_queue_stats_request *oqsr) { switch ((enum ofp_version)request->version) { + case OFP16_VERSION: case OFP15_VERSION: case OFP14_VERSION: case OFP13_VERSION: @@ -8666,7 +8719,8 @@ ofputil_encode_queue_stats_request(enum ofp_version ofp_version, case OFP12_VERSION: case OFP13_VERSION: case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp11_queue_stats_request *req; request = ofpraw_alloc(OFPRAW_OFPST11_QUEUE_REQUEST, ofp_version, 0); req = ofpbuf_put_zeros(request, sizeof *req); @@ -8911,7 +8965,8 @@ ofputil_append_queue_stat(struct ovs_list *replies, } case OFP14_VERSION: - case OFP15_VERSION: { + case OFP15_VERSION: + case OFP16_VERSION: { struct ofp14_queue_stats *reply = ofpmp_append(replies, sizeof *reply); ofputil_queue_stats_to_ofp14(oqs, reply); break; @@ -8958,6 +9013,7 @@ ofputil_encode_bundle_ctrl_request(enum ofp_version ofp_version, "(\'-O OpenFlow14\')"); case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: request = ofpraw_alloc(OFPRAW_OFPT14_BUNDLE_CONTROL, ofp_version, 0); m = ofpbuf_put_zeros(request, sizeof *m); diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 2668e75..24f2604 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -113,10 +113,12 @@ enum ofputil_protocol { OFPUTIL_P_OF13_OXM = 1 << 6, OFPUTIL_P_OF14_OXM = 1 << 7, OFPUTIL_P_OF15_OXM = 1 << 8, + OFPUTIL_P_OF16_OXM = 1 << 9, #define OFPUTIL_P_ANY_OXM (OFPUTIL_P_OF12_OXM | \ OFPUTIL_P_OF13_OXM | \ OFPUTIL_P_OF14_OXM | \ - OFPUTIL_P_OF15_OXM) + OFPUTIL_P_OF15_OXM | \ + OFPUTIL_P_OF16_OXM) #define OFPUTIL_P_NXM_OF11_UP (OFPUTIL_P_OF10_NXM_ANY | OFPUTIL_P_OF11_STD | \ OFPUTIL_P_ANY_OXM) @@ -128,10 +130,11 @@ enum ofputil_protocol { #define OFPUTIL_P_OF12_UP (OFPUTIL_P_OF12_OXM | OFPUTIL_P_OF13_UP) #define OFPUTIL_P_OF13_UP (OFPUTIL_P_OF13_OXM | OFPUTIL_P_OF14_UP) #define OFPUTIL_P_OF14_UP (OFPUTIL_P_OF14_OXM | OFPUTIL_P_OF15_UP) -#define OFPUTIL_P_OF15_UP OFPUTIL_P_OF15_OXM +#define OFPUTIL_P_OF15_UP (OFPUTIL_P_OF15_OXM | OFPUTIL_P_OF16_UP) +#define OFPUTIL_P_OF16_UP OFPUTIL_P_OF16_OXM /* All protocols. */ -#define OFPUTIL_P_ANY ((1 << 9) - 1) +#define OFPUTIL_P_ANY ((1 << 10) - 1) /* Protocols in which a specific table may be specified in flow_mods. */ #define OFPUTIL_P_TID (OFPUTIL_P_OF10_STD_TID | \ diff --git a/tests/ofp-errors.at b/tests/ofp-errors.at index daf7ddd..caf4e4a 100644 --- a/tests/ofp-errors.at +++ b/tests/ofp-errors.at @@ -102,6 +102,7 @@ OpenFlow 1.2: vendor 0, type 3, code 5 OpenFlow 1.3: vendor 0, type 3, code 5 OpenFlow 1.4: vendor 0, type 3, code 5 OpenFlow 1.5: vendor 0, type 3, code 5 +OpenFlow 1.6: vendor 0, type 3, code 5 ]) AT_CHECK([ovs-ofctl print-error OFPBIC_BAD_EXP_TYPE], [0], [dnl OpenFlow 1.1: vendor 0, type 3, code 5 @@ -109,6 +110,7 @@ OpenFlow 1.2: vendor 0, type 3, code 6 OpenFlow 1.3: vendor 0, type 3, code 6 OpenFlow 1.4: vendor 0, type 3, code 6 OpenFlow 1.5: vendor 0, type 3, code 6 +OpenFlow 1.6: vendor 0, type 3, code 6 ]) AT_CLEANUP diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 0dc208e..362c30a 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -112,7 +112,7 @@ m4_define([OVS_VSWITCHD_START], [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system]) dnl Add bridges, ports, etc. - AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) + AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15,OpenFlow16]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) ]) # check_logs scans through all *.log files (except '*.log' and testsuite.log) diff --git a/tests/ofproto.at b/tests/ofproto.at index e3f08a8..5d3a63d 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -3854,19 +3854,19 @@ dnl Check logs for OpenFlow trace # Prevent race. OVS_WAIT_UNTIL([cat ovs-vswitchd.log | vconn_windows_sub | test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3]) AT_CHECK([print_vconn_debug | vconn_windows_sub | ofctl_strip], [0], [dnl -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO: version bitmap: 0x01 -vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x07 and earlier, peer supports version 0x01) vconn|DBG|unix: received: OFPT_FLOW_MOD: DEL actions=drop vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x07 and earlier, peer supports versions 0x01, 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -3902,11 +3902,11 @@ vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REPLY flags=0 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO: version bitmap: 0x01 -vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x07 and earlier, peer supports version 0x01) vconn|DBG|unix: received: NXT_SET_FLOW_FORMAT: format=nxm vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: @@ -3914,11 +3914,11 @@ vconn|DBG|unix: received: NXST_FLOW request: vconn|DBG|unix: sent (Success): NXST_FLOW reply: idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=output:5 idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:6 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x07 and earlier, peer supports versions 0x01, 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -3933,11 +3933,11 @@ vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REPLY flags=0 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO: version bitmap: 0x01 -vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x07 and earlier, peer supports version 0x01) vconn|DBG|unix: received: NXT_SET_FLOW_FORMAT: format=nxm vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: @@ -3945,11 +3945,11 @@ vconn|DBG|unix: received: NXST_FLOW request: vconn|DBG|unix: sent (Success): NXST_FLOW reply: idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=drop idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:7 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x07 and earlier, peer supports versions 0x01, 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -3967,11 +3967,11 @@ vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REPLY flags=0 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO: version bitmap: 0x01 -vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x07 and earlier, peer supports version 0x01) vconn|DBG|unix: received: NXT_SET_FLOW_FORMAT: format=nxm vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index c1e9ec4..cb4ce20 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -2827,11 +2827,11 @@ dnl Check logs for OpenFlow trace OVS_WAIT_UNTIL([cat ovs-vswitchd.log | vconn_windows_sub | test `grep -- "|vconn|DBG|unix: sent (Success): OFPST_FLOW reply" | wc -l` -ge 2]) # AT_CHECK([sed -n "s/^.*\(|vconn|DBG|.*xid=.*:\).*$/\1/p" ovs-vswitchd.log], [0], [dnl AT_CHECK([print_vconn_debug | vconn_windows_sub | ofctl_strip], [0], [dnl -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x07 and earlier, peer supports versions 0x01, 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -2864,11 +2864,11 @@ vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REPLY flags=0 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x07 and earlier, peer supports versions 0x01, 0x05) vconn|DBG|unix: received: OFPST_FLOW request (OF1.4): vconn|DBG|unix: sent (Success): OFPST_FLOW reply (OF1.4): vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): @@ -2891,11 +2891,11 @@ vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=COMMIT_REPLY flags=0 -vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): - version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.6): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): version bitmap: 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports version 0x05) +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x07 and earlier, peer supports version 0x05) vconn|DBG|unix: received: OFPST_FLOW request (OF1.4): vconn|DBG|unix: sent (Success): OFPST_FLOW reply (OF1.4): importance=2, dl_vlan=2 actions=drop diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 6ec7151..7acca04 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1762,6 +1762,7 @@ ofctl_monitor(struct ovs_cmdl_context *ctx) case OFP13_VERSION: case OFP14_VERSION: case OFP15_VERSION: + case OFP16_VERSION: break; default: OVS_NOT_REACHED(); diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema index 35f145f..e0937f4 100644 --- a/vswitchd/vswitch.ovsschema +++ b/vswitchd/vswitch.ovsschema @@ -1,6 +1,6 @@ {"name": "Open_vSwitch", - "version": "7.12.1", - "cksum": "2211824403 22535", + "version": "7.13.0", + "cksum": "2202834738 22577", "tables": { "Open_vSwitch": { "columns": { @@ -97,7 +97,8 @@ "OpenFlow12", "OpenFlow13", "OpenFlow14", - "OpenFlow15"]]}, + "OpenFlow15", + "OpenFlow16"]]}, "min": 0, "max": "unlimited"}}, "fail_mode": { "type": {"key": {"type": "string", diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index c075975..b947a9b 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -692,9 +692,10 @@ </p> <p> - OpenFlow 1.4 and 1.5 are not enabled by default because their - implementations are missing features. - </p> + OpenFlow 1.4, 1.5, and 1.6 are not enabled by default because their + implementations are missing features. In addition, the OpenFlow 1.6 + specification is still under development and thus subject to change. + </p> </column> </group> -- 2.1.3 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev