From 27417467961f1ccd746fbceeee8cc4e77e98a708 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 27 May 2024 15:22:13 +0800 Subject: [PATCH] =?UTF-8?q?ct=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bocloud/cmp/model/HostModel.java | 2 ++ .../com/bocloud/cmp/model/NetworkModel.java | 20 +++++++++++++++++++ .../com/bocloud/cmp/model/ServerModel.java | 2 ++ .../com/bocloud/cmp/model/SwitcherModel.java | 10 ++++++++++ .../com/bocloud/cmp/model/VolumeModel.java | 2 ++ .../bocloud/cmp/model/smart/SyncModel.java | 1 + .../cmp/provider/compute/ClusterProvider.java | 5 +++++ .../cmp/provider/compute/ServerProvider.java | 10 ++++++++++ 8 files changed, 52 insertions(+) diff --git a/src/main/java/com/bocloud/cmp/model/HostModel.java b/src/main/java/com/bocloud/cmp/model/HostModel.java index 306039e..2c31d06 100644 --- a/src/main/java/com/bocloud/cmp/model/HostModel.java +++ b/src/main/java/com/bocloud/cmp/model/HostModel.java @@ -100,6 +100,8 @@ public class HostModel { //-----FusionSphere新增字段--------// + private Long totalCacheSizeByte; + public Long getCpuHz() { return cpuHz; diff --git a/src/main/java/com/bocloud/cmp/model/NetworkModel.java b/src/main/java/com/bocloud/cmp/model/NetworkModel.java index 04e2910..2f12086 100644 --- a/src/main/java/com/bocloud/cmp/model/NetworkModel.java +++ b/src/main/java/com/bocloud/cmp/model/NetworkModel.java @@ -34,6 +34,26 @@ public class NetworkModel { private Long vendorId; private Long region; + private String clusterUuid; + + private String localId; + + public String getLocalId() { + return localId; + } + + public void setLocalId(String localId) { + this.localId = localId; + } + + public String getClusterUuid() { + return clusterUuid; + } + + public void setClusterUuid(String clusterUuid) { + this.clusterUuid = clusterUuid; + } + public String getRegionId() { return regionId; } diff --git a/src/main/java/com/bocloud/cmp/model/ServerModel.java b/src/main/java/com/bocloud/cmp/model/ServerModel.java index 3969230..806309b 100644 --- a/src/main/java/com/bocloud/cmp/model/ServerModel.java +++ b/src/main/java/com/bocloud/cmp/model/ServerModel.java @@ -327,6 +327,8 @@ public class ServerModel implements VendorModel { private String resourceId;//资源池Id private Boolean powerOn;//创建完成后是否启动 + private String localId; + @Override public Serializable getIdInVendor(String s) { return this.instanceId; diff --git a/src/main/java/com/bocloud/cmp/model/SwitcherModel.java b/src/main/java/com/bocloud/cmp/model/SwitcherModel.java index c67d3f3..5c1be67 100644 --- a/src/main/java/com/bocloud/cmp/model/SwitcherModel.java +++ b/src/main/java/com/bocloud/cmp/model/SwitcherModel.java @@ -24,6 +24,16 @@ public class SwitcherModel { private NetworkModel network; private List networks; + private String clusterUuid; + + public String getClusterUuid() { + return clusterUuid; + } + + public void setClusterUuid(String clusterUuid) { + this.clusterUuid = clusterUuid; + } + public String getBondName() { return bondName; } diff --git a/src/main/java/com/bocloud/cmp/model/VolumeModel.java b/src/main/java/com/bocloud/cmp/model/VolumeModel.java index 26b7e50..b1f3fb2 100644 --- a/src/main/java/com/bocloud/cmp/model/VolumeModel.java +++ b/src/main/java/com/bocloud/cmp/model/VolumeModel.java @@ -166,6 +166,8 @@ public class VolumeModel { private Long dataStoreId;// 数据存储 //fc新增字段 + private String policyName; + public VolumeModel() { super(); } diff --git a/src/main/java/com/bocloud/cmp/model/smart/SyncModel.java b/src/main/java/com/bocloud/cmp/model/smart/SyncModel.java index 73e855b..7dac94c 100644 --- a/src/main/java/com/bocloud/cmp/model/smart/SyncModel.java +++ b/src/main/java/com/bocloud/cmp/model/smart/SyncModel.java @@ -21,6 +21,7 @@ public class SyncModel { private List volumeTemplateModels; private List imageModels; private List taskMsgModels; + private List clusterModels; public List getServerAndServerTemplateModels() { List resultModels = new ArrayList<>(this.serverModels); diff --git a/src/main/java/com/bocloud/cmp/provider/compute/ClusterProvider.java b/src/main/java/com/bocloud/cmp/provider/compute/ClusterProvider.java index ed4ebc4..bb8cc81 100644 --- a/src/main/java/com/bocloud/cmp/provider/compute/ClusterProvider.java +++ b/src/main/java/com/bocloud/cmp/provider/compute/ClusterProvider.java @@ -5,6 +5,8 @@ import com.bocloud.cmp.model.ClusterOperateModel; import com.bocloud.cmp.provider.SuperProvider; import com.bocloud.common.model.BocloudResult; +import java.util.List; + /** * 集群操作接口 * @@ -85,6 +87,9 @@ public interface ClusterProvider extends SuperProvider { default BocloudResult listByVdc(String vdcName) { return null; } + default BocloudResult> getClusterByVlanId(String vlanId) { + return null; + } default BocloudResult resourceStatistics(String uri) { return null; diff --git a/src/main/java/com/bocloud/cmp/provider/compute/ServerProvider.java b/src/main/java/com/bocloud/cmp/provider/compute/ServerProvider.java index ead2fa0..a57c04f 100644 --- a/src/main/java/com/bocloud/cmp/provider/compute/ServerProvider.java +++ b/src/main/java/com/bocloud/cmp/provider/compute/ServerProvider.java @@ -132,6 +132,16 @@ public interface ServerProvider extends SuperProvider { return new BocloudResult(false, "尚未实现"); } + default BocloudResult addNetwork(ServerModel server) { + return new BocloudResult(false, "尚未实现"); + }; + default BocloudResult removeNetwork(ServerModel server) { + return new BocloudResult(false, "尚未实现"); + }; + + default BocloudResult addDisks(ServerModel server) { + return new BocloudResult(false, "尚未实现"); + }; /** * 软停止云主机 *