From 8070464da9c8e3be6cc1eb49ade59d0cc9667cbe Mon Sep 17 00:00:00 2001 From: "shan.wu" Date: Mon, 23 Mar 2026 11:37:45 +0800 Subject: [PATCH] [dpu-bm2]: support attaching novlan and vxlan network to baremetal2 instance support attaching novlan and vxlan network to baremetal2 instance Resolves/Related: ZSTAC-82781 Change-Id: I736d637a7168656a6c726c6769777a726e616974 (cherry picked from commit 249982672ecebea77d4acfa2480485847f2c50e6) --- sdk/src/main/java/SourceClassMap.java | 2 ++ .../sdk/BareMetal2DpuChassisConfig.java | 8 +++++ .../sdk/YuccaBareMetal2DpuChassisConfig.java | 31 +++++++++++++++++++ .../CloudOperationsErrorCode.java | 12 +++++++ 4 files changed, 53 insertions(+) create mode 100644 sdk/src/main/java/org/zstack/sdk/YuccaBareMetal2DpuChassisConfig.java diff --git a/sdk/src/main/java/SourceClassMap.java b/sdk/src/main/java/SourceClassMap.java index ab5ec3770f3..4f67267093d 100644 --- a/sdk/src/main/java/SourceClassMap.java +++ b/sdk/src/main/java/SourceClassMap.java @@ -71,6 +71,7 @@ public class SourceClassMap { put("org.zstack.baremetal2.chassis.ipmi.BareMetal2IpmiChassisInventory", "org.zstack.sdk.BareMetal2IpmiChassisInventory"); put("org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory", "org.zstack.sdk.BareMetal2ChassisOfferingInventory"); put("org.zstack.baremetal2.dpu.BareMetal2DpuHostInventory", "org.zstack.sdk.BareMetal2DpuHostInventory"); + put("org.zstack.baremetal2.dpu.yucca.YuccaBareMetal2DpuChassisConfig", "org.zstack.sdk.YuccaBareMetal2DpuChassisConfig"); put("org.zstack.baremetal2.gateway.BareMetal2GatewayInventory", "org.zstack.sdk.BareMetal2GatewayInventory"); put("org.zstack.baremetal2.gateway.BareMetal2GatewayProvisionNicInventory", "org.zstack.sdk.BareMetal2GatewayProvisionNicInventory"); put("org.zstack.baremetal2.instance.BareMetal2InstanceInventory", "org.zstack.sdk.BareMetal2InstanceInventory"); @@ -1612,6 +1613,7 @@ public class SourceClassMap { put("org.zstack.sdk.XmlHookInventory", "org.zstack.kvm.xmlhook.XmlHookInventory"); put("org.zstack.sdk.XmlHookType", "org.zstack.kvm.xmlhook.XmlHookType"); put("org.zstack.sdk.XskyBlockVolumeInventory", "org.zstack.header.volume.block.XskyBlockVolumeInventory"); + put("org.zstack.sdk.YuccaBareMetal2DpuChassisConfig", "org.zstack.baremetal2.dpu.yucca.YuccaBareMetal2DpuChassisConfig"); put("org.zstack.sdk.ZBoxBackupInventory", "org.zstack.externalbackup.zbox.ZBoxBackupInventory"); put("org.zstack.sdk.ZBoxBackupStorageBackupInfo", "org.zstack.externalbackup.zbox.ZBoxBackupStorageBackupInfo"); put("org.zstack.sdk.ZBoxInventory", "org.zstack.zbox.ZBoxInventory"); diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java index a4c6b03fd08..6ae70437623 100644 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java +++ b/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java @@ -4,6 +4,14 @@ public class BareMetal2DpuChassisConfig { + public java.lang.String vendorType; + public void setVendorType(java.lang.String vendorType) { + this.vendorType = vendorType; + } + public java.lang.String getVendorType() { + return this.vendorType; + } + public java.lang.String ipmiAddress; public void setIpmiAddress(java.lang.String ipmiAddress) { this.ipmiAddress = ipmiAddress; diff --git a/sdk/src/main/java/org/zstack/sdk/YuccaBareMetal2DpuChassisConfig.java b/sdk/src/main/java/org/zstack/sdk/YuccaBareMetal2DpuChassisConfig.java new file mode 100644 index 00000000000..3601c8573a5 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/YuccaBareMetal2DpuChassisConfig.java @@ -0,0 +1,31 @@ +package org.zstack.sdk; + + + +public class YuccaBareMetal2DpuChassisConfig extends org.zstack.sdk.BareMetal2DpuChassisConfig { + + public java.lang.String phyInterface; + public void setPhyInterface(java.lang.String phyInterface) { + this.phyInterface = phyInterface; + } + public java.lang.String getPhyInterface() { + return this.phyInterface; + } + + public java.lang.String bondMode; + public void setBondMode(java.lang.String bondMode) { + this.bondMode = bondMode; + } + public java.lang.String getBondMode() { + return this.bondMode; + } + + public java.lang.String tunnelType; + public void setTunnelType(java.lang.String tunnelType) { + this.tunnelType = tunnelType; + } + public java.lang.String getTunnelType() { + return this.tunnelType; + } + +} 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 ab1c62da4c1..f9c9c3f1cf6 100644 --- a/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java +++ b/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java @@ -7726,6 +7726,18 @@ public class CloudOperationsErrorCode { public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10092 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10092"; + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10093 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10093"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10094 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10094"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10095 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10095"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10096 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10096"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10097 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10097"; + + public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10098 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10098"; + 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";