[ovs-dev] [PATCH] ofproto: Fix supported group types.

Shu Shen shu.shen at radisys.com
Mon Nov 10 22:41:21 UTC 2014


Previously the types field is uninited and leds to no supported type
being reported in OFPMP_GROUP_FEATURES message.

Signed-off-by: Shu Shen <shu.shen at radisys.com>
---
 ofproto/ofproto.c |  3 +++
 tests/ofproto.at  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 6be338a..2648a96 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -523,6 +523,9 @@ 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);
+
+    /* No support for OFPGT11_FF per init_group() */
+    ofproto->ogf.types = 0x7;
     ofproto->ogf.capabilities = OFPGFC_CHAINING | OFPGFC_SELECT_LIVENESS |
                                 OFPGFC_SELECT_WEIGHT;
     for (i = 0; i < 4; i++) {
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 475e478..f4703d0 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -414,8 +414,17 @@ 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:  0x7
     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
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
-- 
1.9.3




More information about the dev mailing list