openubmc-bingo 0.5.261__py3-none-any.whl → 0.5.265__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.5.261'
+__version__ = '0.5.265'

bmcgo/codegen/lua/codegen.py

@@ -110,7 +110,9 @@ class CodeGen(object):
         mdb_interface_tmp_dir = os.path.join(conan_home, "latest_mdb_interface")
         env = dict(os.environ, CONAN_STORAGE_PATH=mdb_interface_tmp_dir)
 
-        package = self.get_mdb_interface_package()
+        channel = f"@{Tools().conan_user}/{misc.StageEnum.STAGE_RC.value}"
+        package = f"mdb_interface/[>=0.0.1]{channel}"
+        
         cmd = ["conan", "install", package, f"-if={temp_dir}", "--update", "--build=missing", "-g", "deploy"]
         cmd += ["-pr=profile.dt.ini", "-s", "build_type=Dt"]
         if self.remote:

bmcgo/codegen/lua/script/gen_db_json.py

@@ -42,6 +42,13 @@ NO_BACKUP_PERSIST_TYPES = {
 
 EXTEND_FIELD = "extend_field"
 
+# 主键检查白名单：对于白名单中的数据库表，在自动生成代码时不强制要求配置主键
+# 主键检查白名单的修改需经过评审
+PERSIST_WHITE_LIST = {
+    "t_ddr5_mem_ce_diagnosed_record",
+    "t_hbm_fault_diagnosed_record"
+}
+
 
 def check_duplicate_public_name(names, all_names, prop, prop_data, class_name):
     if "alias" in prop_data:
@@ -170,6 +177,13 @@ def contains_csr(class_data):
     return False
 
 
+def check_white_list(table_name):
+    if table_name in PERSIST_WHITE_LIST:
+        return True
+
+    return False
+
+
 def has_primary_key(class_data):
     for prop_config in class_data.get('properties', {}).values():
         if prop_config.get("primaryKey", False):
@@ -281,7 +295,7 @@ def make_datas(load_dict, package, imports, is_local):
             if data_need_persist and not is_local and not has_primary_key(class_data):
                 raise RuntimeError(f"model.json中类{class_name}配置了远程持久化但是没有配置'primaryKey'")
         else:
-            if data_need_persist and not has_primary_key(class_data):
+            if data_need_persist and not has_primary_key(class_data) and not check_white_list(table_name):
                 raise RuntimeError(f"model.json中类{class_name}配置了持久化但是没有配置'primaryKey'")
 
         if is_local and props_with_persist_type:

bmcgo/component/analysis/dep-rules.json

@@ -1,5 +1,5 @@
 {
-    "Version": "0.0.44",
+    "Version": "0.0.45",
     "Description": "此文件对iBMCV3子系统与子系统、组件与组件的依赖关系约束进行了描述, 只有子系统架构师/领域专家才能修改",
     "Subsystems": {
         "opensource" : {
@@ -87,6 +87,7 @@
             "Libraries": [
                 "persistence",
                 "key_mgmt",
+                "libsomp",
                 "libmc4lua",
                 "libsoc_adapter",
                 "runtime_accessor",

bmcgo/component/build.py

@@ -187,7 +187,7 @@ class BuildComp():
         cmd = [misc.CONAN, "create"]
         cmd += append.split()
         tool.run_command(cmd, show_log=True)
-        self._check_sr_validation(cache_dir)
+        self._check_sr_validation(os.path.join(cache_dir, "package"))
         self.upload()
 
     def test(self):

{openubmc_bingo-0.5.261.dist-info → openubmc_bingo-0.5.265.dist-info}/METADATA

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

{openubmc_bingo-0.5.261.dist-info → openubmc_bingo-0.5.265.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=0P6_XTVwChevSJWobH0kv7Sz9eL7mbHXSc_AIFNgp9s,563
+bmcgo/__init__.py,sha256=VDcFpL3V3WDCO10RVP1R1UlU4lL64l5LEyBUqFq2B9U,563
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=zPghH-W8vNK1bAc5PjfwnWzkHYT499PlGbhUWhPKT5U,10888
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -34,14 +34,14 @@ bmcgo/codegen/c/template/server.h.mako,sha256=hZg1U64YKtlUm4wuKRobhjGW8e7rzFu9xg
 bmcgo/codegen/lua/.lua-format,sha256=h6RLqe84SjDqKO1mqoCW7XVtrAwDMTRM1Rj8nwzPGwQ,188
 bmcgo/codegen/lua/Makefile,sha256=wliuAhxhChrpsTnWuOlje3gtW2KRqayIhGRYBkvFi-c,3304
 bmcgo/codegen/lua/__init__.py,sha256=2yU9vzUVQmMJ0qBtNJ-AfKpnOzYZo4wAxlRnpFwgE7M,521
-bmcgo/codegen/lua/codegen.py,sha256=RTcigRI-_H3E2r7Dz8Afw0VOr1EPL3zFqDzPFKWw7KU,8978
+bmcgo/codegen/lua/codegen.py,sha256=d-EyUfFVuxASz15rIF7GFHrh2Y5qGtKmVgsaT7looZ0,9065
 bmcgo/codegen/lua/proto/Makefile,sha256=rS4nEBwWJEDYAb5XN9S7SfII7RMFb071jh0eh_KJePo,3098
 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/factory.py,sha256=pCkzFNkRjKNsITETzbgn3cBLPzP1bMi3Y84pozEEGjk,1687
-bmcgo/codegen/lua/script/gen_db_json.py,sha256=BxMak-YcmeI_QQLsBaMa9ilB54XvGI7t1EELP9uw3hI,16612
+bmcgo/codegen/lua/script/gen_db_json.py,sha256=QpfpUrd36nBaouv6pyO9zCvMG8eJ2JL6ZNyF2FsT3DI,17025
 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
@@ -167,7 +167,7 @@ bmcgo/codegen/lua/v1/templates/apps/service.lua.mako,sha256=wd_NJtiSSMbR-lxEqv-r
 bmcgo/codegen/lua/v1/templates/apps/utils/mdb_intf.lua.mako,sha256=msdj2SygZvV3RIEHLeVDfZvOzZ99Yy27SwPVrFVVcpc,1242
 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=S0borHjBQfb0EWQ6uqKWUJGImkzHpb2x5qqz-qnzsHI,8959
+bmcgo/component/build.py,sha256=kyi9T79tW5Fc1KacMZsXsYwFdVjKVaI3bFtge5Lz6mw,8984
 bmcgo/component/component_dt_version_parse.py,sha256=KyrfyjbrszU-hhG1Hr6TzKuSabmGIK51b_3KuVBv5-g,14139
 bmcgo/component/component_helper.py,sha256=k-q2uT8XbZM6BgnQMFgqtyjwTtJxmsWCMMFc2_CIyJs,6319
 bmcgo/component/deploy.py,sha256=EO0hSZzXYPG-1SQOhNMkqLQWSeqkU3RxKemsqfWrgBE,4569
@@ -177,7 +177,7 @@ bmcgo/component/test.py,sha256=kC8QsM3PypcDDy9VhBNQ4iutyBbPztMtlFHGY8a82FE,43332
 bmcgo/component/analysis/analysis.py,sha256=AzOztLmmt4URooNe0wKgF8CfWgrk3-1RMaH5wgoTJkg,8544
 bmcgo/component/analysis/build_deps.py,sha256=cyQh5D3R1syQfMJcNxEIKKSJGanPMNRFPGlJRitDAa0,7324
 bmcgo/component/analysis/data_deps.py,sha256=UkuqMhJseZIXMZWC2cJ4csko7rENPlpXJUU0eRWVZNM,16148
-bmcgo/component/analysis/dep-rules.json,sha256=mcLectRcK97MytJlBtATGzyS7XM8WMMuCSpiwdewBuQ,33665
+bmcgo/component/analysis/dep-rules.json,sha256=GL2HLW85jbIADnOVwBuEECLJhrITCLPiUpbcYrX7GA4,33692
 bmcgo/component/analysis/dep_node.py,sha256=DSB30uim1Qrjs0zuphz0JXetP0ECBC7rzCElFNWQpwM,4598
 bmcgo/component/analysis/intf_deps.py,sha256=IlcPixdaBpXpb6U4M-I1hRRGHCg5SCUg07V6kAosacE,7382
 bmcgo/component/analysis/intf_validation.py,sha256=zp_LiiJYYP8Y0lsFISX1KLY172q-qEOz0nFuQ--uPFQ,11131
@@ -254,8 +254,8 @@ bmcgo/utils/installations/version_util.py,sha256=dOwvLZ7iOmnzSeyD6_pRm7NS7I13Um5
 bmcgo/utils/installations/install_plans/bingo.yml,sha256=Zw1HnAyNJdEwkE3fnd-_GCe9bwv1m6bmMlaQTJXaFa8,210
 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.5.261.dist-info/METADATA,sha256=Lxad1kWz9GtlS1qgMNCcXmokR2KVUEnLx6CQunglZMs,925
-openubmc_bingo-0.5.261.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.5.261.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.5.261.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.5.261.dist-info/RECORD,,
+openubmc_bingo-0.5.265.dist-info/METADATA,sha256=I6VAta8qzpYTGSzkJMSQW8h55VXbeUrEOmuGLeSVsOw,925
+openubmc_bingo-0.5.265.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.5.265.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.5.265.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.5.265.dist-info/RECORD,,