pyloxi: remove 'skip' field from Member
The other member types catch the ones that would previously set this flag.
The type fields of instructions, action_ids, etc still aren't populated.
diff --git a/py_gen/codegen.py b/py_gen/codegen.py
index 2221e5a..7b6aa37 100644
--- a/py_gen/codegen.py
+++ b/py_gen/codegen.py
@@ -35,7 +35,7 @@
OFClass = namedtuple('OFClass', ['name', 'pyname', 'members', 'type_members',
'min_length', 'is_fixed_length'])
-Member = namedtuple('Member', ['name', 'oftype', 'offset', 'skip'])
+Member = namedtuple('Member', ['name', 'oftype', 'offset'])
LengthMember = namedtuple('LengthMember', ['name', 'oftype', 'offset'])
FieldLengthMember = namedtuple('FieldLengthMember', ['name', 'oftype', 'offset', 'field_name'])
TypeMember = namedtuple('TypeMember', ['name', 'oftype', 'offset', 'value'])
@@ -146,8 +146,7 @@
else:
members.append(Member(name=member['name'],
oftype=oftype.OFType(member['m_type'], version),
- offset=member['offset'],
- skip=member['name'] in of_g.skip_members))
+ offset=member['offset']))
ofclasses.append(
OFClass(name=cls,
diff --git a/py_gen/templates/_ofclass.py b/py_gen/templates/_ofclass.py
index 03fe837..8c21bb3 100644
--- a/py_gen/templates/_ofclass.py
+++ b/py_gen/templates/_ofclass.py
@@ -1,5 +1,5 @@
:: from py_gen.codegen import Member, LengthMember, TypeMember
-:: normal_members = [m for m in ofclass.members if type(m) == Member and not m.skip]
+:: normal_members = [m for m in ofclass.members if type(m) == Member]
class ${ofclass.pyname}(${superclass}):
:: for m in ofclass.type_members:
${m.name} = ${m.value}
diff --git a/py_gen/templates/_pretty_print.py b/py_gen/templates/_pretty_print.py
index 5d5edee..5709227 100644
--- a/py_gen/templates/_pretty_print.py
+++ b/py_gen/templates/_pretty_print.py
@@ -30,7 +30,7 @@
with q.indent(2):
q.breakable()
:: from py_gen.codegen import Member, LengthMember, TypeMember
-:: normal_members = [m for m in ofclass.members if type(m) == Member and not m.skip]
+:: normal_members = [m for m in ofclass.members if type(m) == Member]
:: first = True
:: for m in normal_members:
:: if not first:
diff --git a/py_gen/templates/message.py b/py_gen/templates/message.py
index 86fb3bf..d81d5b7 100644
--- a/py_gen/templates/message.py
+++ b/py_gen/templates/message.py
@@ -46,7 +46,7 @@
:: for ofclass in ofclasses:
:: from py_gen.codegen import Member, LengthMember, TypeMember
-:: normal_members = [m for m in ofclass.members if type(m) == Member and not m.skip]
+:: normal_members = [m for m in ofclass.members if type(m) == Member]
:: type_members = [m for m in ofclass.members if type(m) == TypeMember]
class ${ofclass.pyname}(Message):
:: for m in type_members:
diff --git a/py_gen/templates/oxm.py b/py_gen/templates/oxm.py
index 5d5df7a..e11a0a4 100644
--- a/py_gen/templates/oxm.py
+++ b/py_gen/templates/oxm.py
@@ -53,7 +53,7 @@
:: for ofclass in ofclasses:
:: from py_gen.codegen import Member, LengthMember, TypeMember
-:: normal_members = [m for m in ofclass.members if type(m) == Member and not m.skip]
+:: normal_members = [m for m in ofclass.members if type(m) == Member]
:: type_members = [m for m in ofclass.members if type(m) == TypeMember]
class ${ofclass.pyname}(OXM):
:: for m in type_members:
diff --git a/py_gen/tests/of11.py b/py_gen/tests/of11.py
index ac1c02e..8099586 100644
--- a/py_gen/tests/of11.py
+++ b/py_gen/tests/of11.py
@@ -71,14 +71,6 @@
def test_serialization(self):
expected_failures = [
ofp.common.group_desc_stats_entry,
- ofp.common.instruction,
- ofp.common.instruction_apply_actions,
- ofp.common.instruction_clear_actions,
- ofp.common.instruction_experimenter,
- ofp.common.instruction_goto_table,
- ofp.common.instruction_header,
- ofp.common.instruction_write_actions,
- ofp.common.instruction_write_metadata,
ofp.common.table_stats_entry,
ofp.message.group_desc_stats_reply,
ofp.message.group_mod,
diff --git a/py_gen/tests/of12.py b/py_gen/tests/of12.py
index 0a2f38e..6e1486c 100644
--- a/py_gen/tests/of12.py
+++ b/py_gen/tests/of12.py
@@ -160,14 +160,6 @@
expected_failures = [
ofp.common.flow_stats_entry,
ofp.common.group_desc_stats_entry,
- ofp.common.instruction,
- ofp.common.instruction_apply_actions,
- ofp.common.instruction_clear_actions,
- ofp.common.instruction_experimenter,
- ofp.common.instruction_goto_table,
- ofp.common.instruction_header,
- ofp.common.instruction_write_actions,
- ofp.common.instruction_write_metadata,
ofp.common.table_stats_entry,
ofp.message.flow_add,
ofp.message.flow_delete,
diff --git a/py_gen/tests/of13.py b/py_gen/tests/of13.py
index 09ec013..e471b1e 100644
--- a/py_gen/tests/of13.py
+++ b/py_gen/tests/of13.py
@@ -137,61 +137,8 @@
def test_serialization(self):
expected_failures = [
- ofp.common.action_id,
- ofp.common.action_id_bsn_mirror,
- ofp.common.action_id_bsn_set_tunnel_dst,
- ofp.common.action_id_copy_ttl_in,
- ofp.common.action_id_copy_ttl_out,
- ofp.common.action_id_dec_mpls_ttl,
- ofp.common.action_id_dec_nw_ttl,
- ofp.common.action_id_experimenter,
- ofp.common.action_id_group,
- ofp.common.action_id_header,
- ofp.common.action_id_nicira_dec_ttl,
- ofp.common.action_id_output,
- ofp.common.action_id_pop_mpls,
- ofp.common.action_id_pop_pbb,
- ofp.common.action_id_pop_vlan,
- ofp.common.action_id_push_mpls,
- ofp.common.action_id_push_pbb,
- ofp.common.action_id_push_vlan,
- ofp.common.action_id_set_field,
- ofp.common.action_id_set_mpls_ttl,
- ofp.common.action_id_set_nw_ttl,
- ofp.common.action_id_set_queue,
ofp.common.flow_stats_entry,
ofp.common.group_desc_stats_entry,
- ofp.common.instruction,
- ofp.common.instruction_apply_actions,
- ofp.common.instruction_clear_actions,
- ofp.common.instruction_experimenter,
- ofp.common.instruction_goto_table,
- ofp.common.instruction_header,
- ofp.common.instruction_meter,
- ofp.common.instruction_write_actions,
- ofp.common.instruction_write_metadata,
- ofp.common.meter_band,
- ofp.common.meter_band_drop,
- ofp.common.meter_band_dscp_remark,
- ofp.common.meter_band_experimenter,
- ofp.common.meter_band_header,
- ofp.common.table_feature_prop,
- ofp.common.table_feature_prop_apply_actions,
- ofp.common.table_feature_prop_apply_actions_miss,
- ofp.common.table_feature_prop_apply_setfield,
- ofp.common.table_feature_prop_apply_setfield_miss,
- ofp.common.table_feature_prop_experimenter,
- ofp.common.table_feature_prop_header,
- ofp.common.table_feature_prop_instructions,
- ofp.common.table_feature_prop_instructions_miss,
- ofp.common.table_feature_prop_match,
- ofp.common.table_feature_prop_next_tables,
- ofp.common.table_feature_prop_next_tables_miss,
- ofp.common.table_feature_prop_wildcards,
- ofp.common.table_feature_prop_write_actions,
- ofp.common.table_feature_prop_write_actions_miss,
- ofp.common.table_feature_prop_write_setfield,
- ofp.common.table_feature_prop_write_setfield_miss,
ofp.message.flow_add,
ofp.message.flow_delete,
ofp.message.flow_delete_strict,