applying patch for test templates
diff --git a/c_gen/templates/locitest/test_ext.c b/c_gen/templates/locitest/test_ext.c
index 87f9916..75f4a00 100644
--- a/c_gen/templates/locitest/test_ext.c
+++ b/c_gen/templates/locitest/test_ext.c
@@ -61,9 +61,13 @@
TEST_ASSERT(of_meter_band_to_object_id(OF_EXPERIMENTER_TYPE, OF_VERSION_1_0) ==
OF_METER_BAND_EXPERIMENTER);
- TEST_ASSERT(of_table_feature_prop_to_object_id(OF_EXPERIMENTER_TYPE,
+ TEST_ASSERT(of_table_feature_prop_to_object_id(OF_EXPERIMENTER_TYPE-1,
OF_VERSION_1_3) ==
OF_TABLE_FEATURE_PROP_EXPERIMENTER);
+ TEST_ASSERT(of_table_feature_prop_to_object_id(OF_EXPERIMENTER_TYPE,
+ OF_VERSION_1_3) ==
+ OF_TABLE_FEATURE_PROP_EXPERIMENTER_MISS);
+
return TEST_PASS;
}
diff --git a/c_gen/templates/of_type_maps.c b/c_gen/templates/of_type_maps.c
index 9bc3d5c..dc021a9 100644
--- a/c_gen/templates/of_type_maps.c
+++ b/c_gen/templates/of_type_maps.c
@@ -372,19 +372,6 @@
/**
- * @fixme to do when we have table_feature_prop extensions
- * See extension_action above
- */
-
-static void
-extension_table_feature_prop_object_id_get(of_object_t *obj, of_object_id_t *id)
-{
- (void)obj;
-
- *id = OF_TABLE_FEATURE_PROP_EXPERIMENTER;
-}
-
-/**
* Table feature property object ID determination
*
* @param obj The object being referenced
@@ -397,15 +384,7 @@
int wire_type;
of_tlv16_wire_type_get(obj, &wire_type);
- if (wire_type == OF_EXPERIMENTER_TYPE) {
- extension_table_feature_prop_object_id_get(obj, id);
- return;
- }
-
- ASSERT(wire_type >= 0 && wire_type < OF_TABLE_FEATURE_PROP_ITEM_COUNT);
-
- *id = of_table_feature_prop_type_to_id[obj->version][wire_type];
- ASSERT(*id != OF_OBJECT_INVALID);
+ *id = of_table_feature_prop_to_object_id(wire_type, obj->version);
}
/**