commit 62eaceaeb6630f3ee66913945eb5a0d6e9aca23e
author abat <abat@bigswitch.com> Mon Nov 18 19:36:30 2013 -0800
committer abat <abat@bigswitch.com> Mon Nov 18 19:36:30 2013 -0800
tree 3e7b855f7751f22db14d161fb81dd203b5fb40e7
parent b6ed320851ec32fad37d4db53f2b3acb4e3301dd
parent 9e8a2d89ae05cf0b164f69716707a8fde0f7ad71

Merge into master from pull request #132:
openflow_input: fix of_group_desc_stats_entry.group_type (https://github.com/floodlight/loxigen/pull/132)

loxi_ir/ir.py

diff --git a/loxi_ir/ir.py b/loxi_ir/ir.py
index e2c4a34..8553f62 100644
--- a/loxi_ir/ir.py
+++ b/loxi_ir/ir.py
@@ -360,7 +360,7 @@
         member = ir_class(offset = length_info.offset,
                         base_length = length_info.base_length,
                         is_fixed_length=length_info.is_fixed_length,
-                        **convert_member_properties(vars(fe_member)))
+                        **convert_member_properties(fe_member._asdict()))
         member.of_class = of_class
         return member
 

openflow_input/standard-1.1

diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1
index 906519c..7dedae7 100644
--- a/openflow_input/standard-1.1
+++ b/openflow_input/standard-1.1
@@ -1241,7 +1241,7 @@
 
 struct of_group_desc_stats_entry {
     uint16_t length;
-    uint8_t group_type;
+    enum ofp_group_type 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 90447f5..8f21594 100644
--- a/openflow_input/standard-1.2
+++ b/openflow_input/standard-1.2
@@ -1208,7 +1208,7 @@
 
 struct of_group_desc_stats_entry {
     uint16_t length;
-    uint8_t group_type;
+    enum ofp_group_type 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 4d0ca7e..1518931 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -1427,7 +1427,7 @@
 
 struct of_group_desc_stats_entry {
     uint16_t length;
-    uint8_t group_type;
+    enum ofp_group_type group_type;
     pad(1);
     uint32_t group_id;
     list(of_bucket_t) buckets;