Skip to content

Commit 2499826

Browse files
author
shan.wu
committed
<feature>[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
1 parent 7bf9cdf commit 2499826

4 files changed

Lines changed: 49 additions & 0 deletions

File tree

sdk/src/main/java/SourceClassMap.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public class SourceClassMap {
7171
put("org.zstack.baremetal2.chassis.ipmi.BareMetal2IpmiChassisInventory", "org.zstack.sdk.BareMetal2IpmiChassisInventory");
7272
put("org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory", "org.zstack.sdk.BareMetal2ChassisOfferingInventory");
7373
put("org.zstack.baremetal2.dpu.BareMetal2DpuHostInventory", "org.zstack.sdk.BareMetal2DpuHostInventory");
74+
put("org.zstack.baremetal2.dpu.yucca.YuccaBareMetal2DpuChassisConfig", "org.zstack.sdk.YuccaBareMetal2DpuChassisConfig");
7475
put("org.zstack.baremetal2.gateway.BareMetal2GatewayInventory", "org.zstack.sdk.BareMetal2GatewayInventory");
7576
put("org.zstack.baremetal2.gateway.BareMetal2GatewayProvisionNicInventory", "org.zstack.sdk.BareMetal2GatewayProvisionNicInventory");
7677
put("org.zstack.baremetal2.instance.BareMetal2InstanceInventory", "org.zstack.sdk.BareMetal2InstanceInventory");
@@ -1612,6 +1613,7 @@ public class SourceClassMap {
16121613
put("org.zstack.sdk.XmlHookInventory", "org.zstack.kvm.xmlhook.XmlHookInventory");
16131614
put("org.zstack.sdk.XmlHookType", "org.zstack.kvm.xmlhook.XmlHookType");
16141615
put("org.zstack.sdk.XskyBlockVolumeInventory", "org.zstack.header.volume.block.XskyBlockVolumeInventory");
1616+
put("org.zstack.sdk.YuccaBareMetal2DpuChassisConfig", "org.zstack.baremetal2.dpu.yucca.YuccaBareMetal2DpuChassisConfig");
16151617
put("org.zstack.sdk.ZBoxBackupInventory", "org.zstack.externalbackup.zbox.ZBoxBackupInventory");
16161618
put("org.zstack.sdk.ZBoxBackupStorageBackupInfo", "org.zstack.externalbackup.zbox.ZBoxBackupStorageBackupInfo");
16171619
put("org.zstack.sdk.ZBoxInventory", "org.zstack.zbox.ZBoxInventory");

sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
public class BareMetal2DpuChassisConfig {
66

7+
public java.lang.String vendorType;
8+
public void setVendorType(java.lang.String vendorType) {
9+
this.vendorType = vendorType;
10+
}
11+
public java.lang.String getVendorType() {
12+
return this.vendorType;
13+
}
14+
715
public java.lang.String ipmiAddress;
816
public void setIpmiAddress(java.lang.String ipmiAddress) {
917
this.ipmiAddress = ipmiAddress;
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.zstack.sdk;
2+
3+
4+
5+
public class YuccaBareMetal2DpuChassisConfig extends org.zstack.sdk.BareMetal2DpuChassisConfig {
6+
7+
public java.lang.String phyInterface;
8+
public void setPhyInterface(java.lang.String phyInterface) {
9+
this.phyInterface = phyInterface;
10+
}
11+
public java.lang.String getPhyInterface() {
12+
return this.phyInterface;
13+
}
14+
15+
public java.lang.String bondMode;
16+
public void setBondMode(java.lang.String bondMode) {
17+
this.bondMode = bondMode;
18+
}
19+
public java.lang.String getBondMode() {
20+
return this.bondMode;
21+
}
22+
23+
public java.lang.String tunnelType;
24+
public void setTunnelType(java.lang.String tunnelType) {
25+
this.tunnelType = tunnelType;
26+
}
27+
public java.lang.String getTunnelType() {
28+
return this.tunnelType;
29+
}
30+
31+
}

utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7726,6 +7726,14 @@ public class CloudOperationsErrorCode {
77267726

77277727
public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10092 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10092";
77287728

7729+
public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10093 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10093";
7730+
7731+
public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10094 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10094";
7732+
7733+
public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10095 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10095";
7734+
7735+
public static final String ORG_ZSTACK_BAREMETAL2_INSTANCE_10096 = "ORG_ZSTACK_BAREMETAL2_INSTANCE_10096";
7736+
77297737
public static final String ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10000 = "ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10000";
77307738

77317739
public static final String ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10001 = "ORG_ZSTACK_CRYPTO_SECURITYMACHINE_SECRETRESOURCEPOOL_10001";

0 commit comments

Comments
 (0)