commit 28b508fa4a1405372bfb5d5057eee800cfa9c91e
author abat <abat@bigswitch.com> Tue Oct 15 17:34:18 2013 -0700
committer abat <abat@bigswitch.com> Tue Oct 15 17:34:18 2013 -0700
tree f516a8605765708c33e0f46cbd39c4b539c331ce
parent 1cec3dd1b6b0b0fa7ecdcca497a53ee9af212520
parent f86f39ab8a348e9462d07534d1e9fc48a8d3e514

Merge into master from pull request #90:
add bsn_flow_idle extension (https://github.com/floodlight/loxigen/pull/90)

openflow_input/standard-1.1

diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1
index 85f696f..f985b6d 100644
--- a/openflow_input/standard-1.1
+++ b/openflow_input/standard-1.1
@@ -1202,7 +1202,7 @@
 
 struct of_group_desc_stats_entry {
     uint16_t length;
-    uint8_t type;
+    uint8_t group_type;
     pad(1);
     uint32_t group_id;
     list(of_bucket_t) buckets;

openflow_input/standard-1.2

diff --git a/openflow_input/standard-1.2 b/openflow_input/standard-1.2
index 72568fb..9032458 100644
--- a/openflow_input/standard-1.2
+++ b/openflow_input/standard-1.2
@@ -1171,7 +1171,7 @@
 
 struct of_group_desc_stats_entry {
     uint16_t length;
-    uint8_t type;
+    uint8_t group_type;
     pad(1);
     uint32_t group_id;
     list(of_bucket_t) buckets;

openflow_input/standard-1.3

diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index cbab686..b567d6d 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -1386,7 +1386,7 @@
 
 struct of_group_desc_stats_entry {
     uint16_t length;
-    uint8_t type;
+    uint8_t group_type;
     pad(1);
     uint32_t group_id;
     list(of_bucket_t) buckets;

test_data/of13/group_desc_stats_reply.data

diff --git a/test_data/of13/group_desc_stats_reply.data b/test_data/of13/group_desc_stats_reply.data
index 34c0d50..5e95a67 100644
--- a/test_data/of13/group_desc_stats_reply.data
+++ b/test_data/of13/group_desc_stats_reply.data
@@ -49,7 +49,7 @@
     flags=0,
     entries=[
         ofp.group_desc_stats_entry(
-            type=ofp.OFPGT_FF,
+            group_type=ofp.OFPGT_FF,
             group_id=1,
             buckets=[
                 ofp.bucket(
@@ -66,4 +66,4 @@
                     actions=[
                         ofp.action.output(port=5, max_len=0),
                         ofp.action.output(port=6, max_len=0)])]),
-        ofp.group_desc_stats_entry(type=ofp.OFPGT_FF, group_id=2, buckets=[])])
+        ofp.group_desc_stats_entry(group_type=ofp.OFPGT_FF, group_id=2, buckets=[])])