openubmc-bingo 0.6.68__py3-none-any.whl → 0.6.73__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.68'
+__version__ = '0.6.73'

bmcgo/codegen/__init__.py

@@ -11,4 +11,4 @@
 
 # 非常重要，修改bmcgo后如果自动生成代码有变更的，必须变更__version__字段
 # 该版本号会传入mako渲染，在自动生成变更时需要做到向下兼容，确保代码自动生成功能OK
-__version__ = 18
+__version__ = 19

bmcgo/codegen/lua/script/check_intfs.py

@@ -33,6 +33,7 @@ class IntfPool:
                     self.add_from_service(os.path.join(root, file))
                 if file == "model.json":
                     self.add_from_model(os.path.join(root, file))
+            self.pool["Properties"].add("bmc.kepler.Object.Properties")
 
         if project_name == 'hwproxy':
             for root, _, files in os.walk(os.path.join(mdb_path, "intf/mdb/bmc/dev")):

bmcgo/codegen/lua/script/dto/options.py

@@ -18,6 +18,7 @@ class Options:
         self.source_file_path: str = options.source_file_path
         self.template_name: str = options.template_name
         self.output_file_path: str = options.output_file_path
+        self.ignore_empty_input: bool = options.ignore_empty_input
         self.enable_auto_merge: bool = options.enable_auto_merge
         self.project_name = options.project_name
         self.version = options.version

bmcgo/codegen/lua/script/gen_db_json.py

@@ -380,7 +380,7 @@ def rectify_local_db(historical_local_db_file, out_dict):
         table_info["properties"] = new_props
 
 
-def save_json_file(is_local, load_dict, historical_local_db_file, of_name, disable_gen=False):
+def save_json_file(is_local, load_dict, historical_local_db_file, of_name, disable_gen):
     package = of_name.split("/")[-2]
     extra_imports = set()
     datas = make_datas(load_dict, package, extra_imports, is_local)
@@ -420,8 +420,9 @@ def generate(if_name, historical_local_db_file, of_name):
     load_dict = json.load(load_f)
     load_f.close()
     disable_mem_db_gen = Utils.get_lua_codegen_version() >= 7 and not Utils.check_model_need_mem_db(load_dict)
-    save_json_file(False, load_dict, historical_local_db_file, of_name, disable_gen=disable_mem_db_gen) # 保存普通持久化的表
-    save_json_file(True, load_dict, historical_local_db_file, of_name)  # 保存本地持久化的表
+    save_json_file(False, load_dict, historical_local_db_file, of_name, disable_mem_db_gen) # 保存普通持久化的表
+    disable_local_db_gen = Utils.get_lua_codegen_version() >= 19 and not Utils.check_model_need_local_db(load_dict)
+    save_json_file(True, load_dict, historical_local_db_file, of_name, disable_local_db_gen)  # 保存本地持久化的表
 
 
 def usage():

bmcgo/codegen/lua/script/gen_rpc_msg_json.py

@@ -16,6 +16,7 @@ import getopt
 import sys
 import os
 import stat
+from collections import defaultdict
 import mds_util as utils
 from utils import Utils
 
@@ -43,6 +44,18 @@ PROPERTY_FLAGS = {
 OPTIONS = 'options'
 
 
+def modify_common_interface_messages(messages):
+    if Utils.get_lua_codegen_version() < 19:
+        return
+    intf_map = Utils.get_unique_intf_map()
+    require_paths = {}
+    for intf_name, require_path in Utils.COMMON_INTERFACE_REQUIRE_PATHS.items():
+        unique_intf_name = intf_map.get(intf_name)
+        if unique_intf_name and unique_intf_name in messages:
+            messages[unique_intf_name]['require_path'] = require_path
+            messages[unique_intf_name]['disable_gen'] = True
+
+
 def is_struct(prop_data):
     if 'baseType' not in prop_data:
         return True
@@ -166,8 +179,9 @@ def save_msg(intfs, out_dir, project_name):
             "package": pkg_name,
             "options": {},
             "filename": file_name,
-            "require_path": f"{project_name}.{require_dir}.{pkg_name}",
+            "require_path": pkg_data.get("require_path", f"{project_name}.{require_dir}.{pkg_name}"),
             "intf": pkg_data["data"] if "data" in pkg_data else {},
+            "disable_gen": pkg_data.get("disable_gen", False)
         }
         utils.save_proto_json(f"{new_out_dir}/{file_name}.json", datas)
 
@@ -219,7 +233,7 @@ def update_package(package, msg_name, struct_data, msg_package, imports):
 
 
 # 为结构体生成message
-def gen_defs(defs, msg_package, packages, imports=None):
+def gen_defs(defs, msg_package, packages, imports=None, package_filter=None):
     if imports is None:
         imports = {}
 
@@ -228,6 +242,8 @@ def gen_defs(defs, msg_package, packages, imports=None):
 
     package = packages[msg_package]
     for struct_name, struct_data in defs.items():
+        if package_filter and not package_filter.get("defs", {}).get(struct_name, True):
+            continue
         msg_name = struct_name
         if not check_duplicate_msg(package["messages"], msg_name):
             update_package(package, msg_name, struct_data, msg_package, imports)
@@ -265,7 +281,7 @@ def convert_property_options(intf, property_name: str, options_data: dict):
     return flags
 
 
-def generate_message(intf_data, intf, packages, imports):
+def generate_message(intf_data, intf, packages, imports, package_filter=None):
     msg_package = Utils.get_unique_intf_name(intf)
 
     if msg_package not in packages:
@@ -273,7 +289,7 @@ def generate_message(intf_data, intf, packages, imports):
     package = packages[msg_package]
     package["data"] = {"name": intf, "data": intf_data}
 
-    if "methods" in intf_data:
+    if "methods" in intf_data and (not package_filter or package_filter.get("methods")):
         for method_name, method_data in intf_data["methods"].items():
             req_name = method_name + "Req"
             rsp_name = method_name + "Rsp"
@@ -285,14 +301,14 @@ def generate_message(intf_data, intf, packages, imports):
                 update_package(package, rsp_name, get_rsp(
                     method_data), msg_package, imports)
 
-    if "signals" in intf_data:
+    if "signals" in intf_data and (not package_filter or package_filter.get("signals")):
         for signal_name, signal_data in intf_data["signals"].items():
             signature_name = signal_name + "Signature"
             if not check_duplicate_msg(package["messages"], signature_name):
                 update_package(package, signature_name,
                                signal_data, msg_package, imports)
 
-    if "properties" in intf_data:
+    if "properties" in intf_data and (not package_filter or package_filter.get("properties")):
         for property_name, property_data in intf_data["properties"].items():
             if not check_duplicate_msg(package["messages"], property_name):
                 update_package(package, property_name,
@@ -365,6 +381,7 @@ def gen_service_msg(model_merged_file, of_name, mdb_path, project_name):
     messages = {}
     imports = {}
     get_service_messages(mdb_path, load_dict, messages, imports)
+    modify_common_interface_messages(messages)
     save_msg(messages, of_name, project_name)
     load_f.close()
 
@@ -387,15 +404,54 @@ def gen_model_msg(model_merged_file, of_name):
     load_f.close()
 
 
-def gen_client_msg_intf(intf_json, intf, messages):
+def gen_client_msg_intf(intf_json, intf, messages, package_filter=None):
     imports = {}
     for intf_name, intf_data in intf_json.items():
         if intf_name == "defs":
-            gen_defs(intf_data, Utils.get_unique_intf_name(intf), messages)
+            gen_defs(intf_data, Utils.get_unique_intf_name(intf), messages, None, package_filter)
         else:
             prepare_intf_data(intf_json, intf_name)
             prepare_virutal(intf_data)
-            generate_message(intf_data, intf_name, messages, imports)
+            generate_message(intf_data, intf_name, messages, imports, package_filter)
+
+
+def parse_ref_items(input_data, refs):
+    for key, value in input_data.items():
+        if key != "$ref":
+            if isinstance(value, dict):
+                parse_ref_items(value, refs)
+            continue
+        if isinstance(value, str) and value.startswith("#/defs/"):
+            refs[value.replace("#/defs/", "")] = input_data.get("baseType") == "Enum"
+
+
+def set_def_enbale_gen(input_data, defs_enable_gen, enabled):
+    refs = dict()
+    parse_ref_items(input_data, refs)
+    for ref, is_enum in refs.items():
+        if ref in defs_enable_gen:
+            defs_enable_gen[ref] = enabled or is_enum
+
+
+def parse_interface_defs(intf_json, package_filter):
+    defs_data = intf_json.get("defs", {})
+    if not defs_data:
+        return {}
+    defs_enable_gen = {def_name: False for def_name in defs_data.keys()}
+    for intf_name, intf_data in intf_json.items():
+        if intf_name == "defs":
+            continue
+        for category, enable_gen in package_filter.items():
+            for item_data in intf_data.get(category, {}).values():
+                # 属性、方法、信号如果需要生成校验器，它们引用的自定义类型也需要生成校验器
+                # 枚举类型可能被用于属性默认值，也需要生成
+                set_def_enbale_gen(item_data, defs_enable_gen, enable_gen)
+
+    for def_name, def_data in defs_data.items():
+        if defs_enable_gen.get(def_name):
+            # 自定义类型如果需要生成校验器，它们引用的其它自定义类型也需要生成校验器
+            set_def_enbale_gen(def_data, defs_enable_gen, True)
+    return defs_enable_gen
 
 
 def gen_client_msg(service_file, output, mdb_path, project_name):
@@ -412,8 +468,19 @@ def gen_client_msg(service_file, output, mdb_path, project_name):
         intf_json = utils.get_intf(intf, mdb_path)
         if "implement" in intf_json[intf]:
             intf_json = utils.generate_default(intf_json, mdb_path)
-        gen_client_msg_intf(intf_json, intf, messages)
-
+        package_filter = None
+        if Utils.get_lua_codegen_version() >= 19:
+            # 客户端用到的接口，不需要生成属性校验器、信号参数校验器，只需要生成方法参数校验器
+            # package_filter里面True表示需要生成，False表示不需要生成
+            package_filter = {
+                "properties": False,
+                "methods": True,
+                "signals": False
+            }
+            package_filter["defs"] = parse_interface_defs(intf_json, package_filter)
+        gen_client_msg_intf(intf_json, intf, messages, package_filter)
+
+    modify_common_interface_messages(messages)
     save_msg(messages, output, project_name)
     load_f.close()
 

bmcgo/codegen/lua/script/render_utils/model_lua.py

@@ -215,6 +215,9 @@ class ModelLuaUtils(Base, Utils):
     def get_mdb_prop_configs(self, msg):
         string = '{'
         for (interface, intf_msg) in msg['interfaces'].items():
+            if Utils.get_lua_codegen_version() >= 19 and interface == 'bmc.kepler.Object.Properties':
+                string += f"['{interface}'] = mdb.OBJECT_PROPERTIES_INTERFACE_PROP_CONFIGS,"
+                continue
             if not self.has_properties(intf_msg):
                 continue
             intf_name = self.get_intf_name(interface, intf_msg)
@@ -455,7 +458,8 @@ class ModelLuaUtils(Base, Utils):
             for (interface, intf_msg) in msg.get('interfaces', {}).items():
                 intf_name = self.get_intf_name(interface, intf_msg)
                 intf_type = self.get_intf_type(intf_name)
-                types[intf_type] = f"local {intf_type} = require '{project_name}.json_types.{intf_name}'\n"
+                path = Utils.get_interface_require_path(interface, project_name, intf_name)
+                types[intf_type] = f"local {intf_type} = require '{path}'\n"
         return types
 
     def render_types(self, project_name, root):

bmcgo/codegen/lua/script/template.py

@@ -52,6 +52,9 @@ def parse_input_args() -> Options:
     parser.add_argument("-v", "--version", dest="version",
                         help="version",
                         default=-1)
+    parser.add_argument("--ignore_empty_input", dest="ignore_empty_input",
+                        help="Whether to stop generating result file when input is empty",
+                        action=misc.STORE_TRUE, default=False)
     parser.add_argument("--enable_auto_merge", dest="enable_auto_merge",
                         help="Whether result files are automatically combined when customized.",
                         action=misc.STORE_TRUE, default=False)
@@ -130,6 +133,8 @@ def generate(options: Options):
     if os.path.exists(options.output_file_path):
         os.remove(options.output_file_path)
     load_imports(data, options)
+    if not data and options.ignore_empty_input and utils.Utils.get_lua_codegen_version() >= 19:
+        return
     os.makedirs(os.path.dirname(options.output_file_path), exist_ok=True)
     output_file = os.fdopen(os.open(options.output_file_path,
                             os.O_WRONLY | os.O_CREAT | os.O_TRUNC, stat.S_IWUSR | stat.S_IRUSR), 'w')

bmcgo/codegen/lua/script/utils.py

@@ -89,6 +89,18 @@ class Utils:
         'account'
     }
 
+    COMMON_INTERFACE_REQUIRE_PATHS = {
+        'bmc.kepler.MicroComponent': 'mdb.bmc.kepler.MicroComponentInterface',
+        'bmc.kepler.MicroComponent.ConfigManage': 'mdb.bmc.kepler.MicroComponent.ConfigManageInterface',
+        'bmc.kepler.MicroComponent.Debug': 'mdb.bmc.kepler.MicroComponent.DebugInterface',
+        'bmc.kepler.MicroComponent.Performance': 'mdb.bmc.kepler.MicroComponent.PerformanceInterface',
+        'bmc.kepler.MicroComponent.Reboot': 'mdb.bmc.kepler.MicroComponent.RebootInterface',
+        'bmc.kepler.MicroComponent.Reset': 'mdb.bmc.kepler.MicroComponent.ResetInterface',
+        'bmc.kepler.Object.Properties': 'mdb.bmc.kepler.Object.PropertiesInterface',
+        'bmc.kepler.Release.Maintenance': 'mdb.bmc.kepler.Release.MaintenanceInterface',
+        'bmc.kepler.TaskService.Task': 'mdb.bmc.kepler.TaskService.TaskInterface'
+    }
+
     def __init__(self, data: dict, options: Options):
         self.data = data
         self.options = options
@@ -281,7 +293,14 @@ class Utils:
             if "tableName" in class_data and class_data.get("tableLocation") != "Local":
                 return True
         return False
-    
+
+    @staticmethod
+    def check_model_need_local_db(model_json: dict):
+        for class_data in model_json.values():
+            if "tableName" in class_data and class_data.get("tableLocation") == "Local":
+                return True
+        return False
+
     @staticmethod
     def has_db(root: dict):
         return Utils.check_need_mem_db(root) or Utils.check_local_poweroff_db(root) or \
@@ -348,15 +367,24 @@ class Utils:
         return Utils.get_unique_intf_name(full_intf_name) + "." + slices[-1]
 
     @staticmethod
-    def get_unique_intf_name(intf):
-        check_intfs = Path(__file__).parent.parent.joinpath("temp").joinpath("check_intfs.json")
+    def get_unique_intf_map():
+        check_intfs = Path(__file__).parent.parent.joinpath('temp').joinpath('check_intfs.json')
         with open(check_intfs, 'r') as check_intfs_fp:
-            intf_map = json.load(check_intfs_fp)
+            return json.load(check_intfs_fp)
 
+    @staticmethod
+    def get_unique_intf_name(intf):
         slices = intf.split('.')
-        if slices[-1] == "Default":
+        if slices[-1] == 'Default':
             return slices[-2] + slices[-1]
-        return intf_map.get(intf, slices[-1])
+        return Utils.get_unique_intf_map().get(intf, slices[-1])
+
+    @staticmethod
+    def get_interface_require_path(intf_name, project_name, unique_intf_name):
+        fallback = f'{project_name}.json_types.{unique_intf_name}'
+        if Utils.get_lua_codegen_version() < 19:
+            return fallback
+        return Utils.COMMON_INTERFACE_REQUIRE_PATHS.get(intf_name, fallback)
 
     @staticmethod
     def get_files(path):

bmcgo/codegen/lua/templates/apps/Makefile

@@ -80,7 +80,7 @@ message: $(foreach v, $(MESSAGE_FILES), $(GEN_OUT_DIR)/$(v).lua)
 define MAKE_DATAS
   $$(GEN_OUT_DIR)/$(1).lua: ${PROTO_OUT_DIR}/$(1).json $${TEMPLATE_BIN} datas.lua.mako
 	@mkdir -p $$(dir $$@)
-	python3 $${TEMPLATE_BIN} -d ${PROTO_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako -o $$@
+	python3 $${TEMPLATE_BIN} -d ${PROTO_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako --ignore_empty_input -o $$@
 endef
 $(foreach v, $(YAML_FILES), $(eval $(call MAKE_DATAS,$(v))))
 datas: $(foreach v, $(YAML_FILES), $(GEN_OUT_DIR)/$(v).lua)
@@ -89,7 +89,7 @@ define MAKE_CONF_DATAS
   $$(GEN_OUT_DIR)/$(1).lua: ${CONF_DIR}/$(1).yaml $${TEMPLATE_BIN} datas.lua.mako
 	@mkdir -p $$(dir $$@)
 	python3 ${YAML_TO_JSON_BIN} -i ${CONF_DIR}/$(1).yaml -b ${CONF_DIR} -o ${PROTO_OUT_DIR}/$(1).json
-	python3 $${TEMPLATE_BIN} -d ${CONF_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako -o $$@
+	python3 $${TEMPLATE_BIN} -d ${CONF_DIR} -j ${PROTO_OUT_DIR} -n ${PROJECT_NAME} -i ${PROTO_OUT_DIR}/$(1).json -f ${LUA_FORMATER} -t datas.lua.mako --ignore_empty_input -o $$@
 endef
 $(foreach v, $(YAML_FILES_CONF), $(eval $(call MAKE_CONF_DATAS,$(v))))
 datas_conf: $(foreach v, $(YAML_FILES_CONF), $(GEN_OUT_DIR)/$(v).lua)

bmcgo/codegen/lua/templates/apps/client.lua.mako

@@ -55,7 +55,7 @@ local foreach_non_virtual_interface_objects = mdb_service.foreach_non_virtual_in
   % if intf_data['interface'].startswith('bmc.dev.'):
 local ${intf} = require '${project_name}.device_types.${intf}'
   %else:
-local ${intf} = require '${project_name}.json_types.${intf}'
+local ${intf} = require '${render_utils.get_interface_require_path(intf_data["interface"], project_name, intf)}'
   % endif
 % endfor
 

bmcgo/codegen/lua/templates/apps/model.lua.mako

@@ -182,7 +182,7 @@ local ${class_name} = {
             methods = ${render_utils.get_privileges(intf_msg.get('methods', {}))}
             }, 
             ${render_utils.get_readonlys(intf_msg.get('properties', {}))},
-            require '${project_name}.json_types.${intf_name}')
+            require '${render_utils.get_interface_require_path(interface, project_name, intf_name)}')
         objs['${interface}'] = obj
         end<% num = num + 1 %>
       % endfor
@@ -222,9 +222,10 @@ end
 
         % for (method, method_config) in intf_msg['methods'].items():
 -- The callback needs to be registered during app initialization
-function M.Impl${class_name}${render_utils.get_intf_name(interface, intf_msg)}${method}(cb)
+<% intf_name = render_utils.get_intf_name(interface, intf_msg)%>
+function M.Impl${class_name}${intf_name}${method}(cb)
     class('${class_name}')['${interface}'].${method} = function(obj, ctx, ...)
-        local ${interface.split(".")[-1].lower()}_types = require "${project_name}.json_types.${render_utils.get_intf_name(interface, intf_msg)}"
+        local ${interface.split(".")[-1].lower()}_types = require "${render_utils.get_interface_require_path(interface, project_name, intf_name)}"
         local req = ${interface.split(".")[-1].lower()}_types.${method}Req.new(...):validate(nil, nil, true)
         local rsp = ${interface.split(".")[-1].lower()}_types.${method}Rsp.new(cb(obj, ctx, req:unpack())):validate()
         return rsp:unpack(true)

bmcgo/codegen/lua/templates/apps/service.lua.mako

@@ -47,7 +47,7 @@ end
 % endif
 
 % for intf, intf_data in root['intf_imports'].items():
-local ${intf}Types = require '${project_name}.json_types.${intf}'
+local ${intf}Types = require '${render_utils.get_interface_require_path(intf_data["interface"], project_name, intf)}'
 % endfor
 
 % for cls, cls_data in root['class_require'].items():

bmcgo/codegen/lua/templates/apps/utils/mdb_intf.lua.mako

@@ -2,7 +2,11 @@
  mdb.register_interface('${intf['name']}', {
   % if 'properties' in intf['data'] :
     % for p,p_data in intf['data']['properties'].items():
+% if version >= 19:
+      ${p} = {'${render_utils.do_type_to_dbus_json(intf['data'], p_data)}', ${render_utils.options_json(p_data)}, ${render_utils.readonly_json(p_data)}, ${render_utils.default_json(p_data)}},
+% else:
       ${p} = {'${render_utils.do_type_to_dbus_json(intf['data'], p_data)}', ${render_utils.options_json(p_data)}, ${render_utils.readonly_json(p_data)}, ${render_utils.default_json(p_data)}, false},
+% endif
     % endfor
   % endif
   }, {

bmcgo/codegen/lua/v1/script/render_utils/model_lua.py

@@ -262,6 +262,9 @@ class ConsistencyModelLuaUtils(Base, Utils):
         string = '{'
         path_privilege = msg.get("privilege", [])
         for (interface, intf_msg) in msg['interfaces'].items():
+            if interface == 'bmc.kepler.Object.Properties':
+                string += f"['{interface}'] = mdb.OBJECT_PROPERTIES_INTERFACE_PROP_CONFIGS,"
+                continue
             if not self.has_properties(intf_msg):
                 continue
             interface_privilege = intf_msg.get("privilege", [])
@@ -457,7 +460,8 @@ class ConsistencyModelLuaUtils(Base, Utils):
             for (interface, intf_msg) in msg.get('interfaces', {}).items():
                 intf_name = self.get_intf_name(interface, intf_msg)
                 intf_type = self.get_intf_type(intf_name)
-                types[intf_type] = f"local {intf_type} = require '{project_name}.json_types.{intf_name}'\n"
+                path = Utils.get_interface_require_path(interface, project_name, intf_name)
+                types[intf_type] = f"local {intf_type} = require '{path}'\n"
         return types
 
     def render_types(self, project_name, root):

bmcgo/codegen/lua/v1/templates/apps/client.lua.mako

@@ -54,7 +54,7 @@ local foreach_non_virtual_interface_objects = mdb_service.foreach_non_virtual_in
   % if intf_data['interface'].startswith('bmc.dev.'):
 local ${intf} = require '${project_name}.device_types.${intf}'
   %else:
-local ${intf} = require '${project_name}.json_types.${intf}'
+local ${intf} = require '${render_utils.get_interface_require_path(intf_data["interface"], project_name, intf)}'
   % endif
 % endfor
 

bmcgo/codegen/lua/v1/templates/apps/model.lua.mako

@@ -1,5 +1,6 @@
 ${make_header('lua')}
 local privilege = require 'mc.privilege'
+local mdb = require 'mc.mdb'
 % if render_utils.get_features(root):
 require 'mc.plugin.loader'.load()
   % for feature in render_utils.get_features(root):

bmcgo/codegen/lua/v1/templates/apps/utils/mdb_intf.lua.mako

@@ -3,7 +3,7 @@
  '${intf['name']}', {
   % if 'properties' in intf['data'] :
     % for p,p_data in intf['data']['properties'].items():
-      ${p} = {'${render_utils.do_type_to_dbus_json(intf['data'], p_data)}', ${render_utils.options_json(p_data)}, ${render_utils.readonly_json(p_data)}, ${render_utils.default_json(p_data)}, false},
+      ${p} = {'${render_utils.do_type_to_dbus_json(intf['data'], p_data)}', ${render_utils.options_json(p_data)}, ${render_utils.readonly_json(p_data)}, ${render_utils.default_json(p_data)}},
     % endfor
   % endif
   }, {

bmcgo/tasks/task_build_rootfs_img.py

@@ -21,6 +21,7 @@ import stat
 import time
 import subprocess
 import tempfile
+import re
 from multiprocessing import Process
 
 from git import Repo
@@ -221,6 +222,26 @@ class TaskClass(Task):
         # 差异化处理完schema文件之后已完成schema整合，不在需要产品schema目录(强制删除时即使不存在也不会出错)
         self.run_command(f"rm -rf {product_schema_path}", sudo=True)
 
+    # 将默认接口配置复制到节点目录中
+    def copy_interface_config(self, config_path, custom_path):
+        for config_dir in os.listdir(config_path):
+            # redfish的schema文件仍放在原路径，不需要进行复制
+            if not re.match(r'^[a-fA-F0-9]{2}_[a-fA-F0-9]{2}$', config_dir) and \
+                config_dir != "static_resource" and config_dir != "config_patch":
+                source_path = os.path.join(config_path, config_dir)
+                copy_cmd = f"cp -r {source_path} {custom_path}/"
+                self.tools.run_command(copy_cmd, sudo=True)
+
+    # 支持产品层级多节点共包，每个节点有独立的定制化接口配置
+    def custom_mapping_config_patch(self, config_path):
+        for custom_item in os.listdir(config_path):
+            # 节点目录命名为xx_xx格式，以十六进制表示
+            if re.match(r'^[a-fA-F0-9]{2}_[a-fA-F0-9]{2}$', custom_item):
+                custom_path = os.path.join(config_path, custom_item)
+                self.copy_interface_config(config_path, custom_path)
+                patch_work = MappingConfigPatch(self.config, config_path=custom_path)
+                patch_work.run()
+
     # 支持映射配置文件根据产品差异进行打补丁
     def mapping_config_patch(self):
         self.info("开始根据配置映射打补丁")
@@ -229,6 +250,9 @@ class TaskClass(Task):
             ret = self.tools.run_command(f"test -d {config_path}", ignore_error=True, sudo=True)
             if ret.returncode != 0:
                 continue
+
+            self.custom_mapping_config_patch(config_path)
+            # 各节点的配置打完补丁后再进行默认配置的打补丁操作
             patch_work = MappingConfigPatch(self.config, config_path=config_path)
             patch_work.run()
 

bmcgo/tasks/task_buildgppbin.py

@@ -24,6 +24,10 @@ from bmcgo import misc
 
 
 class TaskClass(Task):
+    def __init__(self, config, work_name=""):
+        super(TaskClass, self).__init__(config, work_name=work_name)
+        self.suffix = "BMC"
+
     def copy_files(self):
         rootca = os.path.join(self.config.work_out, misc.ROOTCA_DER)
         crl = os.path.join(self.config.work_out, misc.CMS_CRL)
@@ -79,16 +83,17 @@ class TaskClass(Task):
         else:
             pmode_file = ""
 
+        self.write_gpp_bin(pmode_file)
 
+    def write_gpp_bin(self, pmode_file):
         self.info(f"打包: {self.config.board_name}_gpp.bin")
-        cmd = f"ls -al hpm_top_header Hi1711_boot_4096.bin {pmode_file}"
-        cmd += "hpm_sub_header rootca.der rootfs_BMC.img.cms cms.crl rootfs_BMC.tar.gz"
+        files = f"hpm_top_header Hi1711_boot_4096.bin {pmode_file}"
+        files += f"hpm_sub_header rootca.der rootfs_{self.suffix}.img.cms cms.crl rootfs_{self.suffix}.tar.gz"
+        cmd = f"ls -al {files}"
         self.run_command(cmd, show_log=True)
 
         target_path = f"{self.config.work_out}/{self.config.board_name}_gpp.bin"
-        cmd = f"cat hpm_top_header Hi1711_boot_4096.bin {pmode_file}"
-        cmd += "hpm_sub_header rootca.der rootfs_BMC.img.cms cms.crl rootfs_BMC.tar.gz"
-        self.info("执行命令: " + cmd)
+        cmd = f"cat {files}"
         self.pipe_command([cmd], target_path)
 
     def run(self):
@@ -99,31 +104,37 @@ class TaskClass(Task):
     def move_dependency(self):
         # 移动到tools/build_tools目录中
         self.chdir(self.config.sdk_path)
+        if self.config.chip == "1711":
+            self.prepare_boot_1711()
+        else:
+            self.prepare_boot_1712()
+
+    def prepare_boot_1711(self):
         unsigned_boot = None
         for file in os.listdir("."):
             if re.match("^Hi1711_[0-9]{8}_[0-9a-f]{40}.tar.gz$", file) is None:
                 continue
             unsigned_boot = file
             break
-    
+
         if self.config.self_sign:
             if not unsigned_boot:
                 raise errors.BmcGoException("打开了自签名模式但未找到待签名的uboot文件，构建失败")
-            self.run_command(f"tar -xvf {file}")
+            self.run_command(f"tar -xvf {unsigned_boot}")
             # 解压uboot_debug未签名包
             os.makedirs("origin_uboot_debug")
             self.run_command(f"tar -xvf bin/original_bin/uboot_debug.tar.gz -C origin_uboot_debug")
-            self.self_sign_uboot("origin_uboot_debug", ".", True)
+            self.self_sign_uboot_1711("origin_uboot_debug", ".", True)
             # 解压uboot未签名包
             os.makedirs("origin_uboot")
             self.run_command(f"tar -xvf bin/original_bin/uboot.tar.gz -C origin_uboot")
-            self.self_sign_uboot("origin_uboot", ".", False)
-        elif self.config.chip == "1711":
+            self.self_sign_uboot_1711("origin_uboot", ".", False)
+        else:
             self.run_command(f"dd if=Hi1711_boot_4096_pmode.bin of=Hi1711_boot_pmode.bin bs=1k count=1024 skip=768")
             self.run_command(f"dd if=Hi1711_boot_4096_pmode_debug.bin of=Hi1711_boot_pmode_debug.bin bs=1k " +
                             "count=1024 skip=768")
 
-    def self_sign_uboot(self, uboot_dir, output_dir, is_debug):
+    def self_sign_uboot_1711(self, uboot_dir, output_dir, is_debug):
         """签名uboot包"""
         cwd = os.getcwd()
         output_dir = os.path.realpath(output_dir)
@@ -137,9 +148,15 @@ class TaskClass(Task):
         self.signature("uboot.bin", "uboot.bin.cms", "cms.crl", "rootca.der")
         self.copy_gpp_headers_files()
         self.run_command("gpp_header uboot")
-        self.run_command("make_uboot_img.sh 768")
-        run_cmd = f"dd if=Hi1711_boot_4096.bin of={output_dir}/Hi1711_boot_pmode{debug_flag}.bin " \
+        self.run_command(f"make_uboot_img.sh {l0_kb_size}")
+        run_cmd = (
+            f"dd if=Hi1711_boot_4096.bin of={output_dir}/Hi1711_boot_pmode{debug_flag}.bin "
             f" bs=1K count=1024 skip={l0_kb_size}"
+        )
         self.run_command(run_cmd)
         self.run_command(f"cp Hi1711_boot_4096.bin {output_dir}/Hi1711_boot_4096{debug_flag}.bin")
         self.chdir(cwd)
+
+    def prepare_boot_1712(self):
+        # 打桩函数，不允许变更函数名，供扩展实现
+        pass

{openubmc_bingo-0.6.68.dist-info → openubmc_bingo-0.6.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.68
+Version: 0.6.73
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.68.dist-info → openubmc_bingo-0.6.73.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=tj3MA6yimsagyzinPe_hVMnI2xQ-3IToRSL2kcmRQAU,562
+bmcgo/__init__.py,sha256=dKxwvYrGObODUzVxgVgu5y02h9fNOYaZHT0-1q3_PN0,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -10,7 +10,7 @@ bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/cli/cli.py,sha256=O4FHWNLUyqNjs0BoD3aYzPyi3L3mCg7rsIL0mP7_x0U,27748
 bmcgo/cli/config.conan2.yaml,sha256=SAtM_6_qOjZbkgUT5fzWbhbq4aWCayqE8o4xJ2vBRww,261
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
-bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
+bmcgo/codegen/__init__.py,sha256=lZxBtUuoXbVMqRJkvIqqNF4jeMLEb9Y66dch5roQBcc,775
 bmcgo/codegen/c/__init__.py,sha256=tmBG8c6sfxgIj__lyyU5mydWeKBdqbDuIQkLI38lwjI,522
 bmcgo/codegen/c/annotation.py,sha256=c4NiF6b9R-HbwbBGNhnH5zrfcPAYBkhWq30PT9CKzw4,1987
 bmcgo/codegen/c/argument.py,sha256=oH08szRKxkL0S3dUZ3P8x4JV1UVFqadzhuZ343RbuHM,1871
@@ -40,9 +40,9 @@ bmcgo/codegen/lua/proto/Makefile,sha256=rS4nEBwWJEDYAb5XN9S7SfII7RMFb071jh0eh_KJ
 bmcgo/codegen/lua/proto/ipmi_types.proto,sha256=BX09mymhhPkWqZE1UCVJACpLBeQh1vQN31oBRVVieFY,377
 bmcgo/codegen/lua/proto/types.proto,sha256=_X8JCKZCvO6PfWh6tuWcEqKHROrh46rCZab-OCkfirA,1162
 bmcgo/codegen/lua/script/base.py,sha256=E1_V6lmE5CjY2pqSYOpyNVGRVneC4pSLnLoNntm1I6A,823
-bmcgo/codegen/lua/script/check_intfs.py,sha256=6l9fgNJDGDVhVDajjPqsPInjmOYQcUSU5gfHblc4YSQ,5844
+bmcgo/codegen/lua/script/check_intfs.py,sha256=mXEp7mo-jDHIEMTDgz3U4br7ZQAOUUPcBUp2P3QAp3o,5916
 bmcgo/codegen/lua/script/factory.py,sha256=pCkzFNkRjKNsITETzbgn3cBLPzP1bMi3Y84pozEEGjk,1687
-bmcgo/codegen/lua/script/gen_db_json.py,sha256=QpfpUrd36nBaouv6pyO9zCvMG8eJ2JL6ZNyF2FsT3DI,17025
+bmcgo/codegen/lua/script/gen_db_json.py,sha256=_Y2RcXN0VenffuvP4VxotcwYcCynOM3xJ1YOHU5oDlo,17145
 bmcgo/codegen/lua/script/gen_depends.py,sha256=9erHhPSa6s-Ucv2k1vCc4aR6rsO0WxkM0yfZZKXi-1w,2720
 bmcgo/codegen/lua/script/gen_entry.py,sha256=k__I5VBts9RM0g_KzSGr2csc_tRjXAms_GSqx6DllHY,10368
 bmcgo/codegen/lua/script/gen_feature_json.py,sha256=gMCAIF_ZMgFIP5wXV_Of51XG61zmsDxhCeqthnj_hHQ,4855
@@ -51,7 +51,7 @@ bmcgo/codegen/lua/script/gen_intf_json.py,sha256=J_yLbYzvTps1Teej-fecLRR2Vfqz6kW
 bmcgo/codegen/lua/script/gen_intf_rpc_json.py,sha256=4gKv4dFrnU8uJsnTySFiqpP6ZFnJCqC_cy1LvuS6n58,19576
 bmcgo/codegen/lua/script/gen_ipmi_json.py,sha256=wTktlR1YZO-5PdZid8zMR8JHojL4eAn7LpF76Z46lu4,17340
 bmcgo/codegen/lua/script/gen_mdb_json.py,sha256=2w2fk6jIlMCr6WT5yzLOmWenk_9-lh3e19oV1lDghcY,3027
-bmcgo/codegen/lua/script/gen_rpc_msg_json.py,sha256=6fVtZTHL-v6pdCjkgxFmqCjf511cc9iC9xPTspC4lDU,16407
+bmcgo/codegen/lua/script/gen_rpc_msg_json.py,sha256=D53yEya9aB2mI0EvD6maPuNNn2_r0BT1Mw_UVMExg9Y,19708
 bmcgo/codegen/lua/script/gen_schema.py,sha256=9sfqv7fHYoCiokotesBER2HglqHwrj08ftQDbrDjrlI,10600
 bmcgo/codegen/lua/script/ipmi_types_pb2.py,sha256=CaCartJKCRgx5WLBg4mbzS8VXwSKy380o6BPYgouAJQ,6665
 bmcgo/codegen/lua/script/lua_format.py,sha256=W3UO-II34qY0_st6QiHwSOrQZnqdz4mLWOIB3pfGe58,2003
@@ -64,15 +64,15 @@ bmcgo/codegen/lua/script/proto_loader.py,sha256=w6TTyLvXrdXZKTKOGf87kSuSsbBviVeQ
 bmcgo/codegen/lua/script/proto_plugin.py,sha256=hfFr7QXndA1dbFYmpUkemFxkdSchK8i8xml_3cMdBA4,5002
 bmcgo/codegen/lua/script/redfish_source_tree.py,sha256=HzTGY4PViZXLQLOt_U7-YMqE5Ctf-Mxa1p5voOFJU4A,3905
 bmcgo/codegen/lua/script/sep_ipmi_message_cmds.py,sha256=dQZog5e7Eo8Z7xSrp9sUri8vg-VtEj_Sll_E_OhnBw4,8209
-bmcgo/codegen/lua/script/template.py,sha256=kJ5vQcHKY5OKUkYrSObFjx6WLVopveasjbr0HWgrMZM,6711
+bmcgo/codegen/lua/script/template.py,sha256=W3cnePvZpWWjXm36wAlUyKAV781x9v_1kNnE5IJP4A4,7051
 bmcgo/codegen/lua/script/types_pb2.py,sha256=uiRP_JPK9EF57RUZuomx1K1M9_jZFZgsHXcatFrhzow,23074
-bmcgo/codegen/lua/script/utils.py,sha256=QrBlrntS9uTb95iAKpZLPYbSeCUNXNzSoxEm5d21zjY,24886
+bmcgo/codegen/lua/script/utils.py,sha256=MT_WmFiwJ5kapvlFrjyEnyeke1i_Ihg8kVfSUCekIzM,26386
 bmcgo/codegen/lua/script/validate.py,sha256=_RHZBSDZklmcjETD8zRmnhz4DABzKoL-fNl1I9L4Ofs,2096
 bmcgo/codegen/lua/script/yaml_to_json.py,sha256=31J1qJPIAJrx9Cq6bNZks3QCZ754spI5mjZNlshkcJ4,2291
 bmcgo/codegen/lua/script/dto/__init__.py,sha256=nSBpsAbZ7UGd0a25ys_LLEpi3juPtUhVMy_tgGuZsNY,560
 bmcgo/codegen/lua/script/dto/exception.py,sha256=PDuaO5-IoCq1bjPlUMLWc5MGC7LcerPD4EgX5Su6fa4,2026
 bmcgo/codegen/lua/script/dto/kepler_abstract.py,sha256=0rfLwN2n-8-wp7C7isHuTMwDyKkYvwUKujqlmUvtaKA,1741
-bmcgo/codegen/lua/script/dto/options.py,sha256=ZGjU9b9hIqwGKQLfVwnDS6W9CTkhRuRM_B7x5wBizQ4,1421
+bmcgo/codegen/lua/script/dto/options.py,sha256=pZsYgQ727NrbvG2e4QuSkM5udYVCkEX390mbjqn4SMI,1488
 bmcgo/codegen/lua/script/dto/print_simple.py,sha256=imrPW2zlmCIcM6Nfg4HSPE2Y14g2n8uSGj-JOjJ2ijY,723
 bmcgo/codegen/lua/script/dto/redfish_api.py,sha256=iifn1jNHtIoal0-YA-4bvNm8wLOLqloA3S9p99bD8Qg,8411
 bmcgo/codegen/lua/script/dto/url_route.py,sha256=DkgV0Ok5FBgkVqikPcFX_OJdLm0Sd7VL7NATS_aCBpg,7849
@@ -91,7 +91,7 @@ bmcgo/codegen/lua/script/render_utils/ipmi_message_lua.py,sha256=Y-5pXMfAPDZqqoA
 bmcgo/codegen/lua/script/render_utils/mdb_lua.py,sha256=gKX_GUkIbYbbviBw9cEO3pfTwoLWurczYFmoOoWA1Us,6141
 bmcgo/codegen/lua/script/render_utils/message_lua.py,sha256=ZHJy35iJir1O149dafZnl-oEdU89-eP6VIeQmKjh9D8,1155
 bmcgo/codegen/lua/script/render_utils/messages_lua.py,sha256=hFBLl3tqh7KIeljm0JEEyeDXkKSDxjtVMirc3euckyI,5189
-bmcgo/codegen/lua/script/render_utils/model_lua.py,sha256=kxlPkPboUKtUfK2HTWakmgKMFLLZ3UofPouWvng7UWY,18456
+bmcgo/codegen/lua/script/render_utils/model_lua.py,sha256=WstgLjxmdYNqMhkwZTu0dHXCKROv-h_tRRAdEN2XkdM,18737
 bmcgo/codegen/lua/script/render_utils/old_model_lua.py,sha256=OFUPJOaiXDjXpknbh6Pw0TNC1dUVtjPbuIs-3fSN7p4,15611
 bmcgo/codegen/lua/script/render_utils/plugin_lua.py,sha256=-_r-MqjDNnoYel6zdsNSkqYI3w1DKJPwJy5Vsevl33s,1481
 bmcgo/codegen/lua/script/render_utils/redfish_proto.py,sha256=lAVo9pPxkc7Iv22enuqCOJVTFy8_63C57iADjzYWz5g,3130
@@ -102,11 +102,11 @@ bmcgo/codegen/lua/script/render_utils/validate_lua.py,sha256=NVjMWZwMxwUj9kdTaCR
 bmcgo/codegen/lua/templates/Makefile,sha256=-br3qnXM_73_nJhYVgF7TsNtVxt_p_h4l5TYPjWqQIs,4044
 bmcgo/codegen/lua/templates/errors.lua.mako,sha256=T93tESJl0K3r5izufq6NsqqCptQbVslpsTEjkQdDq0U,1536
 bmcgo/codegen/lua/templates/messages.lua.mako,sha256=tbvVXx-zodE5sqyKNW4-dzNmPpZ2yBKpkECsIf9-tkU,1115
-bmcgo/codegen/lua/templates/apps/Makefile,sha256=IPU-LW3i9xTQUrb9XCWYTWlATCTu2JE3aayL43juEeM,19484
+bmcgo/codegen/lua/templates/apps/Makefile,sha256=k8CN5UdGAS-VkzSaYVPSNlJIbaCQn8uq8c0TX7FygHg,19526
 bmcgo/codegen/lua/templates/apps/Makefile.mdb.mk,sha256=Qmd-n_YsQbfnpED_6PIp_6pL13w6UCCGgBoBA4h6r_0,3296
 bmcgo/codegen/lua/templates/apps/app.lua.mako,sha256=Y_aZCPyNgeqfa39_RWxV-_m3out1p4vTTWnzqXtPV7E,276
 bmcgo/codegen/lua/templates/apps/class.lua.mako,sha256=FZsGAZeiytVwihxyyjhw6Hvv4V01Lhtz8Q9FPZYieZw,1208
-bmcgo/codegen/lua/templates/apps/client.lua.mako,sha256=4TgJawCCQhn0yqY0YnL1i_GHhIKOAS0Z5-sBSnS_LLs,17976
+bmcgo/codegen/lua/templates/apps/client.lua.mako,sha256=NWTE9VteYnqi1zaWv4ToDsMTWe8Hf8ZSwkoKzohuW9Y,18028
 bmcgo/codegen/lua/templates/apps/controller.lua.mako,sha256=ET9dSNasgAw7HuhLxV4pwq2X-E44Zk1rKSQJPUj_ir0,11310
 bmcgo/codegen/lua/templates/apps/datas.lua.mako,sha256=xAU1c9xe3-bcVfxA3vSbvrkCDcKqCv65gM92lcSPwvo,135
 bmcgo/codegen/lua/templates/apps/db.lua.mako,sha256=wROjv7qofMaZhTrAywhIWhwuDL9Gs3UMHSQJ97tKZD0,2723
@@ -123,16 +123,16 @@ bmcgo/codegen/lua/templates/apps/mc.lua.mako,sha256=_PMYCI0-RImOv2LQYZU0aUKuL4jM
 bmcgo/codegen/lua/templates/apps/mdb.lua.mako,sha256=SWZejbAl-27d8Q_pb_I0IOAxxKIX3aEd2IXke2QHyvg,1237
 bmcgo/codegen/lua/templates/apps/mdb_interface.lua.mako,sha256=wZYf_FZa8nQO0bF9X4ilog47RO7I3VYE1cZdQ8IPg2M,2371
 bmcgo/codegen/lua/templates/apps/message.lua.mako,sha256=Rj1B_wi8dc2IUvoT0-Q2TfgUpIBxsXXaeqk00zXW1RA,1025
-bmcgo/codegen/lua/templates/apps/model.lua.mako,sha256=iNz0PZqYnEiyZOsTdGZuudhsS76weEi-3ABjNAzKYgc,8889
+bmcgo/codegen/lua/templates/apps/model.lua.mako,sha256=GT2aI4LVPBO1fQJncFoS9GPqzxtFVfKIdenvAzvsAJI,8956
 bmcgo/codegen/lua/templates/apps/orm_classes.lua.mako,sha256=Oz2fKu5uhDJn7d0q178rgX9IDJ4Xmm0nfZYYrek5SNY,335
 bmcgo/codegen/lua/templates/apps/plugin.lua.mako,sha256=w8aVvxcuNKEmHjWiwFhe6aSIxkMHJKMuc5EaKNgb7DQ,246
 bmcgo/codegen/lua/templates/apps/redfish.proto.mako,sha256=0yisLKgHi-wuipvjbVZGYH_8ESCEr4wcB3KvAWsJUyE,2628
-bmcgo/codegen/lua/templates/apps/service.lua.mako,sha256=WG_TyW8RAMZVslTkaznCAX9ZSXTAFsEEHU5-FGR9pQA,15672
+bmcgo/codegen/lua/templates/apps/service.lua.mako,sha256=eYCNAsu-fG93hFYwyueM8Y45Tkd84trMQGbkukBSrg0,15724
 bmcgo/codegen/lua/templates/apps/signal_listen.lua.mako,sha256=K3I2xg7iXw60Z-PTiSFq_BNJFHjK6GdBOxUF3XfXHNA,602
 bmcgo/codegen/lua/templates/apps/utils/default_intf.lua.mako,sha256=PD8_TWmefd17hP03_BUPMnuvRa0sheLlYMF0QOYGwWM,1392
 bmcgo/codegen/lua/templates/apps/utils/enum.mako,sha256=6rmXhAScF2yx4izXa0V1mQimqgWGysdMbAEIGhUVcU0,499
 bmcgo/codegen/lua/templates/apps/utils/imports.mako,sha256=Dj7WEQ-rzy1j19Ox38TA99vzK2So2VdAcdZ9CTKsg5c,433
-bmcgo/codegen/lua/templates/apps/utils/mdb_intf.lua.mako,sha256=nGuCsYt3d0MUGVZyW8B_24xCVoKLcSDOrEufPox2XXc,1262
+bmcgo/codegen/lua/templates/apps/utils/mdb_intf.lua.mako,sha256=JDliqjdIlJeOJlgzxIRJwp8J8a5MFFyRTR3GxrjijgA,1490
 bmcgo/codegen/lua/templates/apps/utils/mdb_obj.lua.mako,sha256=sq4tCcQQK7HLcfyszHrYmBy5HlgOt4jyQxHqvzwSzeY,801
 bmcgo/codegen/lua/templates/apps/utils/message.mako,sha256=IAKhqdzR-dPzPF_akR1EieD-aQ2B33DaeU-287gXQN4,4958
 bmcgo/codegen/lua/templates/apps/utils/request.lua.mako,sha256=8ZQ_SxYq1s0JjIDUyEAVlSj0trGdQSaz5UohjMf0SfQ,3071
@@ -158,14 +158,14 @@ bmcgo/codegen/lua/templates/new_app/user_conf/rootfs/etc/systemd/system/multi-us
 bmcgo/codegen/lua/v1/script/gen_schema.py,sha256=LtSswrIqjgk3PuGSlzKSB5Cw5OeSafYkm7PdLQ7Mrao,11717
 bmcgo/codegen/lua/v1/script/render_utils/client_lua.py,sha256=0dKvOrd-fihPUZckr8_y275STe1rWppIWpYxHhtz-no,3773
 bmcgo/codegen/lua/v1/script/render_utils/db_lua.py,sha256=59XfkKtUz8Rv73zcyIcQR25JN_2atS4hQq_4BcXRrqo,7948
-bmcgo/codegen/lua/v1/script/render_utils/model_lua.py,sha256=NTB1RYxjqBypm5KeRKpJSige6HtaZl_EI9mHJ5HZ9Ss,19024
-bmcgo/codegen/lua/v1/templates/apps/client.lua.mako,sha256=6z71SedeK_bIfIi3PUMvqQSMKgVZ1K83qd3a3acNoB8,10701
+bmcgo/codegen/lua/v1/script/render_utils/model_lua.py,sha256=aFLapGuGRSRrRsLYVlpUzisHGdesDgxeeR-QQXIjA3A,19263
+bmcgo/codegen/lua/v1/templates/apps/client.lua.mako,sha256=LpYZshtj9t4A7ofGz2klgsRwrBzG8Q9HYhX8WMoBL1s,10753
 bmcgo/codegen/lua/v1/templates/apps/db.lua.mako,sha256=zrlqjVN9k6G1i3OeW2OROxzsYyhNAY-wpDt_nva5jL4,2094
 bmcgo/codegen/lua/v1/templates/apps/local_db.lua.mako,sha256=6Tp99mTF9tLTMz2K6kviaxG9Lwtt0d6cMYY7ZGgMFCE,6460
 bmcgo/codegen/lua/v1/templates/apps/message.lua.mako,sha256=-AUAwlgVIaNN7fiReXqDXX5Icq88i0SAar5XHlCrXQU,1039
-bmcgo/codegen/lua/v1/templates/apps/model.lua.mako,sha256=EmHD62fk0QetQUO0DPz2BEc2NZmbq39pozqm4-ngYEY,2056
+bmcgo/codegen/lua/v1/templates/apps/model.lua.mako,sha256=MfT94MxEI0lUZXyLWf1GXgtAc4nYtgnTL-9t8zmokgY,2085
 bmcgo/codegen/lua/v1/templates/apps/service.lua.mako,sha256=wd_NJtiSSMbR-lxEqv-rluHOdUCpeV9ZlrZDA7DDaZY,5564
-bmcgo/codegen/lua/v1/templates/apps/utils/mdb_intf.lua.mako,sha256=msdj2SygZvV3RIEHLeVDfZvOzZ99Yy27SwPVrFVVcpc,1242
+bmcgo/codegen/lua/v1/templates/apps/utils/mdb_intf.lua.mako,sha256=QxiwSUH8VcAQs-af8q3uN8evq6qzIWGOKf9mN43P0iE,1235
 bmcgo/codegen/lua/v1/templates/apps/utils/mdb_obj.lua.mako,sha256=oCzx2u3bjvCdNKX5oC8j6Q-Zb21q6SFCqd14_VzrWvo,349
 bmcgo/component/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/component/build.py,sha256=zEtX3IG43z-EC8frpuRRH8zx2KjVuA1LlLnhDgErhqE,12920
@@ -224,9 +224,9 @@ bmcgo/tasks/__init__.py,sha256=VapgzhPMmB7dzPIRohoVm1jjfVn_v97cYNCRmkxScaU,539
 bmcgo/tasks/misc.py,sha256=GK_bSDLGZW0FxywB2ICG1iIEz2y2QoCb1YQQk8SYOIA,711
 bmcgo/tasks/task.py,sha256=95nKxTe5PW3rfhpm5YFasPtmP8oCraeWJKq0D5mbl6A,18578
 bmcgo/tasks/task_build_conan.py,sha256=Si-8fIrQ_Vva6gw0kdLApEZY5cKt8Mt1C_8Ef4If61I,53872
-bmcgo/tasks/task_build_rootfs_img.py,sha256=CDczgL2qiEUyAIlDVbj5o0DJzFs_HW5UdoVaFPznvdg,29207
+bmcgo/tasks/task_build_rootfs_img.py,sha256=ffFLFVZ6wMpAvUi9au32IYNTr8TBmi7R6ZE1orvOj68,30565
 bmcgo/tasks/task_build_wbd_up.py,sha256=X9-0Qqad-s3mGfJBMeBQvfZ99KlWcgaMluDr_zv6Z-o,3122
-bmcgo/tasks/task_buildgppbin.py,sha256=epBxxrYFPgoTzpBgPzSRXcUs-ia_BJWsLGflylEJS7I,6614
+bmcgo/tasks/task_buildgppbin.py,sha256=VdViuNyOEBwHV3zbP6fJnZ3aUxK_RwyIPTv4Hseszrw,7018
 bmcgo/tasks/task_buildhpm_ext4.py,sha256=giAWz-XYmtYv6KTK9BJOyXJY7yDar6oONmEvHPoqsl0,3514
 bmcgo/tasks/task_create_interface_config.py,sha256=rkFRGLrUgYCics-n1CKwCoQscU2BaRQkH7KP3zwJ6FI,5393
 bmcgo/tasks/task_download_buildtools.py,sha256=imiOIWXxKOiWolALasTuSp3EkXrVeFWD0bPLERA78W0,4520
@@ -263,8 +263,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=AEspVgsVAnmUdvqZYNCb7SPoUEq_0i61dfpauyguLa4,229
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.68.dist-info/METADATA,sha256=Xcay0PnvxM54F5ni52ceZtxY54ymFT-E4W3lt7QzE_M,1010
-openubmc_bingo-0.6.68.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.68.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.68.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.68.dist-info/RECORD,,
+openubmc_bingo-0.6.73.dist-info/METADATA,sha256=PHXfq2bMBgoUx9je1I5Eovu_Z1ZmXNWXl4VHk54cIDw,1010
+openubmc_bingo-0.6.73.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.73.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.73.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.73.dist-info/RECORD,,