Skip to content

<fix>[mevoco]: delete vcenter.mac.conflict.strategy#4158

Open
ZStack-Robot wants to merge 1 commit into
4.8.38from
sync/yaohua.wu/bugfix/ZSTAC-85586@@2
Open

<fix>[mevoco]: delete vcenter.mac.conflict.strategy#4158
ZStack-Robot wants to merge 1 commit into
4.8.38from
sync/yaohua.wu/bugfix/ZSTAC-85586@@2

Conversation

@ZStack-Robot
Copy link
Copy Markdown
Collaborator

Backport ZSTAC-85586 to 4.8.38

Cherry-pick of original fix from 原单 ZSTAC-61758 (source: 5.0.0).

Original commit: c5bbcde
Local cherry-pick HEAD: 8551824

Changes

 conf/errorElaborations/Elaboration.json                 |  8 --------
 conf/i18n.json                                          | 15 ---------------
 conf/i18n/messages_en_US.properties                     |  4 ----
 conf/i18n/messages_zh_CN.properties                     |  4 ----
 sdk/src/main/java/SourceClassMap.java                   |  2 --
 sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java  |  9 ---------
 sdk/src/main/java/org/zstack/sdk/SkippedResources.java  | 15 ---------------
 sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java |  9 +--------
 8 files changed, 1 insertion(+), 65 deletions(-)

Related: ZSTAC-85586

sync from gitlab !10063

delete vcenter.mac.conflict.strategy and delete skippedResources in the APIAddVCenterEvent and APISyncVCenterEvent

GlobalConfigImpact

Resolves: ZSTAC-61758

Change-Id: I6676796a6e78746a637478736e6876616e6e6861
(cherry picked from commit c5bbcde)
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jun 1, 2026

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: ab1ad41e-cbe2-4039-9b5c-fd08e82ed46a

📥 Commits

Reviewing files that changed from the base of the PR and between 00abf62 and 8551824.

⛔ Files ignored due to path filters (2)
  • conf/errorElaborations/Elaboration.json is excluded by !**/*.json
  • conf/i18n.json is excluded by !**/*.json
📒 Files selected for processing (6)
  • conf/i18n/messages_en_US.properties
  • conf/i18n/messages_zh_CN.properties
  • sdk/src/main/java/SourceClassMap.java
  • sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java
  • sdk/src/main/java/org/zstack/sdk/SkippedResources.java
  • sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java
💤 Files with no reviewable changes (5)
  • sdk/src/main/java/org/zstack/sdk/SkippedResources.java
  • conf/i18n/messages_en_US.properties
  • sdk/src/main/java/SourceClassMap.java
  • conf/i18n/messages_zh_CN.properties
  • sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java

概览

此 PR 系统地从 SDK 中移除了 SkippedResources 类型及其所有引用,包括从结果对象(AddVCenterResult、SyncVCenterResult)中删除字段和访问器,更新类型映射注册表,以及移除相关的国际化错误消息。

变更

SkippedResources 类型移除

层级 / 文件 摘要
从 SDK 结果类型移除 SkippedResources
sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java, sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java
AddVCenterResultSyncVCenterResult 中删除了 skippedResources 字段、getter/setter 方法及对应的导入声明,使这两个结果类不再依赖 SkippedResources 类型。
更新类型映射注册表
sdk/src/main/java/SourceClassMap.java
srcToDstMappingdstToSrcMapping 中移除了 SkippedResources 的双向映射条目。
移除相关的国际化消息
conf/i18n/messages_en_US.properties, conf/i18n/messages_zh_CN.properties
移除了英文和中文消息属性文件中与 MAC 地址重复冲突相关的错误提示文案。

🎯 2 (Simple) | ⏱️ ~12 分钟

🐰 型如飘雪又纷纷,
资源跳过已无踪。
映射随之皆删净,
消息亦步亦趋退。
代码清爽焕新生,
技术债务又扫清!

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed 标题准确反映了主要变更:删除 vcenter.mac.conflict.strategy 相关的配置和资源。
Description check ✅ Passed 描述清楚地说明了这是一个回溯提交,包含了原始修复的信息、相关问题号和变更列表。
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sync/yaohua.wu/bugfix/ZSTAC-85586@@2

Comment @coderabbitai help to get the list of available commands and usage tips.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant