openubmc-bingo 0.6.45__py3-none-any.whl → 0.6.99__py3-none-any.whl

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/templates/new_app_v2/CMakeLists.txt.mako

@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.14)
+<% dollar="$" %>
+project(${project_name})
+find_package(PkgConfig REQUIRED)
+pkg_search_module(GLIB REQUIRED glib-2.0)
+pkg_search_module(GMODULE REQUIRED gmodule-2.0)
+
+set(TARGET_LIB ${dollar}{PROJECT_NAME})
+set(BUILD_DIR temp)
+
+set(APP_INSTALL_DIR opt/bmc/apps/${dollar}{PROJECT_NAME})
+set(LUACLIB_INSTALL_DIR ${dollar}{APP_INSTALL_DIR}/luaclib)
+
+install(DIRECTORY src/lualib DESTINATION ${dollar}{APP_INSTALL_DIR} OPTIONAL)
+install(DIRECTORY include/ DESTINATION opt/bmc/lualib OPTIONAL)
+install(DIRECTORY src/service DESTINATION ${dollar}{APP_INSTALL_DIR} OPTIONAL)
+if (NOT ${dollar}{CMAKE_BUILD_TYPE} STREQUAL Release)
+    install(DIRECTORY gen/debug/ DESTINATION ${dollar}{APP_INSTALL_DIR}/debug OPTIONAL)
+    install(DIRECTORY src/debug/lualib DESTINATION ${dollar}{APP_INSTALL_DIR} OPTIONAL)
+endif()
+install(DIRECTORY gen/${dollar}{PROJECT_NAME}/ DESTINATION ${dollar}{APP_INSTALL_DIR} OPTIONAL)
+install(DIRECTORY gen/class DESTINATION ${dollar}{APP_INSTALL_DIR} OPTIONAL)
+install(FILES mds/schema.json DESTINATION ${dollar}{APP_INSTALL_DIR}/mds OPTIONAL)
+install(FILES mds/service.json DESTINATION ${dollar}{APP_INSTALL_DIR}/mds OPTIONAL)
+install(DIRECTORY user_conf/rootfs/ DESTINATION . USE_SOURCE_PERMISSIONS OPTIONAL)
+install(FILES config.cfg DESTINATION ${dollar}{APP_INSTALL_DIR} OPTIONAL)

bmcgo/codegen/lua/templates/new_app_v2/conanfile.py.mako

@@ -0,0 +1,9 @@
+from conanbase import ConanBase
+
+
+required_conan_version = ">=2.13.0"
+
+class AppConan(ConanBase):
+
+    def package_info(self):
+        pass

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

@@ -206,12 +206,11 @@ class ConsistencyDbLuaUtils(Base, Utils):
                 return result + "}"
             value_name = Utils(self.data, self.options).enum_value_name(types["name"], d_val)
             return f'{types["package"]}.{types["name"]}.{value_name}'
-        if Utils.get_lua_codegen_version() >= 10:
-            if prop.get('repeated') and not isinstance(d_val, list):
-                raise RuntimeError(f"model.json中类{class_name}的属性{prop['name']}默认值{d_val}类型与属性类型不一致")
-            if isinstance(d_val, list) or isinstance(d_val, dict):
-                json_str = json.dumps(d_val).replace("'", "''")
-                return f"[['{json_str}']]"
+        if prop.get('repeated') and not isinstance(d_val, list):
+            raise RuntimeError(f"model.json中类{class_name}的属性{prop['name']}默认值{d_val}类型与属性类型不一致")
+        if isinstance(d_val, list) or isinstance(d_val, dict):
+            json_str = json.dumps(d_val).replace("'", "''")
+            return f"[['{json_str}']]"
         if type_name == "string" or type_name == 'bytes':
             return f'"\'{d_val}\'"'
         if type_name == "bool":

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

@@ -457,7 +457,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):
@@ -483,5 +484,16 @@ class ConsistencyModelLuaUtils(Base, Utils):
             for intf_msg in msg.get('interfaces', {}).values():
                 self.collect_features(intf_msg, features)
         return sorted(list(features))
+    
+    def remove_unnecessary_field(self, input_dict):
+        keys_to_delete = []
+        for key, value in input_dict.items():
+            if isinstance(value, dict):
+                _ = self.remove_unnecessary_field(value)
+            if key in ['description', 'constraint', 'example']:
+                keys_to_delete.append(key)
+        for key in keys_to_delete:
+            del input_dict[key]
+        return input_dict
 
 Factory().register("v1/templates/apps/model.lua.mako", ConsistencyModelLuaUtils)

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/local_db.lua.mako

@@ -139,9 +139,6 @@ db_selector["reset"] = ${ClassName}.new
 local ${ClassName} = class(db_base)
 
 function ${ClassName}:ctor()
-  local db = Databases(path)
-  local obj = {db = db}
-
   % for msg in root['data']:
     % if render_utils.table_name(msg) and render_utils.check_local_per_temporary(msg):
   self.${msg['name']} = self.db:Table('${render_utils.table_name(msg)}', {
@@ -156,7 +153,6 @@ function ${ClassName}:ctor()
   % endfor
 
   self.tables = self.db.tables
-  return setmetatable(obj, ${ClassName})
 end
 
 % for msg in root['data']:

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

@@ -5,6 +5,9 @@ enums = [msg for msg in root['data'] if msg['type'] == 'Enum']
 %>
 local validate = require 'mc.validate'
 local utils = require 'mc.utils'
+% if 'intf' in root:
+local mdb = require 'mc.mdb'
+% endif
 % if len(enums) > 0:
 local create_enum_type = require 'mc.enum'
 % endif

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):
@@ -13,6 +14,8 @@ local classes = {}
 
 % for (class_name, msg) in root.items():
 
+<% msg = render_utils.remove_unnecessary_field(msg) %>
+
 classes.${class_name} = {
   % if render_utils.has_table_name(msg):
     ['table_name'] = '${msg['tableName']}',

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

@@ -1,9 +1,12 @@
 <%def name="render(intf)">
-{
- '${intf['name']}', {
+ 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
   }, {
@@ -22,6 +25,5 @@
       ${s} = 'a{ss}${render_utils.do_types_to_dbus_json(intf['data'], intf['data']['signals'], s)}',
     % endfor
   % endif
-  }
-}
+  })
 </%def>

bmcgo/component/analysis/analysis.py

@@ -119,19 +119,24 @@ class AnalysisComp():
             excluded_str = "/dev" if misc.conan_v1() else "openubmc"
             if node.package_name == "busybox" and excluded_str in node.ref:
                 continue
+            if node.is_build_tool:
+                continue
             packages[node.index] = node
             requires[node.index] = node_data.get("requires", [])
             if misc.conan_v2():
                 dependencies_data = node_data.get("dependencies", [])
-                dependencies_keys = list(dependencies_data.keys())
+                dependencies_keys = [key for key, dep in dependencies_data.items() if dep["direct"]]
                 requires[node.index] = dependencies_keys
         comm_name = misc.community_name()
+        excluded_prefixes = (comm_name, "openubmc")
         for index, pkg in packages.items():
-            if not pkg.name.startswith(comm_name):
+            if not pkg.name.startswith(excluded_prefixes):
                 self.set_node_subsys(pkg)
             for require_id in requires.get(index, []):
-                pkg.requires.append(packages.get(int(require_id), None))
-            if not pkg.name.startswith(comm_name):
+                require_package = packages.get(int(require_id), None)
+                if require_package:
+                    pkg.requires.append(require_package)
+            if not pkg.name.startswith(excluded_prefixes):
                 self.nodes.append(pkg)
 
     def run(self):

bmcgo/component/analysis/dep-rules.json

@@ -1,7 +1,14 @@
 {
-    "Version": "0.0.46",
-    "Description": "此文件对iBMCV3子系统与子系统、组件与组件的依赖关系约束进行了描述, 只有子系统架构师/领域专家才能修改",
+    "Version": "0.0.48",
+    "Description": "此文件对openUBMC子系统与子系统、组件与组件的依赖关系约束进行了描述, 只有TC委员/SIG maintainter才能修改",
     "Changelog": {
+        "0.0.48": [
+            "interface子系统新增dcmid组件，用于代理DCMI规范的IPMI命令"
+        ],        
+        "0.0.47": [
+            "1、framework子系统增加设备驱动管理组件devmon",
+            "2、framework子系统增加设备驱动管理库component_drivers, libmcpp"
+        ],
         "0.0.46": [
             "1、om子系统增加可观测组件observability",
             "2、opensource增加可观测需要的开源软件, 包括fluent-bit, libyaml, opentelemetry, grpc, abseil, protobuf, re2, c_ares,opentelemetry-proto",
@@ -42,12 +49,12 @@
                 "libyaml",
                 "opentelemetry",
                 "grpc",
-                "grpc_tool",
                 "abseil",
                 "protobuf",
                 "re2",
                 "c_ares",
-                "opentelemetry-proto"
+                "opentelemetry-proto",
+                "libspdm"
             ]
         },
 
@@ -103,7 +110,8 @@
                 "persistence",
                 "key_mgmt",
                 "hwdiscovery",
-                "hwproxy"
+                "hwproxy",
+                "devmon"
             ],
             "Libraries": [
                 "persistence",
@@ -117,7 +125,9 @@
                 "libmcc",
                 "libmgmt_protocol",
                 "libkvs",
-                "liblogger"
+                "liblogger",
+                "component_drivers",
+                "libmcpp"
             ],
             "Configurations": [
                 "rootfs_user"
@@ -159,7 +169,8 @@
                 "capability_agent",
                 "certificate",
                 "hisec_ict_ne",
-                "tpcm"
+                "tpcm",
+                "spdm"
             ],
             "Libraries": [
                 "libiam"
@@ -245,7 +256,8 @@
                 "snmp",
                 "profile_schema",
                 "critical_rest",
-                "java_irc"
+                "java_irc",
+                "dcmid"
             ],
             "Libraries": [
                 "libroute_mapper",

bmcgo/component/analysis/dep_node.py

@@ -51,7 +51,9 @@ class DepNode():
         self.local_tables = {}
         self.remote_tables = {}
         self.table_conflict = False
+        self.is_build_tool = False
         if misc.conan_v2():
+            self.is_build_tool = node.get("context") == "build"
             self.recipe_folder = node.get("recipe_folder")
             self.binary = node.get("binary", "")
             if self.binary == "Skip":

bmcgo/component/analysis/intf_validation.py

@@ -34,15 +34,13 @@ class InterfaceValidation:
         self.intf_hardcoded: Dict[str, Set[str]] = defaultdict(set)
         self.all_predefined_intfs: Set[str] = set()
         self.remote = remote
-        self._parse_mds_interfaces()
-        self._parse_hardcoded_interfaces()
-        self._pull_all_interfaces()
+        self.mdb_interface_repo_url = "https://gitcode.com/openUBMC/mdb_interface.git"
 
     @staticmethod
     def extract_dbus_intf_in_file(file_path):
         all_intfs = list()
         with open(file_path, "r") as file_descriptor:
-            # iBMC d-bus interface pattern: bmc.(kepler|dev).[A-Z]
+            # d-bus interface pattern: bmc.(kepler|dev).[A-Z]
             pattern = "[\"\']bmc\.(?:kepler|dev)(?:\.[A-Z].*?)?[\"\']"
             intf_match = re.findall(pattern, file_descriptor.read())
             for intf in intf_match:
@@ -96,6 +94,10 @@ class InterfaceValidation:
         return package
 
     def run(self):
+        self._parse_mds_interfaces()
+        self._parse_hardcoded_interfaces()
+        self._pull_all_interfaces()
+    
         intf_validation_passed = self._validate_mds_intf() and self._validate_hardcoded_intf() and \
                 self._check_dbus_call()
         if intf_validation_passed:
@@ -142,7 +144,6 @@ class InterfaceValidation:
                     self.intf_hardcoded[intf].update([file_path])
 
     def _pull_interfaces_from_repo(self):
-        mdb_interface_repo_url = "https://gitcode.com/openUBMC/mdb_interface.git"
         mktemp_cmd = subprocess.run(["/usr/bin/mktemp", "-d", "--suffix", "_mdb_interface"], capture_output=True)
         if mktemp_cmd.returncode != 0:
             raise OSError(f"创建文件夹失败, 错误消息: {mktemp_cmd.stderr}")
@@ -150,10 +151,10 @@ class InterfaceValidation:
 
         git_cmd = Helper.get_git_path()
         repo_fetch = subprocess.run(
-            [git_cmd, "clone", mdb_interface_repo_url, temp_dir, "--depth=1"],
+            [git_cmd, "clone", self.mdb_interface_repo_url, temp_dir, "--depth=1"],
             stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
         if repo_fetch.returncode != 0:
-            log.error("克隆远端仓库 %s 失败, 错误信息: %s", mdb_interface_repo_url, repo_fetch.stderr)
+            log.error("克隆远端仓库 %s 失败, 错误信息: %s", self.mdb_interface_repo_url, repo_fetch.stderr)
         intf_dir = os.path.join(temp_dir, "json/intf/mdb/bmc")
 
         for root, _, files in os.walk(intf_dir):

bmcgo/component/analysis/sr_validation.py

@@ -22,6 +22,7 @@ from bmcgo.logger import Logger
 
 global log
 log = Logger()
+script_dir = os.path.split(os.path.realpath(__file__))[0]
 
 SOFT_SR_SUFFIX = "_soft.sr"
 SOFTWARE_SUFFIX = "software"
@@ -194,7 +195,7 @@ class SrValidate(SrParser):
         self.is_product_sr_repo = False
         self.check_repo_type()
         self.smc_dfx_whitelist: Dict[str, Set[Tuple[int, int]]] = defaultdict(set)
-        self.load_smc_dfx_whitelist()
+        self.whitelist_file = os.path.join(script_dir, "smc_dfx_whitelist.json")
 
     @staticmethod
     def merge_sr_objects(hardware_sr_objects: Dict[str, Dict], software_sr_objects: Dict[str, Dict]):
@@ -227,11 +228,10 @@ class SrValidate(SrParser):
             log.error('mds/service.json 文件解析失败: %s', e)
 
     def load_smc_dfx_whitelist(self):
-        whitelist_file = Path(__file__).parent.joinpath("smc_dfx_whitelist.json")
-        if not os.path.exists(whitelist_file):
+        if not os.path.exists(self.whitelist_file):
             return
         try:
-            with open(whitelist_file, 'r') as file_descriptor:
+            with open(self.whitelist_file, 'r') as file_descriptor:
                 content = json.load(file_descriptor)
             for item in content:
                 chip_type = item.get("ChipType")
@@ -245,6 +245,7 @@ class SrValidate(SrParser):
     def run(self):
         if not self.is_sr_repo:
             return True
+        self.load_smc_dfx_whitelist()
         self.find_soft_sr_files()
         self.walk_sr_dir()
         file_count, problems_total, issues_count = self.log_issues()