From 7e3423b99759d3ce66a6f4e5c0f7dc4bd109eef8 Mon Sep 17 00:00:00 2001 From: "xiangheng.zhao" Date: Fri, 21 Aug 2026 15:47:30 +0800 Subject: [PATCH] [baremetal2]: ZSTAC-87803 add DPU network validation error codes Root Cause: Baremetal2 DPU network parameter validation reuses an IP-version-specific error code for invalid parameter combinations, missing L3 networks, and network parameters unsupported by non-DPU chassis, producing incorrect error semantics and translations. Solution: Add dedicated error codes for invalid DPU network parameter combinations, nonexistent L3 networks, and unsupported create-network parameters, with mappings for all supported languages. Test: Not run as requested. Verified all mapping files parse successfully, each new code is present in all ten language files, no duplicate constants exist, and git diff --check passes. Resolves: ZSTAC-87803 Change-Id: I256bbd56d6374f1d7d9b753b5192adc24dbe38aa --- conf/i18n/globalErrorCodeMapping/global-error-de-DE.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-en_US.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-fr-FR.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-id-ID.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-ja-JP.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-ko-KR.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-ru-RU.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-th-TH.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-zh_CN.json | 3 +++ conf/i18n/globalErrorCodeMapping/global-error-zh_TW.json | 3 +++ .../utils/clouderrorcode/CloudOperationsErrorCode.java | 6 ++++++ 11 files changed, 36 insertions(+) diff --git a/conf/i18n/globalErrorCodeMapping/global-error-de-DE.json b/conf/i18n/globalErrorCodeMapping/global-error-de-DE.json index b3602b32e16..313ecae959f 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-de-DE.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-de-DE.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "Ungültige Netzwerkparameter zum Erstellen einer DPU-Baremetal2-Instanz.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "Das angegebene L3-Netzwerk[uuid:%s] ist nicht vorhanden.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "Netzwerkparameter für die Instanzerstellung werden nur von DPU-Chassis unterstützt.", "ORG_ZSTACK_XINFINI_SDK_10001": "Formatierung der API-Antwort zur Klasse [%s] fehlgeschlagen, resultString: %s, Ausnahme: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "Der datacenter-Typ [%s] wird hier nicht unterstützt!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "Das Argument 'endpoint' muss für den Konfigurationstyp %s gesetzt werden", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-en_US.json b/conf/i18n/globalErrorCodeMapping/global-error-en_US.json index 8fda69f4152..fe386ec23c2 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-en_US.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-en_US.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "Invalid network parameters for creating a DPU Baremetal2 instance.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "The specified L3 network[uuid:%s] does not exist.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "Network parameters for instance creation are supported only by DPU chassis.", "ORG_ZSTACK_XINFINI_SDK_10001": "format API response to class[%s] failed, resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "not supported datacenter type [%s] here!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "arg \u0027endpoint\u0027 must be set for %s configuration type", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-fr-FR.json b/conf/i18n/globalErrorCodeMapping/global-error-fr-FR.json index a0e299aff9f..1dd7e70da64 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-fr-FR.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-fr-FR.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "Paramètres réseau non valides pour la création d’une instance Baremetal2 DPU.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "Le réseau L3 spécifié[uuid:%s] n’existe pas.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "Les paramètres réseau de création d’instance sont pris en charge uniquement par les châssis DPU.", "ORG_ZSTACK_XINFINI_SDK_10001": "Échec du formatage de la réponse API vers la classe [%s], resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "Type de datacenter [%s] non pris en charge ici !", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "L'argument 'endpoint' doit être défini pour le type de configuration %s", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-id-ID.json b/conf/i18n/globalErrorCodeMapping/global-error-id-ID.json index d27b78d3499..9c3d1aafe2b 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-id-ID.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-id-ID.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "Parameter jaringan tidak valid untuk membuat instans Baremetal2 DPU.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "Jaringan L3 yang ditentukan[uuid:%s] tidak ada.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "Parameter jaringan untuk pembuatan instans hanya didukung oleh chassis DPU.", "ORG_ZSTACK_XINFINI_SDK_10001": "format respons API ke class[%s] gagal, resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "tipe datacenter [%s] tidak didukung di sini!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "argumen 'endpoint' harus diatur untuk tipe konfigurasi %s", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-ja-JP.json b/conf/i18n/globalErrorCodeMapping/global-error-ja-JP.json index 4acbf1c06e4..2cc3e9a95a7 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-ja-JP.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-ja-JP.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "DPU Baremetal2インスタンスを作成するためのネットワークパラメーターが無効です。", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "指定されたL3ネットワーク[uuid:%s]は存在しません。", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "インスタンス作成時のネットワークパラメーターはDPUシャーシでのみサポートされます。", "ORG_ZSTACK_XINFINI_SDK_10001": "APIレスポンスをクラス[%s]にフォーマットできませんでした。resultString: %s、exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "データセンタータイプ [%s] はここではサポートされていません！", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "%s 設定タイプには 'endpoint' 引数を設定する必要があります", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-ko-KR.json b/conf/i18n/globalErrorCodeMapping/global-error-ko-KR.json index d9d5de55de9..a0ea9104f56 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-ko-KR.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-ko-KR.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "DPU Baremetal2 인스턴스 생성을 위한 네트워크 매개변수가 올바르지 않습니다.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "지정한 L3 네트워크[uuid:%s]가 존재하지 않습니다.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "인스턴스 생성 네트워크 매개변수는 DPU 섀시에서만 지원됩니다.", "ORG_ZSTACK_XINFINI_SDK_10001": "API 응답을 클래스[%s]로 포맷 실패, 결과 문자열: %s, 예외: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "여기서 지원되지 않는 데이터센터 타입 [%s]입니다!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "%s 구성 타입에 대해 'endpoint' 인수가 설정되어야 합니다", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-ru-RU.json b/conf/i18n/globalErrorCodeMapping/global-error-ru-RU.json index 2bcbcfe039e..e700935a334 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-ru-RU.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-ru-RU.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "Недопустимые сетевые параметры для создания экземпляра DPU Baremetal2.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "Указанная сеть L3[uuid:%s] не существует.", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "Сетевые параметры создания экземпляра поддерживаются только шасси DPU.", "ORG_ZSTACK_XINFINI_SDK_10001": "Не удалось отформатировать API-ответ в класс[%s], resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "Тип дата-центра [%s] здесь не поддерживается!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "Аргумент 'endpoint' должен быть установлен для типа конфигурации %s", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-th-TH.json b/conf/i18n/globalErrorCodeMapping/global-error-th-TH.json index 3c8c04b2cf7..bd026931653 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-th-TH.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-th-TH.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "พารามิเตอร์เครือข่ายสำหรับการสร้างอินสแตนซ์ DPU Baremetal2 ไม่ถูกต้อง", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "ไม่มีเครือข่าย L3[uuid:%s] ที่ระบุ", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "พารามิเตอร์เครือข่ายสำหรับการสร้างอินสแตนซ์รองรับเฉพาะ Chassis DPU เท่านั้น", "ORG_ZSTACK_XINFINI_SDK_10001": "จัดรูปแบบการตอบกลับ API ไปยัง class[%s] ล้มเหลว, resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "ชนิดศูนย์ข้อมูล [%s] ไม่รองรับที่นี่!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "argument 'endpoint' ต้องถูกตั้งค่าสำหรับชนิดการกำหนดค่า %s", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-zh_CN.json b/conf/i18n/globalErrorCodeMapping/global-error-zh_CN.json index 0c36ae4980b..8bcd4131854 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-zh_CN.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-zh_CN.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "创建 DPU 弹性裸金属实例时，网络参数配置无效", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "指定的三层网络[uuid:%s]不存在", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "仅 DPU 机箱支持创建实例时指定网络参数", "ORG_ZSTACK_XINFINI_SDK_10001": "格式化 API 结果到类[%s]失败，resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "不支持的数据中心 [%s] 类型 here!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "arg \u0027endpoint\u0027 必须在 %s 类型中设置", diff --git a/conf/i18n/globalErrorCodeMapping/global-error-zh_TW.json b/conf/i18n/globalErrorCodeMapping/global-error-zh_TW.json index 16f440db0ea..fa4bed08ea5 100644 --- a/conf/i18n/globalErrorCodeMapping/global-error-zh_TW.json +++ b/conf/i18n/globalErrorCodeMapping/global-error-zh_TW.json @@ -1,4 +1,7 @@ { + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099": "建立 DPU 彈性裸金屬執行個體時，網路參數設定無效", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100": "指定的三層網路[uuid:%s]不存在", + "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101": "僅 DPU 機箱支援建立執行個體時指定網路參數", "ORG_ZSTACK_XINFINI_SDK_10001": "格式化 API 結果到類[%s]失敗，resultString: %s, exception: %s", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10001": "不支持的數据中心 [%s] 類型 here!", "ORG_ZSTACK_ALIYUN_CORE_DATACENTER_10000": "arg 'endpoint' 必須在 %s 類型中設置", diff --git a/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java b/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java index 9fc175de2c1..982bbaacaf2 100644 --- a/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java +++ b/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java @@ -7854,6 +7854,12 @@ public class CloudOperationsErrorCode { public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10098 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10098"; + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10099 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10099"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10100 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10100"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10101 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10101"; + public static final String ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10000 = "ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10000"; public static final String ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10001 = "ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10001";