From 4932f8fcff1c802d6bc5e163d677e276394ce32e Mon Sep 17 00:00:00 2001 From: r12f Date: Sat, 9 Dec 2023 19:48:46 +0000 Subject: [PATCH] Rename objectName to object_name. --- dash-pipeline/SAI/sai_api_gen.py | 8 ++++---- dash-pipeline/SAI/templates/saiapi.h.j2 | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dash-pipeline/SAI/sai_api_gen.py b/dash-pipeline/SAI/sai_api_gen.py index cd672dac0..690043178 100755 --- a/dash-pipeline/SAI/sai_api_gen.py +++ b/dash-pipeline/SAI/sai_api_gen.py @@ -175,7 +175,7 @@ def __init__(self): self.type = None self.isresourcetype = None self.isreadonly = None - self.objectName = None + self.object_name = None self.skipattr = None self.field = None @@ -223,7 +223,7 @@ def _parse_sai_object_annotation(self, p4rt_anno_list): elif kv['key'] == 'isreadonly': self.isreadonly = kv['value']['stringValue'] elif kv['key'] == 'objects': - self.objectName = kv['value']['stringValue'] + self.object_name = kv['value']['stringValue'] elif kv['key'] == 'skipattr': self.skipattr = kv['value']['stringValue'] else: @@ -644,7 +644,7 @@ def __update_table_param_object_name_reference(self): table_ref = param.name[:-len("_id")] for table_name in all_table_names: if table_ref.endswith(table_name): - param.objectName = table_name + param.object_name = table_name # Update object name reference for keys for table in sai_api.tables: @@ -654,7 +654,7 @@ def __update_table_param_object_name_reference(self): table_ref = key.sai_key_name[:-len("_id")] for table_name in all_table_names: if table_ref.endswith(table_name): - key.objectName = table_name + key.object_name = table_name def __parse_sai_table_action(self, p4rt_actions, sai_enums): diff --git a/dash-pipeline/SAI/templates/saiapi.h.j2 b/dash-pipeline/SAI/templates/saiapi.h.j2 index a5006ae7f..bf4df0c8e 100644 --- a/dash-pipeline/SAI/templates/saiapi.h.j2 +++ b/dash-pipeline/SAI/templates/saiapi.h.j2 @@ -67,7 +67,7 @@ typedef struct _sai_{{ table.name }}_t * @brief {{ key.match_type | capitalize | replace('Lpm', 'LPM') }} matched key {{ key.sai_key_name }} {% if key.type == 'sai_object_id_t' %} * - * @objects SAI_OBJECT_TYPE_{{ key.objectName | upper }} + * @objects SAI_OBJECT_TYPE_{{ key.object_name | upper }} {% endif %} */ {{ key.type }} {{ key.sai_key_name | lower }}; @@ -179,7 +179,7 @@ typedef enum _sai_{{ table.name }}_attr_t {% elif param.type == 'bool' %} * @default false {% elif param.type == 'sai_object_id_t' %} - * @objects SAI_OBJECT_TYPE_{{ param.objectName | upper }} + * @objects SAI_OBJECT_TYPE_{{ param.object_name | upper }} * @allownull true * @default SAI_NULL_OBJECT_ID {% elif param.field == 's32' %}