Merge into master from pull request #211:
Remove padding from action_ids. (https://github.com/floodlight/loxigen/pull/211)
diff --git a/loxi_ir/ir.py b/loxi_ir/ir.py
index 6a053c6..c8ca04d 100644
--- a/loxi_ir/ir.py
+++ b/loxi_ir/ir.py
@@ -440,10 +440,15 @@
superclass_name = None
superclass = None
+ ofc_members = []
+ for m in orig_fe.members:
+ if not isinstance(m, frontend_ir.OFDataMember) and not isinstance(m, frontend_ir.OFPadMember):
+ ofc_members.append(m)
+
fe = frontend_ir.OFClass(
name=name,
superclass=superclass_name,
- members=[m for m in orig_fe.members if not isinstance(m, frontend_ir.OFDataMember)],
+ members=ofc_members,
virtual=orig_fe.virtual,
params={})
diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index 764ad21..a91c859 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -758,7 +758,6 @@
struct of_action_id {
uint16_t type;
uint16_t len;
- pad(4);
};
struct of_action_output : of_action {
diff --git a/test_data/of13/action_id_output.data b/test_data/of13/action_id_output.data
new file mode 100644
index 0000000..7712203
--- /dev/null
+++ b/test_data/of13/action_id_output.data
@@ -0,0 +1,8 @@
+-- binary
+00 00 # type
+00 04 # length
+-- python
+ofp.action_id.output()
+-- c
+obj = of_action_id_output_new(OF_VERSION_1_3);
+-- java