<fix>[conf]: Fix V5.4.6__schema.sql when upgrade templates#3555
Open
ZStack-Robot wants to merge 4 commits intofeature-zcf-v0.1from
Open
<fix>[conf]: Fix V5.4.6__schema.sql when upgrade templates#3555ZStack-Robot wants to merge 4 commits intofeature-zcf-v0.1from
ZStack-Robot wants to merge 4 commits intofeature-zcf-v0.1from
Conversation
Resolves: ZCF-1365 Change-Id: I73687962636e7871626e687761626d6661716668
Resolves: ZCF-1365 Change-Id: I626968656f6c6966796a616b6e736d696e647966
Resolves: ZCF-1365 Change-Id: I716b787976776e7979736e617864726d786b756b
DBImpact Resolves: ZCF-1365 Change-Id: I6c746e6a777a6a62726b7a687070736b65766b6a
高层概览本PR添加了ZNS SDN控制器集成支持，包括新增三个数据库表、L2Geneve网络类型、L3网络MTU扩展点、KVM DPDK支持，以及相关文档和测试基础设施。 变更详情
序列图sequenceDiagram
participant Client as Cloud管理端
participant Controller as L3NetworkManager
participant ExtPoint as AfterSetL3NetworkMtu<br/>扩展点
participant Plugin as SDN插件实现
Client->>Controller: APISetL3NetworkMtu
Note over Controller: 执行DHCP/SDN设置流程
Controller->>Controller: 完成基础MTU设置
Controller->>ExtPoint: 查询已注册的扩展实现
alt 存在扩展实现
Controller->>Plugin: afterSetL3NetworkMtu(l3Inv, mtu)
Plugin->>Plugin: 执行MTU后处理逻辑
Plugin-->>Controller: 完成信号
Note over Controller: 聚合所有扩展完成状态
else 无扩展实现
Controller->>Controller: 继续流程
end
Controller-->>Client: 设置成功响应
sequenceDiagram
participant Client as Cloud客户端
participant ZnsAPI as ZNS SDN控制器
participant CloudDB as Cloud数据库
participant CloudRes as Cloud资源管理
Client->>CloudRes: 创建ZNS控制器
CloudRes->>ZnsAPI: 发现Fabric节点
ZnsAPI-->>CloudRes: 返回节点/集群/传输数据
CloudRes->>CloudRes: 映射到Host/Cluster UUID<br/>导出vSwitchType
CloudRes->>ZnsAPI: 获取传输区域及元数据
ZnsAPI-->>CloudRes: 返回TransportZone列表
CloudRes->>CloudRes: 创建反向索引<br/>transportZoneUuid→clusterUuid
CloudRes->>CloudDB: 保存ZnsControllerVO
CloudRes->>CloudDB: 保存TransportZoneVO
CloudRes->>CloudDB: 创建L2/L3Network<br/>关联L2NetworkClusterRef
CloudDB-->>CloudRes: 资源创建完成
CloudRes-->>Client: 控制器集成完成
代码审查工作量估算🎯 3 (中等复杂) | ⏱️ ~25 分钟 庆祝诗
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error, 2 warnings)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment Tip You can generate walkthrough in a markdown collapsible section to save space.Enable the |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@docs/modules/network/pages/networkResource/ZnsIntegration.adoc`:
- Around line 301-302: The VSwitchType.types list in the docs is inconsistent
with earlier references and missing entries (notably OvsKernel and ZNS); update
the VSwitchType.types enumeration text (the lines describing VSwitchType.types
and any repeated lists) to include OvsKernel and ZNS and make the wording
consistent with earlier uses of VSwitchType and all other occurrences in this
file so readers see the same canonical enum everywhere.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: http://open.zstack.ai:20001/code-reviews/zstack-cloud.yaml (via .coderabbit.yaml)
Review profile: CHILL
Plan: Pro
Run ID: 4afa3e99-3199-4002-9acc-200289b76f91
⛔ Files ignored due to path filters (3)
sdk/src/main/java/SourceClassMap.javais excluded by!sdk/**sdk/src/main/java/org/zstack/sdk/CreateL2GeneveNetworkAction.javais excluded by!sdk/**sdk/src/main/java/org/zstack/sdk/L2GeneveNetworkInventory.javais excluded by!sdk/**
📒 Files selected for processing (17)
conf/db/upgrade/V5.5.18__schema.sqldocs/modules/network/nav.adocdocs/modules/network/pages/networkResource/ZnsIntegration.adocdocs/modules/network/pages/networkResource/networkResource.adocheader/src/main/java/org/zstack/header/network/l2/L2NetworkConstant.javaheader/src/main/java/org/zstack/header/network/l3/AfterSetL3NetworkMtuExtensionPoint.javaheader/src/main/java/org/zstack/header/network/l3/L3NetworkInventory.javaheader/src/main/java/org/zstack/header/network/l3/L3NetworkType.javaheader/src/main/java/org/zstack/header/network/l3/L3NetworkVO.javanetwork/src/main/java/org/zstack/network/l3/L3NetworkManagerImpl.javaplugin/kvm/src/main/java/org/zstack/kvm/KVMRealizeL2NoVlanNetworkBackend.javaplugin/kvm/src/main/java/org/zstack/kvm/KVMRealizeL2VlanNetworkBackend.javaplugin/sdnController/src/main/java/org/zstack/sdnController/SdnControllerFactory.javaplugin/sdnController/src/main/java/org/zstack/sdnController/h3cVcfc/H3cVcfcSdnControllerFactory.javaplugin/sugonSdnController/src/main/java/org/zstack/sugonSdnController/controller/SugonSdnControllerFactory.javatestlib/src/main/java/org/zstack/testlib/ApiHelper.groovytestlib/src/main/java/org/zstack/testlib/SdnControllerSpec.groovy
💤 Files with no reviewable changes (3)
- plugin/sdnController/src/main/java/org/zstack/sdnController/SdnControllerFactory.java
- plugin/sugonSdnController/src/main/java/org/zstack/sugonSdnController/controller/SugonSdnControllerFactory.java
- plugin/sdnController/src/main/java/org/zstack/sdnController/h3cVcfc/H3cVcfcSdnControllerFactory.java
Comment on lines
+301
to
+302
| * `vSwitchType`：VSwitchType.types，有：LinuxBridge、TfL2Network、MacVlan、OvnDpdk、OvsDpdk | ||
| * `virtualNetworkId`：vlanId 或 vxlanID |
There was a problem hiding this comment.
VSwitchType 枚举描述与前后文不一致
这里的 VSwitchType.types 列表缺少前文已使用的 OvsKernel，也缺少本页多处声明的 ZNS。建议统一枚举口径，避免读者按该列表实现时产生偏差。
建议修正文案
-* `vSwitchType`：VSwitchType.types，有：LinuxBridge、TfL2Network、MacVlan、OvnDpdk、OvsDpdk
+* `vSwitchType`：VSwitchType.types，有：LinuxBridge、TfL2Network、MacVlan、OvnDpdk、OvsDpdk、OvsKernel、ZNSAlso applies to: 132-146, 315-315
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@docs/modules/network/pages/networkResource/ZnsIntegration.adoc` around lines
301 - 302, The VSwitchType.types list in the docs is inconsistent with earlier
references and missing entries (notably OvsKernel and ZNS); update the
VSwitchType.types enumeration text (the lines describing VSwitchType.types and
any repeated lists) to include OvsKernel and ZNS and make the wording consistent
with earlier uses of VSwitchType and all other occurrences in this file so
readers see the same canonical enum everywhere.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
mn
DBImpact
Resolves: ZSTAC-80776
Change-Id: I6873776363706d6b76726679666d6c6663676d6e
(cherry picked from commit fbb2eae)
sync from gitlab !9409