From: Shu Shen Date: Tue, 11 Nov 2014 00:35:08 +0000 (-0800) Subject: ofproto: Fix supported group types. X-Git-Tag: v2.3.1~6 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=f6d23392d19db356aa0d08957ed905eef270fff4 ofproto: Fix supported group types. Previously the types field is uninited and leds to no supported type being reported in OFPMP_GROUP_FEATURES message. Signed-off-by: Shu Shen Signed-off-by: Ben Pfaff --- diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 98ed75df9..2048fdeac 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -536,6 +536,7 @@ ofproto_create(const char *datapath_name, const char *datapath_type, ovs_rwlock_init(&ofproto->groups_rwlock); hmap_init(&ofproto->groups); ovs_mutex_unlock(&ofproto_mutex); + ofproto->ogf.types = 0xf; ofproto->ogf.capabilities = OFPGFC_CHAINING | OFPGFC_SELECT_LIVENESS | OFPGFC_SELECT_WEIGHT; ofproto->ogf.max_groups[OFPGT11_ALL] = OFPG_MAX; diff --git a/tests/ofproto.at b/tests/ofproto.at index 83effeb57..9427d7b59 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -397,8 +397,20 @@ AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn dump-group-features br0], [0], [stdout] AT_CHECK([STRIP_XIDS stdout], [0], [dnl OFPST_GROUP_FEATURES reply (OF1.2): Group table: - Types: 0x0 + Types: 0xf Capabilities: 0x7 + all group: + max_groups=0xffffff00 + actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue + select group: + max_groups=0xffffff00 + actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue + indirect group: + max_groups=0xffffff00 + actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue + fast failover group: + max_groups=0xffffff00 + actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue ]) OVS_VSWITCHD_STOP AT_CLEANUP