openubmc-bingo 0.5.243__py3-none-any.whl → 0.5.254__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.243'
+__version__ = '0.5.254'

bmcgo/bmcgo_config.py

@@ -48,6 +48,44 @@ class BmcgoManifest(object):
         self.config = config
 
 
+class BmcgoHpmServerSign(object):
+    def __init__(self, config: configparser.ConfigParser):
+        self.config = config
+        self.rootca_der = config.get(misc.HPM_SERVER_SIGN, misc.HPM_SIGN_ROOTCA_DER)
+        self.cert_id = config.get(misc.HPM_SERVER_SIGN, misc.HPM_SERVER_SIGN_CERT_ID)
+        self.url = config.get(misc.HPM_SERVER_SIGN, misc.HPM_SERVER_SIGN_URL)
+        self.ssl_verify = config.get(misc.HPM_SERVER_SIGN, misc.HPM_SERVER_SIGN_SSL_VERYFY)
+
+
+class BmcgoHpmSelfSign(object):
+    def __init__(self, config: configparser.ConfigParser):
+        self.config = config
+        self.rootca_der = config.get(misc.HPM_SELF_SIGN, misc.HPM_SIGN_ROOTCA_DER)
+        self.rootca_crl = config.get(misc.HPM_SELF_SIGN, misc.HPM_SELF_SIGN_ROOTCA_CRL)
+        self.signer_pem = config.get(misc.HPM_SELF_SIGN, misc.HPM_SELF_SIGN_SIGNER_PEM)
+        self.ts_signer_pem = config.get(misc.HPM_SELF_SIGN, misc.HPM_SELF_SIGN_TS_PEM)
+        self.ts_signer_cnf = config.get(misc.HPM_SELF_SIGN, misc.HPM_SELF_SIGN_TS_CNF)
+
+
+class BmcgoE2pServerSign(object):
+    def __init__(self, config: configparser.ConfigParser):
+        self.config = config
+        self.url = config.get(misc.E2P_SERVER_SIGN, misc.E2P_SERVER_SIGN_URL)
+
+
+class BmcgoE2pSelfSign(object):
+    def __init__(self, config: configparser.ConfigParser):
+        self.config = config
+        self.pem = config.get(misc.E2P_SELF_SIGN, misc.E2P_SELF_SIGN_PEM)
+
+
+class BmcgoHpmEncrypt(object):
+    def __init__(self, config: configparser.ConfigParser):
+        self.config = config
+        self.need_encrypt = config.getboolean(misc.HPM_ENCRYPT, misc.HPM_ENCRYPT_ENABLE)
+        self.tool_path = shutil.which(misc.HPM_ENCRYPT_TOOL)
+
+
 class BmcgoConfig(object):
     def __init__(self):
         """初始化"""
@@ -55,6 +93,11 @@ class BmcgoConfig(object):
         self.conan_index = None
         self.manifest = None
         self.ibmc_sdk = None
+        self.hpm_self_sign: BmcgoHpmSelfSign = None
+        self.hpm_server_sign: BmcgoHpmServerSign = None
+        self.e2p_self_sign: BmcgoE2pSelfSign = None
+        self.e2p_server_sign: BmcgoE2pServerSign = None
+        self.hpm_encrypt = None
         self.new_frame = False
         self.conan_blacklist = []
         self.bmcgo_path = os.path.dirname(os.path.realpath(__file__))
@@ -130,7 +173,8 @@ class BmcgoConfig(object):
                     self.component = BmcgoComp(folder, conf)
                 except (NoSectionError, NoOptionError):
                     log.debug("不是一个合法的组件仓，尝试查找mds/service.json")
-                return
+
+                self._bmcgo_signature_config_load(conf)
 
             config_file = os.path.join(cwd, "mds", "service.json")
             if self.manifest is None and os.path.isfile(config_file):
@@ -144,6 +188,9 @@ class BmcgoConfig(object):
         self._bmcgo_system_config_load()
         self._bmcgo_global_config_load()
         self._bmcgo_local_config_load()
+        self._bmcgo_signature_config_load(self.bmcgo_local_config)
+        self._bmcgo_signature_config_load(self.bmcgo_global_config)
+        self._bmcgo_signature_config_load(self.bmcgo_system_config)
 
     def _bmcgo_system_config_load(self):
         """读取配置"""
@@ -169,6 +216,39 @@ class BmcgoConfig(object):
                 for k, v in self.bmcgo_local_config.items(section):
                     self._generate_bmcgo_config(section, k, v)
 
+    def _bmcgo_signature_config_load(self, conf: configparser.ConfigParser):
+        """解析hpm与eeprom签名加密配置，优先级如下"""
+        """.bmcgo/config > local config > global config > system config"""
+        try:
+            if not self.hpm_self_sign:
+                self.hpm_self_sign = BmcgoHpmSelfSign(conf)
+        except (NoSectionError, NoOptionError):
+            log.debug("未找到hpm自签名配置")
+
+        try:
+            if not self.hpm_server_sign:
+                self.hpm_server_sign = BmcgoHpmServerSign(conf)
+        except (NoSectionError, NoOptionError):
+            log.debug("未找到hpm服务器签名配置")
+        
+        try:
+            if not self.e2p_self_sign:
+                self.e2p_self_sign = BmcgoE2pSelfSign(conf)
+        except (NoSectionError, NoOptionError):
+            log.debug("未找到eeprom自签名配置")
+        
+        try:
+            if not self.e2p_server_sign:
+                self.e2p_server_sign = BmcgoE2pServerSign(conf)
+        except (NoSectionError, NoOptionError):
+            log.debug("未找到eeprom服务器签名配置")
+
+        try:
+            if not self.hpm_encrypt:
+                self.hpm_encrypt = BmcgoHpmEncrypt(conf)
+        except (NoSectionError, NoOptionError):
+            log.debug("未找到hpm加密配置")
+
     def _generate_bmcgo_config(self, section, key, value):
         """读取配置"""
         if section not in self.bmcgo_config_list:

bmcgo/codegen/lua/Makefile

@@ -1,5 +1,6 @@
 DATAMODE_DIR = $(shell pwd)
 SCRIPT_DIR = $(DATAMODE_DIR)/script
+MAJOR_VERIONS_DIR = $(DATAMODE_DIR)/
 
 GEN_BIN = $(SCRIPT_DIR)/gen.py
 GEN_DATAS_BIN = $(SCRIPT_DIR)/gen_datas.py
@@ -25,10 +26,12 @@ protos:
 	@cd proto && make -j12 \
 		PROTO_OUT_DIR=${PROTO_OUT_DIR} \
 		SCRIPT_DIR=${SCRIPT_DIR} \
+		MAJOR_VERIONS_DIR=${MAJOR_VERIONS_DIR} \
 		PROTO_DIR=${PROTO_DIR} \
 		JSON_DIR=${JSON_DIR}\
 		PROJECT_NAME=${PROJECT_NAME}\
 		VERSION=${VERSION} \
+		MAJOR_VERSION=${MAJOR_VERSION} \
 
 DFT_SERVICE_JSON_EXISTS := $(wildcard ${MDS_DIR}/service.json)
 DFT_MODEL_JSON_EXISTS := $(wildcard ${MDS_DIR}/dft/model.json)
@@ -38,10 +41,12 @@ dft_protos:
 	@cd proto && make -j12 \
 		PROTO_OUT_DIR=${PROTO_OUT_DIR}/dft \
 		SCRIPT_DIR=${SCRIPT_DIR} \
+		MAJOR_VERIONS_DIR=${MAJOR_VERIONS_DIR} \
 		PROTO_DIR=${PROTO_DIR} \
 		JSON_DIR=${JSON_DIR}\
 		PROJECT_NAME=${PROJECT_NAME}\
 		VERSION=${VERSION} \
+		MAJOR_VERSION=${MAJOR_VERSION} \
 
 else
 dft_protos:
@@ -55,10 +60,12 @@ debug_protos:
 	@cd proto && make -j12 \
 		PROTO_OUT_DIR=${PROTO_OUT_DIR}/debug \
 		SCRIPT_DIR=${SCRIPT_DIR} \
+		MAJOR_VERIONS_DIR=${MAJOR_VERIONS_DIR} \
 		PROTO_DIR=${PROTO_DIR} \
 		JSON_DIR=${JSON_DIR}\
 		PROJECT_NAME=${PROJECT_NAME}\
 		VERSION=${VERSION} \
+		MAJOR_VERSION=${MAJOR_VERSION} \
 
 else
 debug_protos:
@@ -69,9 +76,11 @@ gen: protos dft_protos debug_protos
 		PROTO_OUT_DIR=${PROTO_OUT_DIR} \
 		GENERATE_OUT_DIR=${GENERATE_OUT_DIR} \
 		SCRIPT_DIR=${SCRIPT_DIR} \
+		MAJOR_VERIONS_DIR=${MAJOR_VERIONS_DIR} \
 		PROTO_DIR=${PROTO_DIR} \
 		PROJECT_NAME=${PROJECT_NAME} \
 		VERSION=${VERSION} \
+		MAJOR_VERSION=${MAJOR_VERSION} \
 		RESTAPI_DIRS="${RESTAPI_DIRS}" \
 		MDS_DIR=${MDS_DIR}\
 		CONF_DIR=${CONF_DIR}\
@@ -83,9 +92,11 @@ mdb: protos
 		PROTO_OUT_DIR=${PROTO_OUT_DIR} \
 		GENERATE_OUT_DIR=${GENERATE_OUT_DIR} \
 		SCRIPT_DIR=${SCRIPT_DIR} \
+		MAJOR_VERIONS_DIR=${MAJOR_VERIONS_DIR} \
 		PROTO_DIR=${PROTO_DIR} \
 		PROJECT_NAME=${PROJECT_NAME} \
 		VERSION=${VERSION} \
+		MAJOR_VERSION=${MAJOR_VERSION} \
 		mdb
 
 messages: protos
@@ -93,9 +104,11 @@ messages: protos
 		PROTO_OUT_DIR=${PROTO_OUT_DIR} \
 		GENERATE_OUT_DIR=${GENERATE_OUT_DIR} \
 		SCRIPT_DIR=${SCRIPT_DIR} \
+		MAJOR_VERIONS_DIR=${MAJOR_VERIONS_DIR} \
 		PROTO_DIR=${PROTO_DIR} \
 		PROJECT_NAME=${PROJECT_NAME} \
 		VERSION=${VERSION} \
+		MAJOR_VERSION=${MAJOR_VERSION} \
 		BUILD_DIR=${BUILD_DIR} \
 		messages
 

bmcgo/codegen/lua/codegen.py

@@ -22,11 +22,12 @@ cwd = os.path.split(os.path.realpath(__file__))[0]
 
 
 class CodeGen(object):
-    def __init__(self, project_dir, version, remote):
+    def __init__(self, project_dir, version, remote, major_version=0):
         self.gen_tool_dir = os.path.join(project_dir, 'temp/lua_codegen')
         self.project_dir = project_dir
         self.project_name = self.get_project_name()
         self.version = version
+        self.major_version = major_version
         self.remote = remote
 
     def read_service_json(self):
@@ -143,9 +144,10 @@ class CodeGen(object):
         lua_format = self.get_lua_format()
         cmd = [
             "/usr/bin/make", "-j12", f"PROJECT_NAME={self.project_name}", f"TPL_DIR={self.gen_tool_dir}",
-            f"VERSION={self.version}", "gen"
+            f"VERSION={self.version}", f"MAJOR_VERSION={self.major_version}", "gen"
         ]
         subprocess.run(cmd, env=dict(os.environ, LUA_FORMAT=lua_format, LUA_CODEGEN_VERSION=str(self.version),
+                                     MAJOR_VERSION=str(self.major_version),
                                      PROJECT_NAME=self.project_name), check=True)
         if args.with_template:
             script_path = os.path.join(cwd, 'script', 'gen_entry.py')
@@ -153,7 +155,8 @@ class CodeGen(object):
             model_path = os.path.join(self.gen_tool_dir, self.project_name, '_model.json')
             ipmi_path = os.path.join(self.project_dir, 'mds', 'ipmi.json')
             subprocess.run(["/usr/bin/python3", script_path, "-i", ipmi_path, "-m", model_path, "-o", self.project_dir,
-            "-n", self.project_name, "-f", lua_format, "-t", mako_dir, "-v", self.version], check=True)
+            "-n", self.project_name, "-f", lua_format, "-t", mako_dir, "-v", self.version, "-p", self.major_version],
+            check=True)
 
     def gen(self, args):
         check_cmd_file = os.path.join(self.project_dir, 'temp/lua_codegen/temp/check_cmd.json')

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

@@ -21,6 +21,7 @@ class Options:
         self.enable_auto_merge: bool = options.enable_auto_merge
         self.project_name = options.project_name
         self.version = options.version
+        self.major_version = options.major_version
         self.proto_root_path = os.path.normpath(options.proto_root_path)
         self.proto_json_root_path = os.path.normpath(
             options.proto_json_root_path)

bmcgo/codegen/lua/script/{render_utils/factory.py → factory.py}

@@ -13,7 +13,7 @@
 from typing import Optional
 
 from dto.options import Options
-from render_utils.base import Base
+from base import Base
 
 
 class NoRenderUtilsException(Exception):

bmcgo/codegen/lua/script/gen_entry.py

@@ -132,7 +132,8 @@ def template_render(options, template_path, output_file_path, class_name="", dra
         make_header=header,
         project_name=options[APP_NAME],
         class_name=class_name,
-        render_utils=Utils
+        render_utils=Utils,
+        major_version=options["major_version"]
     ))
     output_file.write(render_data)
     output_file.close()
@@ -217,8 +218,8 @@ def main(argv):
     logging.getLogger().setLevel(logging.INFO)
     options = dict()
     try:
-        opts, _ = getopt.getopt(argv, "hi:m:o:n:f:t:", ["help", "ipmi=", "model=",
-        "out=", "name=", "formatter=", "template"])
+        opts, _ = getopt.getopt(argv, "hi:m:o:n:f:t:v:p:", ["help", "ipmi=", "model=",
+        "out=", "name=", "formatter=", "template=", "version=", "major_version="])
     except getopt.GetoptError as getopt_error:
         logging.error(getopt_error)
         return
@@ -240,6 +241,8 @@ def main(argv):
             options['template_dir'] = arg
         elif opt in ("-v", "--version"):
             options['version'] = arg
+        elif opt in ("-p", "--major_version"):
+            options['major_version'] = arg
         else:
             raise RuntimeError("不支持的选项: {}".format(opt))
     required_keys = {

bmcgo/codegen/lua/script/gen_intf_rpc_json.py

@@ -18,6 +18,7 @@ import os
 import re
 import mds_util as utils
 from utils import Utils
+from bmcgo.utils.tools import Tools
 
 PROP_PRIORITY = "priority"
 PROP_LOCAL = "LocalPer"
@@ -33,6 +34,10 @@ PATH = "path"
 PATHS = "paths"
 DEFS = "defs"
 ITEMS = ["dep_properties", "dep_methods", "dep_signals"]
+DEPRECATED = "deprecated"
+
+tool = Tools()
+log = tool.log
 
 
 class InterfaceDep:
@@ -179,6 +184,8 @@ def generate_interface(class_name, intf_data, interfaces, intf, class_path):
     interface = class_name + intf_class
     if check_interface_duplicate(interfaces, interface, intf, intf_data):
         return
+    if intf_data.get(DEPRECATED, False):
+        log.warning(f"在service.json中配置了已废弃的依赖项, interface: {intf}")
 
     for item in ITEMS:
         values = intf_data.get(item, [])
@@ -190,6 +197,8 @@ def generate_interface(class_name, intf_data, interfaces, intf, class_path):
         for value in values:
             if not intf_data.get(item[4:], {}).get(value, {}):
                 raise Exception(f"在service.json中配置了不存在的依赖项, interface: {intf}, item: {value}")
+            if intf_data.get(item[4:], {}).get(value, {}).get(DEPRECATED, False):
+                log.warning(f"在service.json中配置了已废弃的依赖项, interface: {intf}, item: {value}")
 
     
     interface_data = {
@@ -445,6 +454,9 @@ def generate_only_interface(intf_dep: InterfaceDep, service, imports, mdb_path):
 
 def fill_client_intf(service, imports, mdb_path, required, path):
     intf_dep = InterfaceDep(required)
+    intf_seg = (intf_dep.name).split('.')
+    if len(intf_seg) >= 3 and intf_seg[2] == 'Debug':
+        raise Exception(f"在service.json中配置了调试版本的依赖项, interface: {intf_dep.name}")
     if path != "*":
         class_name, path_json = utils.get_path_by_interface(mdb_path, required["interface"], path)
         generate_path_interface(

bmcgo/codegen/lua/script/gen_schema.py

@@ -82,6 +82,8 @@ def read_properties(properties, out_properties, is_intf_props):
         # filter properties which no need for csr
         prop_alias = prop
         if not is_usage_csr(properties[prop]):
+            prop_alias = properties[prop].pop("alias", prop)
+            props[index] = prop_alias
             continue
         # if prop have alias, use alias name replace prop name
         if "alias" in properties[prop] and Utils.get_lua_codegen_version() >= 13:

bmcgo/codegen/lua/script/merge_model.py

@@ -27,6 +27,7 @@ log = tool.log
 OPTIONS_SETTING = ["explicit", "volatile"]
 CHECK_PROPS_SETTINGS = ["usage", "alias", "primaryKey", "uniqueKey", "privilege", "default", "featureTag", "critical",
         "notAllowNull", "refInterface", "displayDescription", "sensitive"]
+DEPRECATED = "deprecated"
 
 
 def save_file(of_name, model_new):
@@ -40,9 +41,9 @@ def save_file(of_name, model_new):
         os.open(
             of_name, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, stat.S_IWUSR | stat.S_IRUSR
         ),
-        "w",
+        "w", encoding="utf-8"
     ) as load_f:
-        json.dump(model_new, load_f, indent=4)
+        json.dump(model_new, load_f, ensure_ascii=False, indent=4)
         logging.info("schema 已经更改")
 
 
@@ -123,9 +124,11 @@ def merge_when_intf_exist(model, intf, item, class_name, intf_name):
 
     properties = model[item]
     for prop in list(properties):
+        label = "方法" if item == "methods" else "信号"
         if prop in intf[item]:
+            if intf[item][prop].get(DEPRECATED, False):
+                log.warning(f"model.json中类{class_name}接口{intf_name}的{label}{prop}已废弃")
             continue
-        label = "方法" if item == "methods" else "信号"
         raise RuntimeError(f"model.json中类{class_name}接口{intf_name}的{label}{prop}在mdb_interface中没有被定义")
 
     intf_info = {"class_name": class_name, "intf_name": intf_name}
@@ -146,6 +149,8 @@ def merge_model_intf(intf_data, model_intf, class_name, intf_name):
     for prop in model_props.keys():
         if prop not in mdb_props:
             raise RuntimeError(f"model.json中类{class_name}接口{intf_name}的属性{prop}在mdb_interface中没有被定义")
+        if mdb_props[prop].get(DEPRECATED, False):
+            log.warning(f"model.json中类{class_name}接口{intf_name}的属性{prop}已废弃")
     if mdb_props and "virtual" in intf_data:
         model_props["priority"] = {
             "baseType": "U8",
@@ -179,6 +184,8 @@ def merge_model_class(class_name, mds_class, mdb_obj, mdb_path):
     for intf_name in mdb_obj[class_name]["interfaces"]:
         if intf_name not in mds_class["interfaces"]:
             raise RuntimeError(f"model.json中类{class_name}未配置资源树接口{intf_name}")
+        if mds_class["interfaces"][intf_name].get(DEPRECATED, False):
+            log.warning(f"model.json中类{class_name}配置了已废弃的资源数接口{intf_name}")
         for item in mds_class["interfaces"][intf_name]:
             if item not in ["properties", "methods", "signals", "privilege"]:
                 raise RuntimeError(f"model.json中类{class_name}接口{intf_name}的字段{item}超出取值范围")

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

@@ -12,17 +12,15 @@
 
 __all__ = [
     'Base', 'Factory', 'RequestLuaUtils', 'ControllerLuaUtils', 'IpmiMessageUtils', 'MessageUtils',
-    'UtilsMessageLua', 'ErrorLuaUtils', 'ClientLuaUtils',
+    'UtilsMessageLua', 'ErrorLuaUtils', 'ClientLuaUtils', "ConsistencyModelLuaUtils",
     'DbLuaUtils', 'IpmiLuaUtils', 'RedfishProtoUtils', 'ServicesUtils', 
     'MdbLuaUtils', 'OldModelLuaUtils', 'ModelLuaUtils', "MdbRegister", 'MessagesLuaUtils', 'PluginLuaUtils'
 ]
 
-from render_utils.base import Base
 from render_utils.client_lua import ClientLuaUtils
 from render_utils.controller_lua import ControllerLuaUtils
 from render_utils.db_lua import DbLuaUtils
 from render_utils.error_lua import ErrorLuaUtils
-from render_utils.factory import Factory
 from render_utils.ipmi_lua import IpmiLuaUtils
 from render_utils.ipmi_message_lua import IpmiMessageUtils
 from render_utils.mdb_lua import MdbLuaUtils
@@ -35,4 +33,7 @@ from render_utils.old_model_lua import OldModelLuaUtils
 from render_utils.model_lua import ModelLuaUtils
 from render_utils.mdb_register import MdbRegister
 from render_utils.messages_lua import MessagesLuaUtils
-from render_utils.plugin_lua import PluginLuaUtils
+from render_utils.plugin_lua import PluginLuaUtils
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
+from bmcgo.codegen.lua.v1.script.render_utils.model_lua import ConsistencyModelLuaUtils

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

@@ -12,9 +12,9 @@
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
 from render_utils.mdb_register import MdbRegister
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class ClientLuaUtils(Base, Utils, MdbRegister):

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

@@ -11,10 +11,10 @@
 # See the Mulan PSL v2 for more details.
 
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
 from render_utils.utils_message_lua import UtilsMessageLua
 from render_utils.validate_lua import ValidateLua
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class ControllerLuaUtils(Base, ValidateLua, UtilsMessageLua):

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

@@ -13,8 +13,8 @@
 import json
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class DbLuaUtils(Base, Utils):

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

@@ -14,8 +14,8 @@ import re
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class ErrorLuaUtils(Base, Utils):

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

@@ -11,8 +11,8 @@
 # See the Mulan PSL v2 for more details.
 
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class IpmiLuaUtils(Base):

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

@@ -11,10 +11,10 @@
 # See the Mulan PSL v2 for more details.
 
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
 from render_utils.utils_message_lua import UtilsMessageLua
 from render_utils.validate_lua import ValidateLua
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class IpmiMessageUtils(Base, ValidateLua, UtilsMessageLua):

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

@@ -14,10 +14,10 @@ import re
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
 from render_utils.utils_message_lua import UtilsMessageLua
 from render_utils.validate_lua import ValidateLua
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class MdbLuaUtils(Base, ValidateLua, UtilsMessageLua):

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

@@ -11,11 +11,11 @@
 # See the Mulan PSL v2 for more details.
 
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
 from render_utils.utils_message_lua import UtilsMessageLua
 from render_utils.validate_lua import ValidateLua
 from render_utils.mdb_register import MdbRegister
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class MessageUtils(Base, ValidateLua, UtilsMessageLua, MdbRegister):

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

@@ -14,8 +14,8 @@ import re
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class MessagesLuaUtils(Base, Utils):

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

@@ -14,8 +14,8 @@ import re
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 BASE_TYPE = "baseType"

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

@@ -14,8 +14,8 @@ import re
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 BASE_TYPE = "baseType"

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

@@ -12,8 +12,8 @@
 
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class PluginLuaUtils(Base, Utils):

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

@@ -12,8 +12,8 @@
 
 import merge_proto_algo
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class RedfishProtoUtils(Base):

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

@@ -20,8 +20,8 @@ from dto.redfish_api import MessageSchemaMgr, MessageSchema, Property
 from dto.url_route import UrlRouteDict
 from loader import kepler_abstract_loader
 from loader.redfish_loader import RedfishLoader
-from render_utils.factory import Factory
-from render_utils.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
+from bmcgo.codegen.lua.script.base import Base
 
 
 class RequestLua:

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

@@ -14,10 +14,10 @@ import os
 import re
 from utils import Utils
 from dto.options import Options
-from render_utils.base import Base
-from render_utils.factory import Factory
 from render_utils.validate_lua import ValidateLua
 from render_utils.mdb_register import MdbRegister
+from bmcgo.codegen.lua.script.base import Base
+from bmcgo.codegen.lua.script.factory import Factory
 
 
 class ServicesUtils(Base, ValidateLua, Utils, MdbRegister):
@@ -128,3 +128,4 @@ class ServicesUtils(Base, ValidateLua, Utils, MdbRegister):
 
 
 Factory().register("service.lua.mako", ServicesUtils)
+Factory().register("v1/templates/apps/service.lua.mako", ServicesUtils)

bmcgo/codegen/lua/script/template.py

@@ -46,6 +46,9 @@ def parse_input_args() -> Options:
     parser.add_argument("-n", "--project_name", dest="project_name",
                         help="project name",
                         default="")
+    parser.add_argument("-p", "--major_version", dest="major_version",
+                        help="major version",
+                        default="")
     parser.add_argument("-v", "--version", dest="version",
                         help="version",
                         default=-1)
@@ -122,7 +125,7 @@ def generate(options: Options):
 
     header = utils.Utils(data, options).make_header(
         options.template_name, options.output_file_path)
-    lookup = TemplateLookup(directories=[os.getcwd() + "/"], input_encoding='utf-8')
+    lookup = TemplateLookup(directories=[os.getcwd() + "/", os.getcwd() + "/../../"], input_encoding='utf-8')
     template = lookup.get_template(options.template_name)
     if os.path.exists(options.output_file_path):
         os.remove(options.output_file_path)
@@ -144,6 +147,7 @@ def generate(options: Options):
         load_import=make_load_import(data, options),
         project_name=options.project_name,
         version=options.version,
+        major_version=options.major_version,
         use_frame_log=use_frame_log,
     ))
     output_file.write(render_data)